summaryrefslogtreecommitdiffstats
path: root/chalk/plugins/viewplugins/scripting/chalkcore
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/plugins/viewplugins/scripting/chalkcore
parent3b6870c6e1177574772803b5b09416903ee40fc0 (diff)
downloadkoffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz
koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'chalk/plugins/viewplugins/scripting/chalkcore')
-rw-r--r--chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp2
-rw-r--r--chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h2
-rw-r--r--chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp2
-rw-r--r--chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp
index 1486d4153..be0b9307a 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp
@@ -18,7 +18,7 @@
#include "krs_image.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kis_colorspace_factory_registry.h>
#include <kis_image.h>
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h
index 9b5f5b6b1..777a8aac1 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h
@@ -24,7 +24,7 @@
//#include <api/proxy.h>
//#include <api/variant.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kis_paint_layer.h>
#include <kis_paint_device.h>
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp
index a3ce4dd6e..fb6548b24 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp
@@ -18,7 +18,7 @@
#include "krs_paint_layer.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kis_colorspace_factory_registry.h>
#include <kis_doc.h>
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp
index c8ef92c50..21ab76464 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp
@@ -20,7 +20,7 @@
#include "krs_wavelet.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kis_math_toolbox.h>