Rename additional header files to avoid conflicts with KDE4

15 files changed, 18 insertions, 18 deletions

diff --git a/lib/idmapper.cc b/lib/idmapper.cc
index dc14072..ebd25aa 100644
--- a/lib/idmapper.cc
+++ b/lib/idmapper.cc
@@ -30,7 +30,7 @@
 #include <tqsqldatabase.h>
 #include <tqfile.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 class IDMapperPrivate
diff --git a/lib/kpilotdevicelink.cc b/lib/kpilotdevicelink.cc
index 54fa84a..ecad02a 100644
--- a/lib/kpilotdevicelink.cc
+++ b/lib/kpilotdevicelink.cc
@@ -52,7 +52,7 @@
 #include <tqsocketnotifier.h>
 
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
diff --git a/lib/kpilotlink.cc b/lib/kpilotlink.cc
index 098b688..b543fe7 100644
--- a/lib/kpilotlink.cc
+++ b/lib/kpilotlink.cc
@@ -53,7 +53,7 @@
 #include <tqthread.h>
 
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
diff --git a/lib/kpilotlocallink.cc b/lib/kpilotlocallink.cc
index cf301c7..b5ec450 100644
--- a/lib/kpilotlocallink.cc
+++ b/lib/kpilotlocallink.cc
@@ -53,7 +53,7 @@
 #include <tqthread.h>
 
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
diff --git a/lib/options.h b/lib/options.h
index d8dcc0c..0896af0 100644
--- a/lib/options.h
+++ b/lib/options.h
@@ -42,7 +42,7 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #if !(KDE_IS_VERSION(3,4,0))
 #error "This is KPilot for (really) KDE 3.5 and won't compile with KDE < 3.4.0"
diff --git a/lib/pilot.cc b/lib/pilot.cc
index ef4054b..d15eb55 100644
--- a/lib/pilot.cc
+++ b/lib/pilot.cc
@@ -34,7 +34,7 @@
 #include <tqtextcodec.h>
 #include <tqmutex.h>
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "pilot.h"
 #include "pilotDatabase.h"
diff --git a/lib/pilotDatabase.cc b/lib/pilotDatabase.cc
index cc65895..f4a1b40 100644
--- a/lib/pilotDatabase.cc
+++ b/lib/pilotDatabase.cc
@@ -36,7 +36,7 @@
 
 #include <tqstringlist.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "pilotDatabase.h"
 #include "pilotRecord.h"
diff --git a/lib/pilotDateEntry.cc b/lib/pilotDateEntry.cc
index b11c057..58da804 100644
--- a/lib/pilotDateEntry.cc
+++ b/lib/pilotDateEntry.cc
@@ -35,7 +35,7 @@
 #include <tqnamespace.h>
 #include <tqregexp.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "pilotDateEntry.h"
 
diff --git a/lib/pilotLocalDatabase.cc b/lib/pilotLocalDatabase.cc
index 4946312..ea78ac0 100644
--- a/lib/pilotLocalDatabase.cc
+++ b/lib/pilotLocalDatabase.cc
@@ -45,7 +45,7 @@
 #include <tqvaluevector.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <ksavefile.h>
 
diff --git a/lib/pilotRecord.cc b/lib/pilotRecord.cc
index 59f055c..8d5940a 100644
--- a/lib/pilotRecord.cc
+++ b/lib/pilotRecord.cc
@@ -38,7 +38,7 @@
 
 #include <tqregexp.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 
 #include "pilot.h"
diff --git a/lib/pilotSerialDatabase.cc b/lib/pilotSerialDatabase.cc
index d1d7ee9..a34e00c 100644
--- a/lib/pilotSerialDatabase.cc
+++ b/lib/pilotSerialDatabase.cc
@@ -36,9 +36,9 @@
 
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "pilotRecord.h"
 #include "pilotSerialDatabase.h"
diff --git a/lib/pilotTodoEntry.cc b/lib/pilotTodoEntry.cc
index f91b6d5..9d52ed8 100644
--- a/lib/pilotTodoEntry.cc
+++ b/lib/pilotTodoEntry.cc
@@ -34,7 +34,7 @@
 #include <tqdatetime.h>
 #include <tqnamespace.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 
diff --git a/lib/plugin.cc b/lib/plugin.cc
index 7bb8e12..1013a34 100644
--- a/lib/plugin.cc
+++ b/lib/plugin.cc
@@ -51,11 +51,11 @@
 #include <tdeaboutapplication.h>
 #include <kactivelabel.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kinstance.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kservice.h>
 #include <kservicetype.h>
 #include <kstandarddirs.h>
diff --git a/lib/recordConduit.h b/lib/recordConduit.h
index 259133a..d1499a5 100644
--- a/lib/recordConduit.h
+++ b/lib/recordConduit.h
@@ -28,7 +28,7 @@
 */
 
 #include <tqtimer.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "plugin.h"
 #include "pilot.h"
diff --git a/lib/syncAction.cc b/lib/syncAction.cc
index 2ca7361..65a7c7c 100644
--- a/lib/syncAction.cc
+++ b/lib/syncAction.cc
@@ -47,10 +47,10 @@
 #include <tqstyle.h>
 
 #include <kdialogbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "syncAction.moc"
 #include "kpilotlibSettings.h"