Rename a number of libraries and executables to avoid conflicts with KDE4

13 files changed, 41 insertions, 41 deletions

diff --git a/libkpimexchange/configure.in.in b/libkpimexchange/configure.in.in
index 139073a4c..a9f0c80c3 100644
--- a/libkpimexchange/configure.in.in
+++ b/libkpimexchange/configure.in.in
@@ -6,7 +6,7 @@ kde_safe_cppflags=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $all_includes"
 AC_LANG_CPLUSPLUS
 AC_TRY_COMPILE(
-[#include <kio/http.h>],
+[#include <tdeio/http.h>],
 [
   int method = (int) TDEIO::DAV_SUBSCRIBE;
 ],
diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp
index 7b67a5529..dc7d7daa9 100644
--- a/libkpimexchange/core/exchangeaccount.cpp
+++ b/libkpimexchange/core/exchangeaccount.cpp
@@ -31,16 +31,16 @@
 #include <kurl.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <dcopclient.h>
 #include <kcursor.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 
-#include <kio/authinfo.h>
-#include <kio/davjob.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/authinfo.h>
+#include <tdeio/davjob.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 
 #include "exchangeaccount.h"
 #include "utils.h"
diff --git a/libkpimexchange/core/exchangeaccount.h b/libkpimexchange/core/exchangeaccount.h
index 0d8bfcdf8..e55b22434 100644
--- a/libkpimexchange/core/exchangeaccount.h
+++ b/libkpimexchange/core/exchangeaccount.h
@@ -28,7 +28,7 @@
 
 #include <tdepimmacros.h>
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 namespace KPIM {
 	
diff --git a/libkpimexchange/core/exchangeclient.cpp b/libkpimexchange/core/exchangeclient.cpp
index eadcc2bed..c316a25a4 100644
--- a/libkpimexchange/core/exchangeclient.cpp
+++ b/libkpimexchange/core/exchangeclient.cpp
@@ -25,8 +25,8 @@
 #include <klocale.h>
 
 // These for test() method
-#include <kio/http.h>
-#include <kio/davjob.h>
+#include <tdeio/http.h>
+#include <tdeio/davjob.h>
 // #include "libtdepim/resources/resourcemanager.h"
 // #include "libtdepim/resources/calendar/resourcecalendar.h"
 
diff --git a/libkpimexchange/core/exchangedelete.cpp b/libkpimexchange/core/exchangedelete.cpp
index b23e9527e..094b3b5cc 100644
--- a/libkpimexchange/core/exchangedelete.cpp
+++ b/libkpimexchange/core/exchangedelete.cpp
@@ -24,14 +24,14 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <krfcdate.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-
-#include <kio/slave.h>
-#include <kio/scheduler.h>
-#include <kio/slavebase.h>
-#include <kio/davjob.h>
-#include <kio/http.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+
+#include <tdeio/slave.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/slavebase.h>
+#include <tdeio/davjob.h>
+#include <tdeio/http.h>
 
 #include "exchangeclient.h"
 #include "exchangeprogress.h"
diff --git a/libkpimexchange/core/exchangedelete.h b/libkpimexchange/core/exchangedelete.h
index 151657e57..03b066903 100644
--- a/libkpimexchange/core/exchangedelete.h
+++ b/libkpimexchange/core/exchangedelete.h
@@ -23,7 +23,7 @@
 #include <tqstring.h>
 #include <tqwidget.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tdepimmacros.h>
 
 #include <libkcal/calendar.h>
diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp
index 75b5f100f..4fafacf9b 100644
--- a/libkpimexchange/core/exchangedownload.cpp
+++ b/libkpimexchange/core/exchangedownload.cpp
@@ -25,7 +25,7 @@
 #include <tqregexp.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <klocale.h>
@@ -34,12 +34,12 @@
 #include <kdebug.h>
 #include <krfcdate.h>
 
-#include <kio/slave.h>
-#include <kio/scheduler.h>
-#include <kio/slavebase.h>
-#include <kio/davjob.h>
-#include <kio/http.h>
-#include <kio/job.h>
+#include <tdeio/slave.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/slavebase.h>
+#include <tdeio/davjob.h>
+#include <tdeio/http.h>
+#include <tdeio/job.h>
 
 #include <libkcal/incidence.h>
 #include <libkcal/event.h>
diff --git a/libkpimexchange/core/exchangedownload.h b/libkpimexchange/core/exchangedownload.h
index 33d135603..931d53bfe 100644
--- a/libkpimexchange/core/exchangedownload.h
+++ b/libkpimexchange/core/exchangedownload.h
@@ -25,7 +25,7 @@
 #include <tqdatetime.h>
 #include <tqdom.h>
 #include <tqmap.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/icalformat.h>
diff --git a/libkpimexchange/core/exchangemonitor.cpp b/libkpimexchange/core/exchangemonitor.cpp
index 531a2417e..df52fdabd 100644
--- a/libkpimexchange/core/exchangemonitor.cpp
+++ b/libkpimexchange/core/exchangemonitor.cpp
@@ -29,12 +29,12 @@
 #include <krfcdate.h>
 #include <kextsock.h>
 
-#include <kio/job.h>
-#include <kio/slave.h>
-#include <kio/scheduler.h>
-#include <kio/slavebase.h>
-#include <kio/davjob.h>
-#include <kio/http.h>
+#include <tdeio/job.h>
+#include <tdeio/slave.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/slavebase.h>
+#include <tdeio/davjob.h>
+#include <tdeio/http.h>
 
 #include <libkcal/event.h>
 #include <libkcal/icalformat.h>
diff --git a/libkpimexchange/core/exchangemonitor.h b/libkpimexchange/core/exchangemonitor.h
index 15b4fa992..3ba96a39b 100644
--- a/libkpimexchange/core/exchangemonitor.h
+++ b/libkpimexchange/core/exchangemonitor.h
@@ -26,7 +26,7 @@
 #include <tqhostaddress.h>
 
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/event.h>
diff --git a/libkpimexchange/core/exchangeprogress.cpp b/libkpimexchange/core/exchangeprogress.cpp
index bee71b572..2b6e0286f 100644
--- a/libkpimexchange/core/exchangeprogress.cpp
+++ b/libkpimexchange/core/exchangeprogress.cpp
@@ -26,7 +26,7 @@
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 
diff --git a/libkpimexchange/core/exchangeupload.cpp b/libkpimexchange/core/exchangeupload.cpp
index e553b40c3..f134868fd 100644
--- a/libkpimexchange/core/exchangeupload.cpp
+++ b/libkpimexchange/core/exchangeupload.cpp
@@ -24,13 +24,13 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <krfcdate.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
-#include <kio/slave.h>
-#include <kio/scheduler.h>
-#include <kio/slavebase.h>
-#include <kio/davjob.h>
-#include <kio/http.h>
+#include <tdeio/slave.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/slavebase.h>
+#include <tdeio/davjob.h>
+#include <tdeio/http.h>
 
 extern "C" {
   #include <libical/ical.h>
diff --git a/libkpimexchange/core/exchangeupload.h b/libkpimexchange/core/exchangeupload.h
index e592c00f4..85753b2ce 100644
--- a/libkpimexchange/core/exchangeupload.h
+++ b/libkpimexchange/core/exchangeupload.h
@@ -22,7 +22,7 @@
 
 #include <tqstring.h>
 #include <tqwidget.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <tdepimmacros.h>