Rename additional header files to avoid conflicts with KDE4

12 files changed, 21 insertions, 21 deletions

diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp
index a999fed0d..e5629f872 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.cpp
+++ b/kmobile/devices/gnokii/gnokii_mobile.cpp
@@ -28,10 +28,10 @@
 #include <klibloader.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/global.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <gnokii.h>
 
diff --git a/kmobile/devices/gnokii/gnokii_mobile.h b/kmobile/devices/gnokii/gnokii_mobile.h
index fbcb3cb6a..5ace3e0b9 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.h
+++ b/kmobile/devices/gnokii/gnokii_mobile.h
@@ -25,7 +25,7 @@
 #define LIBKMOBILE_GNOKII_H
 
 #include <kmobiledevice.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
 class KMobileGnokii : public KMobileDevice
 {
diff --git a/kmobile/devices/skeleton/skeleton.cpp b/kmobile/devices/skeleton/skeleton.cpp
index 564681cd7..3593c7f8e 100644
--- a/kmobile/devices/skeleton/skeleton.cpp
+++ b/kmobile/devices/skeleton/skeleton.cpp
@@ -22,11 +22,11 @@
 
 #include <klibloader.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tdeio/global.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "skeleton.h"
 
diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp
index 70ec163bf..2fda2db1b 100644
--- a/kmobile/kmobile.cpp
+++ b/kmobile/kmobile.cpp
@@ -22,16 +22,16 @@
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
 #include <tdeaccel.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 
 #include <kedittoolbar.h>
diff --git a/kmobile/kmobileclient.cpp b/kmobile/kmobileclient.cpp
index 2eef7c53c..8a0b967ad 100644
--- a/kmobile/kmobileclient.cpp
+++ b/kmobile/kmobileclient.cpp
@@ -20,7 +20,7 @@
 #include <tqstringlist.h>
 
 #include <ktrader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kmobileclient.h"
diff --git a/kmobile/kmobiledevice.cpp b/kmobile/kmobiledevice.cpp
index 3c970ab15..e92bbd04e 100644
--- a/kmobile/kmobiledevice.cpp
+++ b/kmobile/kmobiledevice.cpp
@@ -33,12 +33,12 @@
 #include <klibloader.h>
 #include <kstandarddirs.h>
 #include "kmobiledevice.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 
 #include <tdeio/global.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define KMOBILEDEVICE_DEBUG_AREA 5730
 #define PRINT_DEBUG kdDebug(KMOBILEDEVICE_DEBUG_AREA) << "KMobileDevice: "
diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h
index 9dbad07a1..aad9287c5 100644
--- a/kmobile/kmobiledevice.h
+++ b/kmobile/kmobiledevice.h
@@ -27,8 +27,8 @@
 #include <tdepimmacros.h>
 #include <klibloader.h>
 
-#include <kabc/addressee.h>
-#include <kabc/addresseelist.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/addresseelist.h>
 
 #include <tdeio/global.h>
 #include <tdeio/authinfo.h>
diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp
index aa44cb937..8165eadd5 100644
--- a/kmobile/kmobileitem.cpp
+++ b/kmobile/kmobileitem.cpp
@@ -20,7 +20,7 @@
 #include <tqobject.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 
diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp
index 5356c879e..14f7c0a39 100644
--- a/kmobile/kmobileview.cpp
+++ b/kmobile/kmobileview.cpp
@@ -22,8 +22,8 @@
 
 #include <ktrader.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kabc/vcardconverter.h>
+#include <tdelocale.h>
+#include <tdeabc/vcardconverter.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
diff --git a/kmobile/main.cpp b/kmobile/main.cpp
index 423c8be87..6fe97df3c 100644
--- a/kmobile/main.cpp
+++ b/kmobile/main.cpp
@@ -22,7 +22,7 @@
 #include <dcopclient.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("TDE mobile devices manager");
diff --git a/kmobile/pref.cpp b/kmobile/pref.cpp
index 6b5a02309..b42006017 100644
--- a/kmobile/pref.cpp
+++ b/kmobile/pref.cpp
@@ -4,7 +4,7 @@
 
 #include "pref.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/kmobile/tdeioslave/tdeio_mobile.cpp b/kmobile/tdeioslave/tdeio_mobile.cpp
index bb70b264e..f30742fe7 100644
--- a/kmobile/tdeioslave/tdeio_mobile.cpp
+++ b/kmobile/tdeioslave/tdeio_mobile.cpp
@@ -27,9 +27,9 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/vcardconverter.h>
 
 #include "tdeio_mobile.h"