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

---
 kimagemapeditor/arealistview.cpp    | 2 +-
 kimagemapeditor/drawzone.cpp        | 2 +-
 kimagemapeditor/imageslistview.cpp  | 2 +-
 kimagemapeditor/kimagemapeditor.cpp | 6 +++---
 kimagemapeditor/kimearea.h          | 2 +-
 kimagemapeditor/kimecommands.cpp    | 2 +-
 kimagemapeditor/kimedialogs.cpp     | 4 ++--
 kimagemapeditor/kimeshell.cpp       | 2 +-
 kimagemapeditor/main.cpp            | 2 +-
 kimagemapeditor/mapslistview.cpp    | 2 +-
 kimagemapeditor/qextfileinfo.cpp    | 2 +-
 11 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'kimagemapeditor')

diff --git a/kimagemapeditor/arealistview.cpp b/kimagemapeditor/arealistview.cpp
index 4dceda41..f285999b 100644
--- a/kimagemapeditor/arealistview.cpp
+++ b/kimagemapeditor/arealistview.cpp
@@ -24,7 +24,7 @@
 
 // KDE
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // local
 #include "kimearea.h"
diff --git a/kimagemapeditor/drawzone.cpp b/kimagemapeditor/drawzone.cpp
index 21f176dc..51fdb2ac 100644
--- a/kimagemapeditor/drawzone.cpp
+++ b/kimagemapeditor/drawzone.cpp
@@ -24,7 +24,7 @@
 // KDE
 #include <kdebug.h>
 #include <kurldrag.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 #include <kmimetype.h>
diff --git a/kimagemapeditor/imageslistview.cpp b/kimagemapeditor/imageslistview.cpp
index ff14a98a..15529a45 100644
--- a/kimagemapeditor/imageslistview.cpp
+++ b/kimagemapeditor/imageslistview.cpp
@@ -20,7 +20,7 @@
  
  
 // KDE
-#include <klocale.h> 
+#include <tdelocale.h> 
 #include <kdebug.h>
 
 // locale 
diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp
index 86b0a4d0..231bf8ed 100644
--- a/kimagemapeditor/kimagemapeditor.cpp
+++ b/kimagemapeditor/kimagemapeditor.cpp
@@ -41,18 +41,18 @@
 // KDE
 #include <kcommand.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdeaccel.h>
 #include <kstdaction.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
 #include <klineeditdlg.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <kxmlguifactory.h>
diff --git a/kimagemapeditor/kimearea.h b/kimagemapeditor/kimearea.h
index 0c554754..7826aba6 100644
--- a/kimagemapeditor/kimearea.h
+++ b/kimagemapeditor/kimearea.h
@@ -21,7 +21,7 @@
 #include <tqrect.h>
 #include <tqpoint.h>
 #include <tqptrlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqmap.h>
 
 #include "tdeversion.h"
diff --git a/kimagemapeditor/kimecommands.cpp b/kimagemapeditor/kimecommands.cpp
index 975001d9..20d88303 100644
--- a/kimagemapeditor/kimecommands.cpp
+++ b/kimagemapeditor/kimecommands.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 #include <tqstring.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kimagemapeditor.h"
 #include "kimecommands.h"
diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp
index 6070edc9..d541b142 100644
--- a/kimagemapeditor/kimedialogs.cpp
+++ b/kimagemapeditor/kimedialogs.cpp
@@ -35,12 +35,12 @@
 // KDE
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <tdehtmlview.h>
 #include <tdehtml_part.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp
index 448d3b37..0cbcd542 100644
--- a/kimagemapeditor/kimeshell.cpp
+++ b/kimagemapeditor/kimeshell.cpp
@@ -22,7 +22,7 @@
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
 #include <kstatusbar.h>
diff --git a/kimagemapeditor/main.cpp b/kimagemapeditor/main.cpp
index e19b5522..374d51ff 100644
--- a/kimagemapeditor/main.cpp
+++ b/kimagemapeditor/main.cpp
@@ -17,7 +17,7 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
 
diff --git a/kimagemapeditor/mapslistview.cpp b/kimagemapeditor/mapslistview.cpp
index fee8f147..84a77bc2 100644
--- a/kimagemapeditor/mapslistview.cpp
+++ b/kimagemapeditor/mapslistview.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 // KDE
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // locale
diff --git a/kimagemapeditor/qextfileinfo.cpp b/kimagemapeditor/qextfileinfo.cpp
index 518dc79a..031a34ab 100644
--- a/kimagemapeditor/qextfileinfo.cpp
+++ b/kimagemapeditor/qextfileinfo.cpp
@@ -26,7 +26,7 @@
 #include <tdeio/scheduler.h>
 #include <kdirlister.h>
 #include <tdefileitem.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 //app includes
-- 
cgit v1.2.1