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

14 files changed, 16 insertions, 16 deletions

diff --git a/tderesources/lib/addressbookadaptor.cpp b/tderesources/lib/addressbookadaptor.cpp
index 8cc28f67a..230ac3509 100644
--- a/tderesources/lib/addressbookadaptor.cpp
+++ b/tderesources/lib/addressbookadaptor.cpp
@@ -26,7 +26,7 @@
 #include <kabc/addressee.h>
 #include <kabc/vcardconverter.h>
 #include <libtdepim/kabcresourcecached.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 
 using namespace KABC;
diff --git a/tderesources/lib/calendaradaptor.cpp b/tderesources/lib/calendaradaptor.cpp
index f2e255f0d..ffbccefc5 100644
--- a/tderesources/lib/calendaradaptor.cpp
+++ b/tderesources/lib/calendaradaptor.cpp
@@ -28,7 +28,7 @@
 #include <libkcal/resourcecached.h>
 #include <libkcal/icalformat.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <kdebug.h>
 
diff --git a/tderesources/lib/davaddressbookadaptor.cpp b/tderesources/lib/davaddressbookadaptor.cpp
index 5b4a0a521..bf4a03476 100644
--- a/tderesources/lib/davaddressbookadaptor.cpp
+++ b/tderesources/lib/davaddressbookadaptor.cpp
@@ -30,8 +30,8 @@
 // #include <kabc/vcardconverter.h>
 // #include <kabcresourcecached.h>
 
-#include <kio/davjob.h>
-// #include <kio/job.h>
+#include <tdeio/davjob.h>
+// #include <tdeio/job.h>
 #include <kdebug.h>
 
 using namespace KABC;
diff --git a/tderesources/lib/davcalendaradaptor.cpp b/tderesources/lib/davcalendaradaptor.cpp
index 5d6be2da6..5263c2a18 100644
--- a/tderesources/lib/davcalendaradaptor.cpp
+++ b/tderesources/lib/davcalendaradaptor.cpp
@@ -22,7 +22,7 @@
 #include "davcalendaradaptor.h"
 
 #include <kdebug.h>
-#include <kio/davjob.h>
+#include <tdeio/davjob.h>
 // #include <folderlister.h>
 
 // #include <tqdom.h>
diff --git a/tderesources/lib/folderlister.cpp b/tderesources/lib/folderlister.cpp
index 6cb341acd..c12d3ae69 100644
--- a/tderesources/lib/folderlister.cpp
+++ b/tderesources/lib/folderlister.cpp
@@ -25,10 +25,10 @@
 #include "groupwaredataadaptor.h"
 #include "tderesources_groupwareprefs.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqstringlist.h>
 
 using namespace KPIM;
diff --git a/tderesources/lib/groupwaredataadaptor.cpp b/tderesources/lib/groupwaredataadaptor.cpp
index 85dacdaa8..4a89bd02c 100644
--- a/tderesources/lib/groupwaredataadaptor.cpp
+++ b/tderesources/lib/groupwaredataadaptor.cpp
@@ -23,7 +23,7 @@
 
 #include "groupwaredataadaptor.h"
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <libemailfunctions/idmapper.h>
 
 using namespace KPIM;
diff --git a/tderesources/lib/groupwaredownloadjob.cpp b/tderesources/lib/groupwaredownloadjob.cpp
index 9104da847..63c7e988d 100644
--- a/tderesources/lib/groupwaredownloadjob.cpp
+++ b/tderesources/lib/groupwaredownloadjob.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <libemailfunctions/idmapper.h>
 #include <libtdepim/progressmanager.h>
 
diff --git a/tderesources/lib/groupwareresourcejob.h b/tderesources/lib/groupwareresourcejob.h
index f2818f2cd..d32caaae1 100644
--- a/tderesources/lib/groupwareresourcejob.h
+++ b/tderesources/lib/groupwareresourcejob.h
@@ -32,7 +32,7 @@ namespace KPIM {
 class GroupwareDataAdaptor;
 
 /**
-  This class provides a resource for accessing a Groupware kioslave-based
+  This class provides a resource for accessing a Groupware tdeioslave-based
   calendar.
 */
 class GroupwareJob : public TQObject
diff --git a/tderesources/lib/groupwareuploadjob.cpp b/tderesources/lib/groupwareuploadjob.cpp
index cf46571fc..e896c0dab 100644
--- a/tderesources/lib/groupwareuploadjob.cpp
+++ b/tderesources/lib/groupwareuploadjob.cpp
@@ -31,7 +31,7 @@
 
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <tqstringlist.h>
 #include <tqtimer.h>
diff --git a/tderesources/lib/groupwareuploadjob.h b/tderesources/lib/groupwareuploadjob.h
index b3a0ff756..13ba3ed54 100644
--- a/tderesources/lib/groupwareuploadjob.h
+++ b/tderesources/lib/groupwareuploadjob.h
@@ -41,7 +41,7 @@ class GroupwareDataAdaptor;
 class ProgressItem;
 
 /**
-  This class provides a resource for accessing a Groupware kioslave-based
+  This class provides a resource for accessing a Groupware tdeioslave-based
   calendar.
 */
 class GroupwareUploadJob : public GroupwareJob
diff --git a/tderesources/lib/kcal_cachesettingsdlg.h b/tderesources/lib/kcal_cachesettingsdlg.h
index 1a6b369ab..51263e263 100644
--- a/tderesources/lib/kcal_cachesettingsdlg.h
+++ b/tderesources/lib/kcal_cachesettingsdlg.h
@@ -36,7 +36,7 @@ class ResourceCachedReloadConfig;
 class ResourceCachedSaveConfig;
 
 /**
-  Configuration widget for groupware kioslave resource.
+  Configuration widget for groupware tdeioslave resource.
   @see KCalOpenGroupware
 */
 class KDE_EXPORT CacheSettingsDialog : public KDialogBase
diff --git a/tderesources/lib/kcal_resourcegroupwarebase.cpp b/tderesources/lib/kcal_resourcegroupwarebase.cpp
index bd459331a..56ffae7d5 100644
--- a/tderesources/lib/kcal_resourcegroupwarebase.cpp
+++ b/tderesources/lib/kcal_resourcegroupwarebase.cpp
@@ -31,7 +31,7 @@
 #include "groupwareuploadjob.h"
 
 #include <libkcal/icalformat.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 
 #include <tqapplication.h>
diff --git a/tderesources/lib/kcal_resourcegroupwarebase.h b/tderesources/lib/kcal_resourcegroupwarebase.h
index f6b46dbf7..8a1033fb2 100644
--- a/tderesources/lib/kcal_resourcegroupwarebase.h
+++ b/tderesources/lib/kcal_resourcegroupwarebase.h
@@ -46,7 +46,7 @@ namespace KCal {
 class CalendarAdaptor;
 
 /**
-  This class provides a resource for accessing a Groupware kioslave-based
+  This class provides a resource for accessing a Groupware tdeioslave-based
   calendar.
 */
 class KDE_EXPORT ResourceGroupwareBase : public ResourceCached
diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h
index ab4f841a2..7639b562f 100644
--- a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h
+++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h
@@ -40,7 +40,7 @@ namespace KCal {
 class CacheSettingsDialog;
 
 /**
-  Configuration widget for groupware kioslave resource.
+  Configuration widget for groupware tdeioslave resource.
 
   @see KCalOpenGroupware
 */