summaryrefslogtreecommitdiffstats
path: root/chalk/plugins/tools/tool_curves
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/tools/tool_curves
parent3b6870c6e1177574772803b5b09416903ee40fc0 (diff)
downloadkoffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz
koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'chalk/plugins/tools/tool_curves')
-rw-r--r--chalk/plugins/tools/tool_curves/kis_tool_bezier.cc2
-rw-r--r--chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc2
-rw-r--r--chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc2
-rw-r--r--chalk/plugins/tools/tool_curves/kis_tool_curve.cc2
-rw-r--r--chalk/plugins/tools/tool_curves/kis_tool_example.cc2
-rw-r--r--chalk/plugins/tools/tool_curves/kis_tool_moutline.cc2
-rw-r--r--chalk/plugins/tools/tool_curves/tool_curves.cc4
7 files changed, 8 insertions, 8 deletions
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
index b96fb737..e4c1d05d 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
@@ -26,7 +26,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <knuminput.h>
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc
index 5c47cd20..06f34f8c 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc
@@ -29,7 +29,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include "kis_cmb_composite.h"
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc
index 90205d8d..72418920 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc
@@ -29,7 +29,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include "kis_cmb_composite.h"
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
index e4da1b37..7449e581 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
@@ -28,7 +28,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kis_global.h"
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.cc b/chalk/plugins/tools/tool_curves/kis_tool_example.cc
index dd8a8076..75e3da2b 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_example.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_example.cc
@@ -25,7 +25,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <knuminput.h>
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
index 18aa06b0..178ff278 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
@@ -30,7 +30,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <knuminput.h>
diff --git a/chalk/plugins/tools/tool_curves/tool_curves.cc b/chalk/plugins/tools/tool_curves/tool_curves.cc
index d941c2dc..b21f5aae 100644
--- a/chalk/plugins/tools/tool_curves/tool_curves.cc
+++ b/chalk/plugins/tools/tool_curves/tool_curves.cc
@@ -23,10 +23,10 @@
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <kgenericfactory.h>