From 63f984a752aa6a6a73e3af795b05a5a042833eff Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:48:17 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 karbon/plugins/flattenpath/flattenpathplugin.cc   | 2 +-
 karbon/plugins/imagetool/vimagetool.cc            | 2 +-
 karbon/plugins/shadoweffect/shadoweffectplugin.cc | 2 +-
 karbon/plugins/zoomtool/vzoomtool.cc              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'karbon/plugins')

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>
-- 
cgit v1.2.1