Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

8 files changed, 43 insertions, 43 deletions

diff --git a/kresources/groupdav/groupdavaddressbookadaptor.h b/kresources/groupdav/groupdavaddressbookadaptor.h
index 7a716800b..425c63712 100644
--- a/kresources/groupdav/groupdavaddressbookadaptor.h
+++ b/kresources/groupdav/groupdavaddressbookadaptor.h
@@ -47,20 +47,20 @@ class GroupDavAddressBookAdaptor : public DavAddressBookAdaptor
 
 
     // Creating Jobs
-    KIO::Job *createListFoldersJob( const KURL &url )
+    TDEIO::Job *createListFoldersJob( const KURL &url )
         { return GroupDavGlobals::createListFoldersJob( url ); }
-    KIO::TransferJob *createListItemsJob( const KURL &url )
+    TDEIO::TransferJob *createListItemsJob( const KURL &url )
         { return GroupDavGlobals::createListItemsJob( url ); }
-    KIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype )
+    TDEIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype )
         { return GroupDavGlobals::createDownloadJob( this, url, ctype ); }
-    KIO::Job *createRemoveJob( const KURL &uploadurl, KPIM::GroupwareUploadItem *deletedItem )
+    TDEIO::Job *createRemoveJob( const KURL &uploadurl, KPIM::GroupwareUploadItem *deletedItem )
         { return GroupDavGlobals::createRemoveJob( this, uploadurl, deletedItem ); }
 
 
     // Interpreting Jobs
-    bool interpretListItemsJob( KIO::Job *job, const TQString &/*jobData*/ )
+    bool interpretListItemsJob( TDEIO::Job *job, const TQString &/*jobData*/ )
         { return GroupDavGlobals::interpretListItemsJob( this, job ); }
-    bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData )
+    bool interpretDownloadItemsJob( TDEIO::Job *job, const TQString &jobData )
         { return GroupDavGlobals::interpretAddressBookDownloadItemsJob(
            this, job, jobData ); }
 
diff --git a/kresources/groupdav/groupdavcalendaradaptor.h b/kresources/groupdav/groupdavcalendaradaptor.h
index 15b41de80..b1a0bd366 100644
--- a/kresources/groupdav/groupdavcalendaradaptor.h
+++ b/kresources/groupdav/groupdavcalendaradaptor.h
@@ -30,7 +30,7 @@
 
 #include <kurl.h>
 
-namespace KIO {
+namespace TDEIO {
 class Job;
 }
 
@@ -56,20 +56,20 @@ class GroupDavCalendarAdaptor : public DavCalendarAdaptor
 
 
     // Creating Jobs
-    KIO::Job *createListFoldersJob( const KURL &url )
+    TDEIO::Job *createListFoldersJob( const KURL &url )
         { return GroupDavGlobals::createListFoldersJob( url ); }
-    KIO::TransferJob *createListItemsJob( const KURL &url )
+    TDEIO::TransferJob *createListItemsJob( const KURL &url )
         { return GroupDavGlobals::createListItemsJob( url ); }
-    KIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype )
+    TDEIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype )
         { return GroupDavGlobals::createDownloadJob( this, url, ctype ); }
-    KIO::Job *createRemoveJob( const KURL &uploadurl, KPIM::GroupwareUploadItem *deletedItem )
+    TDEIO::Job *createRemoveJob( const KURL &uploadurl, KPIM::GroupwareUploadItem *deletedItem )
         { return GroupDavGlobals::createRemoveJob( this, uploadurl, deletedItem ); }
 
 
     // Interpreting Jobs
-    bool interpretListItemsJob( KIO::Job *job, const TQString &/*jobData*/ )
+    bool interpretListItemsJob( TDEIO::Job *job, const TQString &/*jobData*/ )
         { return GroupDavGlobals::interpretListItemsJob( this, job ); }
-    bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData )
+    bool interpretDownloadItemsJob( TDEIO::Job *job, const TQString &jobData )
         { return GroupDavGlobals::interpretCalendarDownloadItemsJob( this, job, jobData );  }
 
 
