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

---
 kiconedit/kicon.cpp          | 4 ++--
 kiconedit/kiconconfig.cpp    | 4 ++--
 kiconedit/kiconedit.cpp      | 4 ++--
 kiconedit/kiconedit.h        | 2 +-
 kiconedit/kiconeditslots.cpp | 4 ++--
 kiconedit/kicongrid.cpp      | 4 ++--
 kiconedit/kicongrid.h        | 2 +-
 kiconedit/knew.cpp           | 4 ++--
 kiconedit/kresize.cpp        | 2 +-
 kiconedit/main.cpp           | 2 +-
 kiconedit/palettetoolbar.cpp | 2 +-
 kiconedit/utils.cpp          | 2 +-
 12 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'kiconedit')

diff --git a/kiconedit/kicon.cpp b/kiconedit/kicon.cpp
index 9b99b113..296dc9a3 100644
--- a/kiconedit/kicon.cpp
+++ b/kiconedit/kicon.cpp
@@ -22,12 +22,12 @@
 
 #include <tqimage.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
 #include <kimageio.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kicon.h"
 #include "utils.h"
diff --git a/kiconedit/kiconconfig.cpp b/kiconedit/kiconconfig.cpp
index cb188501..d50fbc86 100644
--- a/kiconedit/kiconconfig.cpp
+++ b/kiconedit/kiconconfig.cpp
@@ -30,10 +30,10 @@
 #include <tdeaccel.h>
 #include <kbuttonbox.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcolorbutton.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kurlrequester.h>
 
diff --git a/kiconedit/kiconedit.cpp b/kiconedit/kiconedit.cpp
index e7bb711d..bec3af7f 100644
--- a/kiconedit/kiconedit.cpp
+++ b/kiconedit/kiconedit.cpp
@@ -24,8 +24,8 @@
 #include <tdepopupmenu.h>
 #include <kstdaction.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include "kiconedit.h"
diff --git a/kiconedit/kiconedit.h b/kiconedit/kiconedit.h
index c6291c8c..7c6e74f0 100644
--- a/kiconedit/kiconedit.h
+++ b/kiconedit/kiconedit.h
@@ -27,7 +27,7 @@
 
 #include <tdemainwindow.h>
 #include <kiconloader.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <tdetoolbar.h>
 #include <tdeaccel.h>
diff --git a/kiconedit/kiconeditslots.cpp b/kiconedit/kiconeditslots.cpp
index a25e2318..899a2b5d 100644
--- a/kiconedit/kiconeditslots.cpp
+++ b/kiconedit/kiconeditslots.cpp
@@ -22,8 +22,8 @@
 #include <tqpainter.h>
 
 #include <kkeydialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kprinter.h>
 #include <kurldrag.h>
diff --git a/kiconedit/kicongrid.cpp b/kiconedit/kicongrid.cpp
index 28617657..0ed49f1e 100644
--- a/kiconedit/kicongrid.cpp
+++ b/kiconedit/kicongrid.cpp
@@ -32,8 +32,8 @@
 
 #include <kiconloader.h>
 #include <kruler.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include "kresize.h"
diff --git a/kiconedit/kicongrid.h b/kiconedit/kicongrid.h
index eb604ae0..a88a78be 100644
--- a/kiconedit/kicongrid.h
+++ b/kiconedit/kicongrid.h
@@ -27,7 +27,7 @@
 #include <tqpointarray.h>
 #include <tqframe.h>
 #include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kcolorgrid.h"
 
diff --git a/kiconedit/knew.cpp b/kiconedit/knew.cpp
index 58c97b4b..2536816f 100644
--- a/kiconedit/knew.cpp
+++ b/kiconedit/knew.cpp
@@ -25,8 +25,8 @@
 #include <tqpushbutton.h>
 
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
diff --git a/kiconedit/kresize.cpp b/kiconedit/kresize.cpp
index b2af86b6..b7007238 100644
--- a/kiconedit/kresize.cpp
+++ b/kiconedit/kresize.cpp
@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 #include <tqgroupbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include "kresize.h"
diff --git a/kiconedit/main.cpp b/kiconedit/main.cpp
index 93a8ce69..a9739af8 100644
--- a/kiconedit/main.cpp
+++ b/kiconedit/main.cpp
@@ -21,7 +21,7 @@
 
 #include <stdlib.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
diff --git a/kiconedit/palettetoolbar.cpp b/kiconedit/palettetoolbar.cpp
index eee9b87b..0e3520db 100644
--- a/kiconedit/palettetoolbar.cpp
+++ b/kiconedit/palettetoolbar.cpp
@@ -24,7 +24,7 @@
 #include <tqwhatsthis.h>
 #include <tqpainter.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kiconcolors.h"
diff --git a/kiconedit/utils.cpp b/kiconedit/utils.cpp
index 8efeb547..efd50d88 100644
--- a/kiconedit/utils.cpp
+++ b/kiconedit/utils.cpp
@@ -20,7 +20,7 @@
 */
 
 #include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "utils.h"
-- 
cgit v1.2.1