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

---
 noatun/modules/kaiman/pref.cpp          | 4 ++--
 noatun/modules/kaiman/style.cpp         | 4 ++--
 noatun/modules/kaiman/userinterface.cpp | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'noatun/modules/kaiman')

diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp
index 08af1b28..5e2193c7 100644
--- a/noatun/modules/kaiman/pref.cpp
+++ b/noatun/modules/kaiman/pref.cpp
@@ -16,13 +16,13 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tdelistbox.h>
 #include <tqdir.h>
 #include <tqfileinfo.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp
index 903660dd..2c318154 100644
--- a/noatun/modules/kaiman/style.cpp
+++ b/noatun/modules/kaiman/style.cpp
@@ -20,13 +20,13 @@
 
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <tqpainter.h>
 #include <tqdropsite.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurldrag.h>
 #include <tqtimer.h>
 
diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp
index 36a41281..9f502178 100644
--- a/noatun/modules/kaiman/userinterface.cpp
+++ b/noatun/modules/kaiman/userinterface.cpp
@@ -42,12 +42,12 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <twin.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 #include <kurldrag.h>
 
-- 
cgit v1.2.1