diff --git a/kresources/groupdav/groupdavglobals.cpp b/kresources/groupdav/groupdavglobals.cpp
index 896680e9e..5088bca96 100644
--- a/kresources/groupdav/groupdavglobals.cpp
+++ b/kresources/groupdav/groupdavglobals.cpp
@@ -37,7 +37,7 @@
 #include <kio/davjob.h>
 #include <kio/job.h>
 
-TQString GroupDavGlobals::extractFingerprint( KIO::Job *job, const TQString &/*jobData*/ )
+TQString GroupDavGlobals::extractFingerprint( TDEIO::Job *job, const TQString &/*jobData*/ )
 {
   const TQString& headers = job->queryMetaData( "HTTP-Headers" );
   return WebdavHandler::getEtagFromHeaders( headers );
@@ -93,7 +93,7 @@ bool GroupDavGlobals::getFolderHasSubs( const TQDomNode &folderNode )
 
 
 
-KIO::Job *GroupDavGlobals::createListFoldersJob( const KURL &url )
+TDEIO::Job *GroupDavGlobals::createListFoldersJob( const KURL &url )
 {
   TQDomDocument doc;
   TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "d:propfind" );
@@ -103,11 +103,11 @@ KIO::Job *GroupDavGlobals::createListFoldersJob( const KURL &url )
 //  WebdavHandler::addElement( doc, prop, "d:hassubs" );
 
   kdDebug(7000) << "props: " << doc.toString() << endl;
-  return KIO::davPropFind( url, doc, "1", false );
+  return TDEIO::davPropFind( url, doc, "1", false );
 }
 
 
-KIO::TransferJob *GroupDavGlobals::createListItemsJob( const KURL &url )
+TDEIO::TransferJob *GroupDavGlobals::createListItemsJob( const KURL &url )
 {
   TQDomDocument doc;
   TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "propfind" );
@@ -115,7 +115,7 @@ KIO::TransferJob *GroupDavGlobals::createListItemsJob( const KURL &url )
   WebdavHandler::addDavElement( doc, prop, "getetag" );
 //  WebdavHandler::addDavElement( doc, prop, "getcontenttype" );
   kdDebug(5800) << "props = "<< doc.toString() << endl;
-  KIO::TransferJob *job = KIO::davPropFind( url, doc, "1", false );
+  TDEIO::TransferJob *job = TDEIO::davPropFind( url, doc, "1", false );
   if ( job ) {
     job->addMetaData( "accept", "text/xml" );
     job->addMetaData( "customHTTPHeader", "accept-encoding: " );
@@ -124,11 +124,11 @@ KIO::TransferJob *GroupDavGlobals::createListItemsJob( const KURL &url )
 }
 
 
