summaryrefslogtreecommitdiffstats
path: root/chalk/colorspaces/rgb_f16half
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:48:17 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:48:17 -0600
commit63f984a752aa6a6a73e3af795b05a5a042833eff (patch)
tree89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /chalk/colorspaces/rgb_f16half
parent3b6870c6e1177574772803b5b09416903ee40fc0 (diff)
downloadkoffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz
koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'chalk/colorspaces/rgb_f16half')
-rw-r--r--chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc2
-rw-r--r--chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc
index 9e7f138e..fd065637 100644
--- a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc
+++ b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc
@@ -25,7 +25,7 @@
#include <tqimage.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_rgb_f16half_colorspace.h"
#include "kis_f32_base_colorspace.h"
diff --git a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h
index a8fde30d..4297498c 100644
--- a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h
+++ b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h
@@ -21,7 +21,7 @@
#include <tqcolor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <koffice_export.h>