summaryrefslogtreecommitdiffstats
path: root/karbon/plugins
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 /karbon/plugins
parent3b6870c6e1177574772803b5b09416903ee40fc0 (diff)
downloadkoffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz
koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'karbon/plugins')
-rw-r--r--karbon/plugins/flattenpath/flattenpathplugin.cc2
-rw-r--r--karbon/plugins/imagetool/vimagetool.cc2
-rw-r--r--karbon/plugins/shadoweffect/shadoweffectplugin.cc2
-rw-r--r--karbon/plugins/zoomtool/vzoomtool.cc2
4 files changed, 4 insertions, 4 deletions
diff --git a/karbon/plugins/flattenpath/flattenpathplugin.cc b/karbon/plugins/flattenpath/flattenpathplugin.cc
index 78c2a66e..6c4a33d8 100644
--- a/karbon/plugins/flattenpath/flattenpathplugin.cc
+++ b/karbon/plugins/flattenpath/flattenpathplugin.cc
@@ -18,7 +18,7 @@
*/
#include "flattenpathplugin.h"
-#include "klocale.h"
+#include "tdelocale.h"
#include <karbon_view.h>
#include <karbon_part.h>
#include <kgenericfactory.h>
diff --git a/karbon/plugins/imagetool/vimagetool.cc b/karbon/plugins/imagetool/vimagetool.cc
index 090561a8..749e07a1 100644
--- a/karbon/plugins/imagetool/vimagetool.cc
+++ b/karbon/plugins/imagetool/vimagetool.cc
@@ -19,7 +19,7 @@
*/
#include <tqcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <kdebug.h>
diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.cc b/karbon/plugins/shadoweffect/shadoweffectplugin.cc
index a837e51e..019b4024 100644
--- a/karbon/plugins/shadoweffect/shadoweffectplugin.cc
+++ b/karbon/plugins/shadoweffect/shadoweffectplugin.cc
@@ -18,7 +18,7 @@
*/
#include "shadoweffectplugin.h"
-#include "klocale.h"
+#include "tdelocale.h"
#include <karbon_view.h>
#include <karbon_part.h>
#include <kgenericfactory.h>
diff --git a/karbon/plugins/zoomtool/vzoomtool.cc b/karbon/plugins/zoomtool/vzoomtool.cc
index beb19a68..1cecb94a 100644
--- a/karbon/plugins/zoomtool/vzoomtool.cc
+++ b/karbon/plugins/zoomtool/vzoomtool.cc
@@ -21,7 +21,7 @@
#include <tqcursor.h>
#include <tqevent.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "vzoomtool.h"
#include <karbon_part.h>