-KIO::TransferJob *GroupDavGlobals::createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor,
+TDEIO::TransferJob *GroupDavGlobals::createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor,
                     const KURL &url, KPIM::FolderLister::ContentType /*ctype*/ )
 {
 kdDebug()<<"GroupDavGlobals::createDownloadJob, url="<<url.url()<<endl;
-  KIO::TransferJob *job = KIO::get( url, false, false );
+  TDEIO::TransferJob *job = TDEIO::get( url, false, false );
   if ( adaptor ) {
     TQString mt = adaptor->mimeType();
     job->addMetaData( "accept", mt );
@@ -138,7 +138,7 @@ kdDebug()<<"GroupDavGlobals::createDownloadJob, url="<<url.url()<<endl;
 }
 
 
-KIO::Job *GroupDavGlobals::createRemoveJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &/*uploadurl*/,
+TDEIO::Job *GroupDavGlobals::createRemoveJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &/*uploadurl*/,
        KPIM::GroupwareUploadItem *deletedItem )
 {
   if ( !deletedItem ) return 0;
@@ -147,10 +147,10 @@ KIO::Job *GroupDavGlobals::createRemoveJob( KPIM::GroupwareDataAdaptor *adaptor,
   if ( adaptor ) {
     adaptor->adaptUploadUrl( url );
   }
-  KIO::Job *delJob = 0;
+  TDEIO::Job *delJob = 0;
   if ( !url.isEmpty() ) {
     kdDebug(5700) << "Delete: " <<   url.url() << endl;
-    delJob = KIO::file_delete( url, false );
+    delJob = TDEIO::file_delete( url, false );
   }
   if ( delJob && adaptor && adaptor->idMapper() ) {
     kdDebug(5800 ) << "Adding If-Match metadata: " << adaptor->idMapper()->fingerprint( deletedItem->uid() ) << endl;
@@ -176,16 +176,16 @@ kdDebug() << "Deleting item at "<< url.url() << endl;
     }
     kdDebug(5700) << "Delete (Mod) : " <<   url.url() << endl;
   }
-  return KIO::file_del( urls, false, false );*/
+  return TDEIO::file_del( urls, false, false );*/
 }
 
 
 
 
 bool GroupDavGlobals::interpretListItemsJob( KPIM::GroupwareDataAdaptor *adaptor,
-                                        KIO::Job *job )
+                                        TDEIO::Job *job )
 {
-  KIO::DavJob *davjob = dynamic_cast<KIO::DavJob *>(job);
+  TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob *>(job);
 
   if ( !davjob ) {
     return false;
@@ -225,7 +225,7 @@ bool GroupDavGlobals::interpretListItemsJob( KPIM::GroupwareDataAdaptor *adaptor
 
 
 bool GroupDavGlobals::interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *adaptor,
-                                         KIO::Job *job, const TQString &jobData )
+                                         TDEIO::Job *job, const TQString &jobData )
 {
 kdDebug(5800) << "GroupDavGlobals::interpretCalendarDownloadItemsJob, iCalendar=" << endl;
 kdDebug(5800) << jobData << endl;
@@ -244,7 +244,7 @@ kdDebug(5800) << jobData << endl;
 
     KCal::Incidence *inc = (raw.front())->clone();
     if ( !inc ) return false;
-    KIO::SimpleJob *sjob = dynamic_cast<KIO::SimpleJob *>(job);
+    TDEIO::SimpleJob *sjob = dynamic_cast<TDEIO::SimpleJob *>(job);
     KURL remoteId;
     if ( sjob ) remoteId = sjob->url();
     TQString fingerprint = extractFingerprint( job, jobData );
@@ -259,7 +259,7 @@ kdDebug(5800) << jobData << endl;
 
 
 bool GroupDavGlobals::interpretAddressBookDownloadItemsJob(
-      KABC::AddressBookAdaptor *adaptor, KIO::Job *job, const TQString &jobData )
+      KABC::AddressBookAdaptor *adaptor, TDEIO::Job *job, const TQString &jobData )
 {
 kdDebug(5800) << "GroupDavGlobals::interpretAddressBookDownloadItemsJob, vCard=" << endl;
 kdDebug(5800) << jobData << endl;
@@ -275,7 +275,7 @@ kdDebug(5800) << jobData << endl;
 
   KABC::Addressee a = addrs.first();
 
-  KIO::SimpleJob *sjob = dynamic_cast<KIO::SimpleJob*>(job);
+  TDEIO::SimpleJob *sjob = dynamic_cast<TDEIO::SimpleJob*>(job);
   KURL remoteId;
   if ( sjob ) remoteId = sjob->url();
   TQString fingerprint = extractFingerprint( job, jobData );
diff --git a/kresources/groupdav/groupdavglobals.h b/kresources/groupdav/groupdavglobals.h
index 14ae7a3c8..e7f2b06e7 100644
--- a/kresources/groupdav/groupdavglobals.h
+++ b/kresources/groupdav/groupdavglobals.h
@@ -32,7 +32,7 @@ namespace KPIM {
 class GroupwareDataAdaptor;
 class GroupwareUploadItem;
 }
-namespace KIO {
+namespace TDEIO {
 class TransferJob;
 class Job;
 }
@@ -47,26 +47,26 @@ class GroupDavGlobals
 {
   public:
     GroupDavGlobals() {}
-    static TQString extractFingerprint( KIO::Job *job, const TQString &/*jobData*/ );
+    static TQString extractFingerprint( TDEIO::Job *job, const TQString &/*jobData*/ );
     static KPIM::FolderLister::ContentType getContentType( const TQDomElement &prop );
     static KPIM::FolderLister::ContentType getContentType( const TQDomNode &folderNode );
     static bool getFolderHasSubs( const TQDomNode &folderNode );
 
 
-    static KIO::Job *createListFoldersJob( const KURL &url );
-    static KIO::TransferJob *createListItemsJob( const KURL &url );
-    static KIO::TransferJob *createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor,
+    static TDEIO::Job *createListFoldersJob( const KURL &url );
+    static TDEIO::TransferJob *createListItemsJob( const KURL &url );
+    static TDEIO::TransferJob *createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor,
                        const KURL &url, KPIM::FolderLister::ContentType ctype );
-    static KIO::Job *createRemoveJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &uploadurl,
+    static TDEIO::Job *createRemoveJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &uploadurl,
                           KPIM::GroupwareUploadItem *deletedItems );
 
 
     static bool interpretListItemsJob( KPIM::GroupwareDataAdaptor *adaptor,
-                                       KIO::Job *job );
+                                       TDEIO::Job *job );
     static bool interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *adaptor,
-                                        KIO::Job *job, const TQString &jobData );
+                                        TDEIO::Job *job, const TQString &jobData );
     static bool interpretAddressBookDownloadItemsJob( KABC::AddressBookAdaptor *adaptor,
-                                        KIO::Job *job, const TQString &jobData );
+                                        TDEIO::Job *job, const TQString &jobData );
 
 };
 
diff --git a/kresources/groupdav/kabc_resourcegroupdav.cpp b/kresources/groupdav/kabc_resourcegroupdav.cpp
index 568f6fc5a..54a02a0ad 100644
--- a/kresources/groupdav/kabc_resourcegroupdav.cpp
+++ b/kresources/groupdav/kabc_resourcegroupdav.cpp
@@ -27,7 +27,7 @@
 
 using namespace KABC;
 
-ResourceGroupDav::ResourceGroupDav( const KConfig *config )
+ResourceGroupDav::ResourceGroupDav( const TDEConfig *config )
   : ResourceGroupwareBase( config )
 {
   init();
diff --git a/kresources/groupdav/kabc_resourcegroupdav.h b/kresources/groupdav/kabc_resourcegroupdav.h
index 662af282f..ca7ed96d3 100644
--- a/kresources/groupdav/kabc_resourcegroupdav.h
+++ b/kresources/groupdav/kabc_resourcegroupdav.h
@@ -33,7 +33,7 @@ class KDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase
   
 
   public:
-    ResourceGroupDav( const KConfig * );
+    ResourceGroupDav( const TDEConfig * );
 //     ResourceGroupDav( const KURL &url,
 //             const TQString &user, const TQString &password );
   protected:
diff --git a/kresources/groupdav/kcal_resourcegroupdav.cpp b/kresources/groupdav/kcal_resourcegroupdav.cpp
index eef95c6e0..b93ba7693 100644
--- a/kresources/groupdav/kcal_resourcegroupdav.cpp
+++ b/kresources/groupdav/kcal_resourcegroupdav.cpp
@@ -32,7 +32,7 @@ ResourceGroupDav::ResourceGroupDav()
   init();
 }
 
-ResourceGroupDav::ResourceGroupDav( const KConfig *config )
+ResourceGroupDav::ResourceGroupDav( const TDEConfig *config )
   : ResourceGroupwareBase( config )
 {
   init();
diff --git a/kresources/groupdav/kcal_resourcegroupdav.h b/kresources/groupdav/kcal_resourcegroupdav.h
index 102a5021b..dba9bd274 100644
--- a/kresources/groupdav/kcal_resourcegroupdav.h
+++ b/kresources/groupdav/kcal_resourcegroupdav.h
@@ -37,7 +37,7 @@ class KDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase
   
   public:
     ResourceGroupDav();
-    ResourceGroupDav( const KConfig * );
+    ResourceGroupDav( const TDEConfig * );
 
   protected:
     void init();