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

17 files changed, 143 insertions, 143 deletions

diff --git a/kresources/lib/Makefile.am b/kresources/lib/Makefile.am
index 10719ed53..37d08bedc 100644
--- a/kresources/lib/Makefile.am
+++ b/kresources/lib/Makefile.am
@@ -24,7 +24,7 @@ METASOURCES = AUTO
 ### We use three (or more) namespaces here in here - KPIM, KABC and KCal.
 ### When using multiple "using namespace foo" declarations, namespaced
 ### definitions cannot be resolved properly; we could use namespace foo { }
-### instead, but this breaks on KConfigXT generated code, which still uses
+### instead, but this breaks on TDEConfigXT generated code, which still uses
 ### "using namespace" and can't be fixed due to our backwards-compatibility
 ### requirements. This is only fatal when doing --enable-final, since only
 ### then do all the namespaces get mixed together.
diff --git a/kresources/lib/davaddressbookadaptor.cpp b/kresources/lib/davaddressbookadaptor.cpp
index f96e353dd..5b4a0a521 100644
--- a/kresources/lib/davaddressbookadaptor.cpp
+++ b/kresources/lib/davaddressbookadaptor.cpp
@@ -36,9 +36,9 @@
 
 using namespace KABC;
 
-void DavAddressBookAdaptor::interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister */*folderLister*/ )
+void DavAddressBookAdaptor::interpretListFoldersJob( TDEIO::Job *job, KPIM::FolderLister */*folderLister*/ )
 {
-  KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>( job );
+  TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob*>( job );
   Q_ASSERT( davjob );
   if ( !davjob ) return;
 
diff --git a/kresources/lib/davaddressbookadaptor.h b/kresources/lib/davaddressbookadaptor.h
index 55bb18193..f0f6f39d2 100644
--- a/kresources/lib/davaddressbookadaptor.h
+++ b/kresources/lib/davaddressbookadaptor.h
@@ -38,7 +38,7 @@ class KDE_EXPORT DavAddressBookAdaptor : public AddressBookAdaptor
         the job describes a folder of the appropriate type, by emitting 
         folderInfoRetrieved( href, displayName, type ). If the folder has
         subfolders, just emit retrieveSubfolder( href ) for each of them. */
-    virtual void interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister *folderLister );
+    virtual void interpretListFoldersJob( TDEIO::Job *job, KPIM::FolderLister *folderLister );
     /** Returns the type of folder retrieved in the dom node. Typically, you'll
         compare the DAV:resourcetype property with some values. */
     virtual KPIM::FolderLister::ContentType getContentType( const TQDomNode &folderNode ) = 0;
diff --git a/kresources/lib/davcalendaradaptor.cpp b/kresources/lib/davcalendaradaptor.cpp
index 206bb7e96..5d6be2da6 100644
--- a/kresources/lib/davcalendaradaptor.cpp
+++ b/kresources/lib/davcalendaradaptor.cpp
@@ -31,9 +31,9 @@ using namespace KCal;
 
 // TODO: This is exactly the same code as for the DavAddressBookAdaptor::interpretListFoldersJob!
 //       But as this emits a signal, it needs to be located inside a TQObject
-void DavCalendarAdaptor::interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister */*folderLister*/ )
+void DavCalendarAdaptor::interpretListFoldersJob( TDEIO::Job *job, KPIM::FolderLister */*folderLister*/ )
 {
-  KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>( job );
+  TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob*>( job );
   Q_ASSERT( davjob );
   if ( !davjob ) return;
 
diff --git a/kresources/lib/davcalendaradaptor.h b/kresources/lib/davcalendaradaptor.h
index 00134eda9..998a9cc7d 100644
--- a/kresources/lib/davcalendaradaptor.h
+++ b/kresources/lib/davcalendaradaptor.h
@@ -38,7 +38,7 @@ class KDE_EXPORT DavCalendarAdaptor : public CalendarAdaptor
         the job describes a folder of the appropriate type, by emitting 
         folderInfoRetrieved( href, displayName, type ). If the folder has
         subfolders, just emit retrieveSubfolder( href ) for each of them. */
-    virtual void interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister *folderLister );
+    virtual void interpretListFoldersJob( TDEIO::Job *job, KPIM::FolderLister *folderLister );
     /** Returns the type of folder retrieved in the dom node. Typically, you'll
         compare the DAV:resourcetype property with some values. */
     virtual KPIM::FolderLister::ContentType getContentType( const TQDomNode &folderNode ) = 0;
diff --git a/kresources/lib/folderlister.cpp b/kresources/lib/folderlister.cpp
index affc6af57..eb91243b7 100644
--- a/kresources/lib/folderlister.cpp
+++ b/kresources/lib/folderlister.cpp
@@ -177,7 +177,7 @@ void FolderLister::writeConfig( GroupwarePrefsBase *newprefs )
   TQStringList names;
   TQStringList active;
 
-//   KConfigGroup cfgg( newprefs->config(), "Folders" );
+//   TDEConfigGroup cfgg( newprefs->config(), "Folders" );
   int nr = 0;
   Entry::List::ConstIterator it;
   for( it = mFolders.begin(); it != mFolders.end(); ++it ) {
@@ -266,14 +266,14 @@ void FolderLister::doRetrieveFolder( const KURL &u )
     kdDebug()<<"Item "<<u.path(-1)<<" is already being downloaded "<<endl;
   } else {
 
-    KIO::Job *listjob = createListFoldersJob( url );
+    TDEIO::Job *listjob = createListFoldersJob( url );
     if ( listjob ) {
       mUrls.append( url );
 
       kdDebug(7000) << "FolderLister::retrieveFolders: adjustedURL=" 
                     << url.prettyURL() << endl;
-      connect( listjob, TQT_SIGNAL( result( KIO::Job * ) ),
-               TQT_SLOT( slotListJobResult( KIO::Job * ) ) );
+      connect( listjob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+               TQT_SLOT( slotListJobResult( TDEIO::Job * ) ) );
     } else {
       // TODO: Indicate a problem to the user!
       kdWarning() << "Unable to create the folder list job for the url " 
@@ -319,13 +319,13 @@ kdDebug() << "Folder "<< href << " is not of correct type ("<<type<<")"<<endl;
   }
 }
 
-void FolderLister::slotListJobResult( KIO::Job *job )
+void FolderLister::slotListJobResult( TDEIO::Job *job )
 {
   kdDebug(7000) << "OpenGroupware::slotListJobResult(): " << endl;
   kdDebug() << "URLS (" << mUrls.count() << "): " << mUrls.toStringList().join(" | ") << endl;
   kdDebug() << "Processed URLS (" << mProcessedPathes.count() << "): "
             << mProcessedPathes.join(" | ") << endl;
-  KIO::SimpleJob *j = dynamic_cast<KIO::SimpleJob*>(job);
+  TDEIO::SimpleJob *j = dynamic_cast<TDEIO::SimpleJob*>(job);
   if ( j ) {
     mUrls.remove( j->url() );
     mProcessedPathes.append( j->url().path(-1) );
@@ -346,7 +346,7 @@ void FolderLister::slotListJobResult( KIO::Job *job )
   }
 }
 
-void FolderLister::interpretListFoldersJob( KIO::Job *job )
+void FolderLister::interpretListFoldersJob( TDEIO::Job *job )
 {
   if ( adaptor() ) {
     adaptor()->interpretListFoldersJob( job, this );
@@ -357,7 +357,7 @@ void FolderLister::interpretListFoldersJob( KIO::Job *job )
   }
 }
 
-KIO::Job *FolderLister::createListFoldersJob( const KURL &url )
+TDEIO::Job *FolderLister::createListFoldersJob( const KURL &url )
 {
   if ( adaptor() ) {
     return adaptor()->createListFoldersJob( url );
diff --git a/kresources/lib/folderlister.h b/kresources/lib/folderlister.h
index 746c99a29..8248ec22a 100644
--- a/kresources/lib/folderlister.h
+++ b/kresources/lib/folderlister.h
@@ -33,11 +33,11 @@
 #include <tqstringlist.h>
 #include <tqobject.h>
 
-namespace KIO {
+namespace TDEIO {
 class Job;
 }
 
-class KConfig;
+class TDEConfig;
 
 namespace KPIM {
 
@@ -100,7 +100,7 @@ class KDE_EXPORT FolderLister : public TQObject
     void foldersRead();
 
   protected slots:
-    void slotListJobResult( KIO::Job * );
+    void slotListJobResult( TDEIO::Job * );
     /** Adds the folder with the given url and display name to the folder
      *  tree (if is has an appropriate type) */
     virtual void processFolderResult( const KURL &href,
@@ -117,7 +117,7 @@ class KDE_EXPORT FolderLister : public TQObject
     /** Creates the job to retrieve information about the folder at the given
         url. It's results will be interpreted by interpretFolderResult
     */
-    virtual KIO::Job *createListFoldersJob( const KURL &url );
+    virtual TDEIO::Job *createListFoldersJob( const KURL &url );
     /** Interprets the results returned by the liste job (created by
      *  createJob(url) ). The default implementation calls
      *  interpretFolderListJob of the GroupwareDataAdaptor. Typically,
@@ -125,7 +125,7 @@ class KDE_EXPORT FolderLister : public TQObject
      *  folder of the appropriate type, by calling processsFolderResult.
      *  If the folder has subfolders, just call doRetrieveFolder(url)
      *  recursively. */
-    virtual void interpretListFoldersJob( KIO::Job *job );
+    virtual void interpretListFoldersJob( TDEIO::Job *job );
     /** List of folders that will always be included (subfolders won't!).
      *  Usually this is not needed as you should traverse the whole folder
      *  tree starting from the user's root dir. */
diff --git a/kresources/lib/groupwaredataadaptor.cpp b/kresources/lib/groupwaredataadaptor.cpp
index da012b158..85dacdaa8 100644
--- a/kresources/lib/groupwaredataadaptor.cpp
+++ b/kresources/lib/groupwaredataadaptor.cpp
@@ -49,7 +49,7 @@ kdDebug() << "Final Path for new item: " << u.url() << endl;
   } else return baseurl;
 }
 
-KIO::TransferJob *GroupwareUploadItem::createRawUploadJob(
+TDEIO::TransferJob *GroupwareUploadItem::createRawUploadJob(
                        GroupwareDataAdaptor *adaptor, const KURL &/*baseurl*/ )
 {
   Q_ASSERT( adaptor );
@@ -60,7 +60,7 @@ KIO::TransferJob *GroupwareUploadItem::createRawUploadJob(
   if ( adaptor )
     adaptor->adaptUploadUrl( upUrl );
   kdDebug(7000) << "Uploading to: " << upUrl.prettyURL() << endl;
-  KIO::TransferJob *job = KIO::storedPut( dta.utf8(), upUrl, -1, true,
+  TDEIO::TransferJob *job = TDEIO::storedPut( dta.utf8(), upUrl, -1, true,
                                           false, false );
   job->addMetaData( "PropagateHttpHeader", "true" );
   if ( adaptor ) {
@@ -69,12 +69,12 @@ KIO::TransferJob *GroupwareUploadItem::createRawUploadJob(
   return job;
 }
 
-KIO::TransferJob *GroupwareUploadItem::createUploadNewJob(
+TDEIO::TransferJob *GroupwareUploadItem::createUploadNewJob(
       GroupwareDataAdaptor *adaptor, const KURL &baseurl )
 {
 kdDebug()<<"GroupwareUploadItem::createUploadNewJob, baseurl=" << baseurl.url() << endl;
   setUrl( adaptNewItemUrl( adaptor, baseurl ) );
-  KIO::TransferJob *job = createRawUploadJob( adaptor, baseurl );
+  TDEIO::TransferJob *job = createRawUploadJob( adaptor, baseurl );
   if ( job ) {
     kdDebug() << "Adding If-None-Match " << endl;
     TQString header;
@@ -88,11 +88,11 @@ kdDebug()<<"GroupwareUploadItem::createUploadNewJob, baseurl=" << baseurl.url()
   return job;
 }
 
-KIO::TransferJob *GroupwareUploadItem::createUploadJob(
+TDEIO::TransferJob *GroupwareUploadItem::createUploadJob(
                            GroupwareDataAdaptor *adaptor, const KURL &baseurl )
 {
 kdDebug()<<"GroupwareUploadItem::createUploadJob" << endl;
-  KIO::TransferJob *job = createRawUploadJob( adaptor, baseurl );
+  TDEIO::TransferJob *job = createRawUploadJob( adaptor, baseurl );
   if ( job && adaptor ) {
   kdDebug()<<"Adding If-Match header: " << adaptor->idMapper()->fingerprint( uid() ) << endl;
     TQString header;
@@ -131,22 +131,22 @@ FolderLister::Entry::List GroupwareDataAdaptor::defaultFolders()
   return FolderLister::Entry::List();
 }
 
-KIO::TransferJob *GroupwareDataAdaptor::createUploadJob( const KURL &url,
+TDEIO::TransferJob *GroupwareDataAdaptor::createUploadJob( const KURL &url,
                                                      GroupwareUploadItem *item )
 {
   if ( item ) {
-    KIO::TransferJob *job = item->createUploadJob( this, url );
+    TDEIO::TransferJob *job = item->createUploadJob( this, url );
     setUidForJob( job, item->uid() );
     return job;
   } else return 0;
 }
 
-KIO::TransferJob *GroupwareDataAdaptor::createUploadNewJob( const KURL &url,
+TDEIO::TransferJob *GroupwareDataAdaptor::createUploadNewJob( const KURL &url,
                                                      GroupwareUploadItem *item )
 {
 kdDebug()<<"GroupwareDataAdaptor::createUploadNewJob, url=" << url.url() << endl;
   if ( item ) {
-    KIO::TransferJob *job = item->createUploadNewJob( this, url );
+    TDEIO::TransferJob *job = item->createUploadNewJob( this, url );
     setUidForJob( job, item->uid() );
     return job;
   } else return 0;
@@ -190,10 +190,10 @@ void GroupwareDataAdaptor::processDownloadListItem( const KURL &entry,
   }
 }
 
-bool GroupwareDataAdaptor::interpretRemoveJob( KIO::Job *job, const TQString &/*jobData*/ )
+bool GroupwareDataAdaptor::interpretRemoveJob( TDEIO::Job *job, const TQString &/*jobData*/ )
 {
   if ( !job ) return false;
-  KIO::DeleteJob *deljob = dynamic_cast<KIO::DeleteJob*>(job);
+  TDEIO::DeleteJob *deljob = dynamic_cast<TDEIO::DeleteJob*>(job);
   bool error = job->error();
   const TQString err = job->errorString();
 
@@ -214,10 +214,10 @@ bool GroupwareDataAdaptor::interpretRemoveJob( KIO::Job *job, const TQString &/*
 }
 
 
-bool GroupwareDataAdaptor::interpretUploadJob( KIO::Job *job, const TQString &/*jobData*/ )
+bool GroupwareDataAdaptor::interpretUploadJob( TDEIO::Job *job, const TQString &/*jobData*/ )
 {
   kdDebug(7000) << "GroupwareDataAdaptor::interpretUploadJob " << endl;
-  KIO::TransferJob *trfjob = dynamic_cast<KIO::TransferJob*>(job);
+  TDEIO::TransferJob *trfjob = dynamic_cast<TDEIO::TransferJob*>(job);
   bool error = job->error();
   const TQString err = job->errorString();
 
@@ -236,11 +236,11 @@ bool GroupwareDataAdaptor::interpretUploadJob( KIO::Job *job, const TQString &/*
   }
 }
 
-bool GroupwareDataAdaptor::interpretUploadNewJob( KIO::Job *job, const TQString &/*jobData*/ )
+bool GroupwareDataAdaptor::interpretUploadNewJob( TDEIO::Job *job, const TQString &/*jobData*/ )
 {
 // TODO: How does the incidence mapper know the old/new ids???
   kdDebug(7000) << "GroupwareDataAdaptor::interpretUploadNewJob " << endl;
-  KIO::TransferJob *trfjob = dynamic_cast<KIO::TransferJob*>(job);
+  TDEIO::TransferJob *trfjob = dynamic_cast<TDEIO::TransferJob*>(job);
   bool error = job->error();
   const TQString err = job->errorString();
 
@@ -259,7 +259,7 @@ bool GroupwareDataAdaptor::interpretUploadNewJob( KIO::Job *job, const TQString
   }
 }
 
-TQString GroupwareDataAdaptor::uidFromJob( KIO::Job *job ) const
+TQString GroupwareDataAdaptor::uidFromJob( TDEIO::Job *job ) const
 {
 kdDebug()<<"GroupwareDataAdaptor::uidFromJob( "<<job<<")"<<endl;
   if ( mJobUIDMap.contains( job ) ) {
@@ -270,7 +270,7 @@ kdDebug()<<"GroupwareDataAdaptor::uidFromJob( "<<job<<")"<<endl;
   }
 }
 
-void GroupwareDataAdaptor::setUidForJob( KIO::Job *job, const TQString &uid )
+void GroupwareDataAdaptor::setUidForJob( TDEIO::Job *job, const TQString &uid )
 {
   if ( uid.isEmpty() ) {
     mJobUIDMap.remove( job );
diff --git a/kresources/lib/groupwaredataadaptor.h b/kresources/lib/groupwaredataadaptor.h
index 5cd72419d..b7bd6e333 100644
--- a/kresources/lib/groupwaredataadaptor.h
+++ b/kresources/lib/groupwaredataadaptor.h
@@ -32,7 +32,7 @@
 #include <tdepimmacros.h>
 
 
-namespace KIO {
+namespace TDEIO {
 class TransferJob;
 class Job;
 }
@@ -70,11 +70,11 @@ class KDE_EXPORT GroupwareUploadItem
     virtual KURL adaptNewItemUrl( GroupwareDataAdaptor *adaptor, 
                                   const KURL &url );
 
-    virtual KIO::TransferJob *createRawUploadJob( 
+    virtual TDEIO::TransferJob *createRawUploadJob( 
                                GroupwareDataAdaptor *adaptor, const KURL &url );
-    virtual KIO::TransferJob *createUploadNewJob( 
+    virtual TDEIO::TransferJob *createUploadNewJob( 
                                GroupwareDataAdaptor *adaptor, const KURL &url );
-    virtual KIO::TransferJob *createUploadJob( GroupwareDataAdaptor *adaptor, 
+    virtual TDEIO::TransferJob *createUploadJob( GroupwareDataAdaptor *adaptor, 
                                                const KURL &url );
     virtual KPIM::FolderLister::ContentType itemType() { return mItemType; }
   protected:
@@ -246,43 +246,43 @@ Q_OBJECT
 
 
     // Creating jobs
-    /** Creates the KIO::Job for logging in to the server. This is only
+    /** Creates the TDEIO::Job for logging in to the server. This is only
      *  called if the GroupwareDataAdaptor::GWResNeedsLogin flag is set
      *  for the resource. */
-    virtual KIO::Job *createLoginJob( const KURL &, const TQString &/*user*/,
+    virtual TDEIO::Job *createLoginJob( const KURL &, const TQString &/*user*/,
                                       const TQString &/*password*/ ) { return 0; }
-    /** Creates the KIO::Job for logging off the server. This is only
+    /** Creates the TDEIO::Job for logging off the server. This is only
      *  called if the GroupwareDataAdaptor::GWResNeedsLogoff flag is set
      *  for the resource. */
-    virtual KIO::Job *createLogoffJob( const KURL &, const TQString &/*user*/,
+    virtual TDEIO::Job *createLogoffJob( const KURL &, const TQString &/*user*/,
                                       const TQString &/*password*/ ) { return 0; }
-    /** Creates the KIO::Job for listing all subfolders of the given url. */
-    virtual KIO::Job *createListFoldersJob ( const KURL & ) = 0;
-    /** Creates the KIO::TransferJob for listing all items in the given url. */
-    virtual KIO::TransferJob *createListItemsJob( const KURL & ) = 0;
-    /** Creates the KIO::TransferJob for downloading one given item. */
-    virtual KIO::TransferJob *createDownloadJob( const KURL &,
+    /** Creates the TDEIO::Job for listing all subfolders of the given url. */
+    virtual TDEIO::Job *createListFoldersJob ( const KURL & ) = 0;
+    /** Creates the TDEIO::TransferJob for listing all items in the given url. */
+    virtual TDEIO::TransferJob *createListItemsJob( const KURL & ) = 0;
+    /** Creates the TDEIO::TransferJob for downloading one given item. */
+    virtual TDEIO::TransferJob *createDownloadJob( const KURL &,
                                           FolderLister::ContentType ) = 0;
-    /** Creates the KIO::TransferJob for downloading a list of items items. */
-    virtual KIO::TransferJob *createDownloadJob( const TQMap<KURL,FolderLister::ContentType> & ) { return 0; }
+    /** Creates the TDEIO::TransferJob for downloading a list of items items. */
+    virtual TDEIO::TransferJob *createDownloadJob( const TQMap<KURL,FolderLister::ContentType> & ) { return 0; }
     /** Create the job to remove the deletedItems from the server. The base
         URL of the server is passed as uploadurl.  */
-    virtual KIO::Job *createRemoveJob( const KURL &,
+    virtual TDEIO::Job *createRemoveJob( const KURL &,
                              const KPIM::GroupwareUploadItem::List &/*deletedItems*/ ) { return 0; }
     /** Create the job to remove the item from the server. The base
         URL of the server is passed as uploadurl.  */
-    virtual KIO::Job *createRemoveJob( const KURL &, 
+    virtual TDEIO::Job *createRemoveJob( const KURL &, 
                              KPIM::GroupwareUploadItem */*deletedItem*/ ) { return 0; }
     /** Create the job to change the item on the server (at the given URL) */
-    virtual KIO::TransferJob *createUploadJob( const KURL &,
+    virtual TDEIO::TransferJob *createUploadJob( const KURL &,
                                                GroupwareUploadItem *item );
     /** Create the job to change the items on the server (at the given URL) */
-    virtual KIO::TransferJob *createUploadJob( const KURL &, const GroupwareUploadItem::List &/*items*/ ) { return 0; }
+    virtual TDEIO::TransferJob *createUploadJob( const KURL &, const GroupwareUploadItem::List &/*items*/ ) { return 0; }
     /** Create the job to add the item to the server (at the given baseURL) */
-    virtual KIO::TransferJob *createUploadNewJob( const KURL &,
+    virtual TDEIO::TransferJob *createUploadNewJob( const KURL &,
                                                   GroupwareUploadItem *item );
     /** Create the job to add the items to the server (at the given baseURL) */
-    virtual KIO::TransferJob *createUploadNewJob( const KURL &, const GroupwareUploadItem::List &/*items*/ ) { return 0; }
+    virtual TDEIO::TransferJob *createUploadNewJob( const KURL &, const GroupwareUploadItem::List &/*items*/ ) { return 0; }
 
 
     // Interpreting the result of the jobs
@@ -290,20 +290,20 @@ Q_OBJECT
      *  createLoginJob. Return true, if the login was successfull, or false
      *  if the user could not be authenticated or something else went wrong.
      *  In that case the resource will not be marked as open. */
-    virtual bool interpretLoginJobResult( KIO::Job * ) { return true; }
+    virtual bool interpretLoginJobResult( TDEIO::Job * ) { return true; }
     /** Extract the success information from the logoff job, created by
      *  createLogoffJob. */
-    virtual bool interpretLogoffJobResult( KIO::Job * ) { return true; }
+    virtual bool interpretLogoffJobResult( TDEIO::Job * ) { return true; }
     
-    virtual void interpretListFoldersJob( KIO::Job *, FolderLister *) = 0;
+    virtual void interpretListFoldersJob( TDEIO::Job *, FolderLister *) = 0;
     /** Extract the list of items on the server and the list of items to be
         downloaded from the results of the job (the job was created by
         createListitemsJob). */
-    virtual bool interpretListItemsJob( KIO::Job *, const TQString &jobData ) = 0;
-    virtual bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData ) = 0;
-    virtual bool interpretRemoveJob( KIO::Job *job, const TQString &jobData );
-    virtual bool interpretUploadJob( KIO::Job *job, const TQString &/*jobData*/ );
-    virtual bool interpretUploadNewJob( KIO::Job *job, const TQString &/*jobData*/ );
+    virtual bool interpretListItemsJob( TDEIO::Job *, const TQString &jobData ) = 0;
+    virtual bool interpretDownloadItemsJob( TDEIO::Job *job, const TQString &jobData ) = 0;
+    virtual bool interpretRemoveJob( TDEIO::Job *job, const TQString &jobData );
+    virtual bool interpretUploadJob( TDEIO::Job *job, const TQString &/*jobData*/ );
+    virtual bool interpretUploadNewJob( TDEIO::Job *job, const TQString &/*jobData*/ );
 
     virtual void processDownloadListItem(  const KURL &entry,
         const TQString &newFingerprint, KPIM::FolderLister::ContentType type );
@@ -312,8 +312,8 @@ Q_OBJECT
     {
       return TQString(); 
     }
-    virtual TQString uidFromJob( KIO::Job *job ) const;
-    virtual void setUidForJob( KIO::Job *job, const TQString &uid );
+    virtual TQString uidFromJob( TDEIO::Job *job ) const;
+    virtual void setUidForJob( TDEIO::Job *job, const TQString &uid );
 
 
     enum {
@@ -356,7 +356,7 @@ Q_OBJECT
     TQString mUser;
     TQString mPassword;
     KPIM::IdMapper *mIdMapper;
-    TQMap<KIO::Job*,TQString> mJobUIDMap;
+    TQMap<TDEIO::Job*,TQString> mJobUIDMap;
 };
 
 }
diff --git a/kresources/lib/groupwaredownloadjob.cpp b/kresources/lib/groupwaredownloadjob.cpp
index 3bdead675..9104da847 100644
--- a/kresources/lib/groupwaredownloadjob.cpp
+++ b/kresources/lib/groupwaredownloadjob.cpp
@@ -105,15 +105,15 @@ void GroupwareDownloadJob::listItems()
     mListItemsData = TQString();
     mListEventsJob = adaptor()->createListItemsJob( url );
 
-    connect( mListEventsJob, TQT_SIGNAL( result( KIO::Job * ) ),
-             TQT_SLOT( slotListItemsResult( KIO::Job * ) ) );
-    connect( mListEventsJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-        TQT_SLOT( slotListItemsData( KIO::Job *, const TQByteArray & ) ) );
+    connect( mListEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+             TQT_SLOT( slotListItemsResult( TDEIO::Job * ) ) );
+    connect( mListEventsJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+        TQT_SLOT( slotListItemsData( TDEIO::Job *, const TQByteArray & ) ) );
   }
 }
 
 
-void GroupwareDownloadJob::slotListItemsData( KIO::Job *, const TQByteArray &data )
+void GroupwareDownloadJob::slotListItemsData( TDEIO::Job *, const TQByteArray &data )
 {
   kdDebug(5800) << "OpenGroupware::slotListItemsData()" << endl;
 
@@ -121,7 +121,7 @@ void GroupwareDownloadJob::slotListItemsData( KIO::Job *, const TQByteArray &dat
 }
 
 
-void GroupwareDownloadJob::slotListItemsResult( KIO::Job *job )
+void GroupwareDownloadJob::slotListItemsResult( TDEIO::Job *job )
 {
   kdDebug(5800) << "GroupwareDownloadJob::slotListItemsResult(): " << endl;
 
@@ -187,18 +187,18 @@ void GroupwareDownloadJob::downloadItem()
 
       mDownloadJob = adaptor()->createDownloadJob( href, ctype );
     }
-    connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
-        TQT_SLOT( slotDownloadItemResult( KIO::Job * ) ) );
-    connect( mDownloadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-        TQT_SLOT( slotDownloadItemData( KIO::Job *, const TQByteArray & ) ) );
+    connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+        TQT_SLOT( slotDownloadItemResult( TDEIO::Job * ) ) );
+    connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+        TQT_SLOT( slotDownloadItemData( TDEIO::Job *, const TQByteArray & ) ) );
   }
 }
 
-void GroupwareDownloadJob::slotDownloadItemResult( KIO::Job *job )
+void GroupwareDownloadJob::slotDownloadItemResult( TDEIO::Job *job )
 {
   kdDebug(5800) << "GroupwareDownloadJob::slotDownloadItemResult(): " << endl;
 
-  KIO::TransferJob *trfjob = dynamic_cast<KIO::TransferJob*>(job);
+  TDEIO::TransferJob *trfjob = dynamic_cast<TDEIO::TransferJob*>(job);
   if ( !trfjob ) return;
 
   if ( job->error() ) {
@@ -217,7 +217,7 @@ void GroupwareDownloadJob::slotDownloadItemResult( KIO::Job *job )
   downloadItem();
 }
 
-void GroupwareDownloadJob::slotDownloadItemData( KIO::Job *, const TQByteArray &data )
+void GroupwareDownloadJob::slotDownloadItemData( TDEIO::Job *, const TQByteArray &data )
 {
   kdDebug(5800) << "OpenGroupware::slotDownloadItemData()" << endl;
 
diff --git a/kresources/lib/groupwaredownloadjob.h b/kresources/lib/groupwaredownloadjob.h
index b27882953..6cf3bf249 100644
--- a/kresources/lib/groupwaredownloadjob.h
+++ b/kresources/lib/groupwaredownloadjob.h
@@ -26,7 +26,7 @@
 #include "groupwareresourcejob.h"
 #include <tqstringlist.h>
 
-namespace KIO {
+namespace TDEIO {
   class Job;
   class TransferJob;
 }
@@ -58,10 +58,10 @@ class GroupwareDownloadJob : public GroupwareJob
 
     void cancelLoad();
 
-    void slotListItemsResult( KIO::Job * );
-    void slotListItemsData( KIO::Job *, const TQByteArray & );
-    void slotDownloadItemResult( KIO::Job * );
-    void slotDownloadItemData( KIO::Job *, const TQByteArray & );
+    void slotListItemsResult( TDEIO::Job * );
+    void slotListItemsData( TDEIO::Job *, const TQByteArray & );
+    void slotDownloadItemResult( TDEIO::Job * );
+    void slotDownloadItemData( TDEIO::Job *, const TQByteArray & );
     
     void slotItemToDownload( const KURL &remoteURL,
                              KPIM::FolderLister::ContentType type );
@@ -83,8 +83,8 @@ class GroupwareDownloadJob : public GroupwareJob
 
     KPIM::ProgressItem *mProgress;
 
-    KIO::TransferJob *mDownloadJob;
-    KIO::TransferJob *mListEventsJob;
+    TDEIO::TransferJob *mDownloadJob;
+    TDEIO::TransferJob *mListEventsJob;
     
     TQString mListItemsData;
     TQString mDownloadItemsData;
diff --git a/kresources/lib/groupwareuploadjob.cpp b/kresources/lib/groupwareuploadjob.cpp
index 60e4a53e6..cf46571fc 100644
--- a/kresources/lib/groupwareuploadjob.cpp
+++ b/kresources/lib/groupwareuploadjob.cpp
@@ -102,10 +102,10 @@ kdDebug() << "Not using batch delete " << endl;
 
     if ( mDeletionJob ) {
       mDeletionJobData = TQString();
-      connect( mDeletionJob, TQT_SIGNAL( result( KIO::Job* ) ),
-               TQT_SLOT( slotDeletionJobResult( KIO::Job* ) ) );
-//       connect( mDeletionJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-//                TQT_SLOT( slotDeletionJobData( KIO::Job *, const TQByteArray & ) ) );
+      connect( mDeletionJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+               TQT_SLOT( slotDeletionJobResult( TDEIO::Job* ) ) );
+//       connect( mDeletionJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+//                TQT_SLOT( slotDeletionJobData( TDEIO::Job *, const TQByteArray & ) ) );
     } else {
       deleteItem();
     }
@@ -114,7 +114,7 @@ kdDebug() << "Not using batch delete " << endl;
 
 
 
-void GroupwareUploadJob::slotDeletionJobData( KIO::Job *, const TQByteArray &data )
+void GroupwareUploadJob::slotDeletionJobData( TDEIO::Job *, const TQByteArray &data )
 {
   kdDebug(5800) << "OpenGroupware::slotDeletionData()" << endl;
 
@@ -123,7 +123,7 @@ void GroupwareUploadJob::slotDeletionJobData( KIO::Job *, const TQByteArray &dat
 
 
 
-void GroupwareUploadJob::slotDeletionJobResult( KIO::Job *job )
+void GroupwareUploadJob::slotDeletionJobResult( TDEIO::Job *job )
 {
   if ( job  && adaptor() ) {
     adaptor()->interpretRemoveJob( job, mDeletionJobData );
@@ -159,10 +159,10 @@ kdDebug() << "Not using batch upload " << endl;
 
     if ( mUploadJob ) {
       mUploadJobData = TQString();
-      connect( mUploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
-               TQT_SLOT( slotUploadJobResult( KIO::Job* ) ) );
-      connect( mUploadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-               TQT_SLOT( slotUploadJobData( KIO::Job *, const TQByteArray & ) ) );
+      connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+               TQT_SLOT( slotUploadJobResult( TDEIO::Job* ) ) );
+      connect( mUploadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+               TQT_SLOT( slotUploadJobData( TDEIO::Job *, const TQByteArray & ) ) );
     } else {
       uploadItem();
     }
@@ -170,7 +170,7 @@ kdDebug() << "Not using batch upload " << endl;
 }
 
 
-void GroupwareUploadJob::slotUploadJobData( KIO::Job *, const TQByteArray &data )
+void GroupwareUploadJob::slotUploadJobData( TDEIO::Job *, const TQByteArray &data )
 {
   kdDebug(5800) << "OpenGroupware::slotUploadData()" << endl;
 
@@ -179,7 +179,7 @@ void GroupwareUploadJob::slotUploadJobData( KIO::Job *, const TQByteArray &data
 
 
 
-void GroupwareUploadJob::slotUploadJobResult( KIO::Job *job )
+void GroupwareUploadJob::slotUploadJobResult( TDEIO::Job *job )
 {
   if ( job  && adaptor() ) {
     adaptor()->interpretUploadJob( job, mUploadJobData );
@@ -217,10 +217,10 @@ kdDebug() << "Not using batch create to " << url.url() << " for item of type " <
 
     if ( mUploadJob ) {
       mUploadNewJobData = TQString();
-      connect( mUploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
-               TQT_SLOT( slotUploadNewJobResult( KIO::Job* ) ) );
-      connect( mUploadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-               TQT_SLOT( slotUploadNewJobData( KIO::Job *, const TQByteArray & ) ) );
+      connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+               TQT_SLOT( slotUploadNewJobResult( TDEIO::Job* ) ) );
+      connect( mUploadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+               TQT_SLOT( slotUploadNewJobData( TDEIO::Job *, const TQByteArray & ) ) );
     } else {
       uploadNewItem();
     }
@@ -231,7 +231,7 @@ kdDebug() << "Not using batch create to " << url.url() << " for item of type " <
   }
 }
 
-void GroupwareUploadJob::slotUploadNewJobData( KIO::Job *, const TQByteArray &data )
+void GroupwareUploadJob::slotUploadNewJobData( TDEIO::Job *, const TQByteArray &data )
 {
   kdDebug(5800) << "OpenGroupware::slotUploadNewJobData()" << endl;
 
@@ -240,7 +240,7 @@ void GroupwareUploadJob::slotUploadNewJobData( KIO::Job *, const TQByteArray &da
 
 
 
-void GroupwareUploadJob::slotUploadNewJobResult( KIO::Job *job )
+void GroupwareUploadJob::slotUploadNewJobResult( TDEIO::Job *job )
 {
   if ( job  && adaptor() ) {
     adaptor()->interpretUploadNewJob( job, mUploadNewJobData );
diff --git a/kresources/lib/groupwareuploadjob.h b/kresources/lib/groupwareuploadjob.h
index 7d3c973c2..b3a0ff756 100644
--- a/kresources/lib/groupwareuploadjob.h
+++ b/kresources/lib/groupwareuploadjob.h
@@ -29,7 +29,7 @@
 #include <tqstringlist.h>
 #include <groupwaredataadaptor.h>
 
-namespace KIO {
+namespace TDEIO {
   class Job;
   class TransferJob;
   class DeleteJob;
@@ -88,12 +88,12 @@ class GroupwareUploadJob : public GroupwareJob
 
     void cancelSave();
 
-    void slotDeletionJobResult( KIO::Job *job );
-    void slotDeletionJobData( KIO::Job *, const TQByteArray & );
-    void slotUploadJobResult( KIO::Job *job );
-    void slotUploadJobData( KIO::Job *, const TQByteArray & );
-    void slotUploadNewJobResult( KIO::Job *job );
-    void slotUploadNewJobData( KIO::Job *, const TQByteArray & );
+    void slotDeletionJobResult( TDEIO::Job *job );
+    void slotDeletionJobData( TDEIO::Job *, const TQByteArray & );
+    void slotUploadJobResult( TDEIO::Job *job );
+    void slotUploadJobData( TDEIO::Job *, const TQByteArray & );
+    void slotUploadNewJobResult( TDEIO::Job *job );
+    void slotUploadNewJobData( TDEIO::Job *, const TQByteArray & );
 
     void slotItemDeleted( const TQString &localID, const KURL &remoteURL );
     void slotItemUploaded( const TQString &localID, const KURL &remoteURL );
@@ -118,8 +118,8 @@ class GroupwareUploadJob : public GroupwareJob
     TQString mUploadJobData;
     TQString mUploadNewJobData;
 
-    KIO::TransferJob *mUploadJob;
-    KIO::Job *mDeletionJob;
+    TDEIO::TransferJob *mUploadJob;
+    TDEIO::Job *mDeletionJob;
     KPIM::ProgressItem *mUploadProgress;
 
 };
diff --git a/kresources/lib/kabc_resourcegroupwarebase.cpp b/kresources/lib/kabc_resourcegroupwarebase.cpp
index 0d8f197c4..4700dd1f3 100644
--- a/kresources/lib/kabc_resourcegroupwarebase.cpp
+++ b/kresources/lib/kabc_resourcegroupwarebase.cpp
@@ -34,7 +34,7 @@
 
 using namespace KABC;
 
-ResourceGroupwareBase::ResourceGroupwareBase( const KConfig *config )
+ResourceGroupwareBase::ResourceGroupwareBase( const TDEConfig *config )
   : ResourceCached( config ),
     mPrefs(0), mFolderLister(0), mAdaptor(0), mDownloadJob(0), mUploadJob(0)
 {
@@ -112,7 +112,7 @@ KPIM::GroupwarePrefsBase *ResourceGroupwareBase::createPrefs()
 
 
 
-void ResourceGroupwareBase::readConfig( const KConfig */*config*/ )
+void ResourceGroupwareBase::readConfig( const TDEConfig */*config*/ )
 {
   kdDebug(5700) << "KABC::ResourceGroupwareBase::readConfig()" << endl;
 //   ResourceCached::readConfig( config );
@@ -123,7 +123,7 @@ void ResourceGroupwareBase::readConfig( const KConfig */*config*/ )
   }
 }
 
-void ResourceGroupwareBase::writeConfig( KConfig *config )
+void ResourceGroupwareBase::writeConfig( TDEConfig *config )
 {
   Resource::writeConfig( config );
 
diff --git a/kresources/lib/kabc_resourcegroupwarebase.h b/kresources/lib/kabc_resourcegroupwarebase.h
index 0785709c6..28ce5199e 100644
--- a/kresources/lib/kabc_resourcegroupwarebase.h
+++ b/kresources/lib/kabc_resourcegroupwarebase.h
@@ -26,7 +26,7 @@
 #include <kabcresourcecached.h>
 #include <tdepimmacros.h>
 
-class KConfig;
+class TDEConfig;
 
 namespace KPIM {
 class GroupwareJob;
@@ -46,11 +46,11 @@ class KDE_EXPORT ResourceGroupwareBase : public ResourceCached
   
 
   public:
-    ResourceGroupwareBase( const KConfig * );
+    ResourceGroupwareBase( const TDEConfig * );
     ~ResourceGroupwareBase();
 
-    void readConfig( const KConfig * );
-    void writeConfig( KConfig * );
+    void readConfig( const TDEConfig * );
+    void writeConfig( TDEConfig * );
 
     KPIM::GroupwarePrefsBase *prefs() const { return mPrefs; }
     void setPrefs( KPIM::GroupwarePrefsBase *prefs );
diff --git a/kresources/lib/kcal_resourcegroupwarebase.cpp b/kresources/lib/kcal_resourcegroupwarebase.cpp
index d52e0eaba..118fc6629 100644
--- a/kresources/lib/kcal_resourcegroupwarebase.cpp
+++ b/kresources/lib/kcal_resourcegroupwarebase.cpp
@@ -44,7 +44,7 @@ ResourceGroupwareBase::ResourceGroupwareBase()
 {
 }
 
-ResourceGroupwareBase::ResourceGroupwareBase( const KConfig *config )
+ResourceGroupwareBase::ResourceGroupwareBase( const TDEConfig *config )
   : ResourceCached( config ), mPrefs(0), mFolderLister(0),
     mLock( true ), mAdaptor(0), mDownloadJob(0), mUploadJob(0)
 {
@@ -160,7 +160,7 @@ KPIM::GroupwarePrefsBase *ResourceGroupwareBase::prefs()
   return mPrefs;
 }
 
-void ResourceGroupwareBase::readConfig( const KConfig *config )
+void ResourceGroupwareBase::readConfig( const TDEConfig *config )
 {
   kdDebug(5800) << "KCal::ResourceGroupwareBase::readConfig()" << endl;
   ResourceCached::readConfig( config );
@@ -171,7 +171,7 @@ void ResourceGroupwareBase::readConfig( const KConfig *config )
   }
 }
 
-void ResourceGroupwareBase::writeConfig( KConfig *config )
+void ResourceGroupwareBase::writeConfig( TDEConfig *config )
 {
   kdDebug(5800) << "KCal::ResourceGroupwareBase::writeConfig()" << endl;
 
@@ -190,13 +190,13 @@ bool ResourceGroupwareBase::doOpen()
   if ( !adaptor() )
     return false;
   if ( adaptor()->flags() & KPIM::GroupwareDataAdaptor::GWResNeedsLogon ) {
-    KIO::Job *loginJob = adaptor()->createLoginJob( prefs()->url(), prefs()->user(), prefs()->password() );
+    TDEIO::Job *loginJob = adaptor()->createLoginJob( prefs()->url(), prefs()->user(), prefs()->password() );
     if ( !loginJob ) {
       return false;
     } else {
       mLoginFinished = false;
-      connect( loginJob, TQT_SIGNAL( result( KIO::Job * ) ),
-               TQT_SLOT( slotLoginJobResult( KIO::Job* ) ) );
+      connect( loginJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+               TQT_SLOT( slotLoginJobResult( TDEIO::Job* ) ) );
       enter_loop();
       return mLoginFinished;
     }
@@ -205,7 +205,7 @@ bool ResourceGroupwareBase::doOpen()
 }
 
 // BEGIN:COPIED
-// TODO: Get rid of this hack, which is copied from KIO::NetAccess, which is
+// TODO: Get rid of this hack, which is copied from TDEIO::NetAccess, which is
 // LGPL'ed and
 //     Copyright (C) 1997 Torben Weis (weis@kde.org)
 //     Copyright (C) 1998 Matthias Ettrich (ettrich@kde.org)
@@ -224,7 +224,7 @@ void ResourceGroupwareBase::enter_loop()
 }
 // END:COPIED
 
-void ResourceGroupwareBase::slotLoginJobResult( KIO::Job *job )
+void ResourceGroupwareBase::slotLoginJobResult( TDEIO::Job *job )
 {
   if ( !adaptor() ) return;
   mLoginFinished = adaptor()->interpretLoginJobResult( job );
@@ -238,15 +238,15 @@ void ResourceGroupwareBase::doClose()
 
   if ( adaptor() &&
        adaptor()->flags() & KPIM::GroupwareDataAdaptor::GWResNeedsLogoff ) {
-    KIO::Job *logoffJob = adaptor()->createLogoffJob( prefs()->url(), prefs()->user(), prefs()->password() );
-    connect( logoffJob, TQT_SIGNAL( result( KIO::Job * ) ),
-             TQT_SLOT( slotLogoffJobResult( KIO::Job* ) ) );
+    TDEIO::Job *logoffJob = adaptor()->createLogoffJob( prefs()->url(), prefs()->user(), prefs()->password() );
+    connect( logoffJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+             TQT_SLOT( slotLogoffJobResult( TDEIO::Job* ) ) );
     // TODO: Do we really need to block while waiting for the job to return?
     enter_loop();
   }
 }
 
-void ResourceGroupwareBase::slotLogoffJobResult( KIO::Job *job )
+void ResourceGroupwareBase::slotLogoffJobResult( TDEIO::Job *job )
 {
   if ( !adaptor() ) return;
   adaptor()->interpretLogoffJobResult( job );
diff --git a/kresources/lib/kcal_resourcegroupwarebase.h b/kresources/lib/kcal_resourcegroupwarebase.h
index 5691c19d6..f6b46dbf7 100644
--- a/kresources/lib/kcal_resourcegroupwarebase.h
+++ b/kresources/lib/kcal_resourcegroupwarebase.h
@@ -28,7 +28,7 @@
 #include <tdepimmacros.h>
 #include <kabc/locknull.h>
 
-namespace KIO {
+namespace TDEIO {
 class Job;
 }
 
@@ -56,11 +56,11 @@ class KDE_EXPORT ResourceGroupwareBase : public ResourceCached
   public:
     ResourceGroupwareBase();
   
-    ResourceGroupwareBase( const KConfig * );
+    ResourceGroupwareBase( const TDEConfig * );
     virtual ~ResourceGroupwareBase();
 
-    void readConfig( const KConfig *config );
-    void writeConfig( KConfig *config );
+    void readConfig( const TDEConfig *config );
+    void writeConfig( TDEConfig *config );
 
     KPIM::GroupwarePrefsBase *prefs();
     KPIM::FolderLister *folderLister() { return mFolderLister; }
@@ -92,8 +92,8 @@ class KDE_EXPORT ResourceGroupwareBase : public ResourceCached
     virtual KPIM::GroupwareUploadJob *createUploadJob( CalendarAdaptor *adaptor );
 
   protected slots:
-    void slotLoginJobResult( KIO::Job *job );
-    void slotLogoffJobResult( KIO::Job *job );
+    void slotLoginJobResult( TDEIO::Job *job );
+    void slotLogoffJobResult( TDEIO::Job *job );
     void slotDownloadJobResult( KPIM::GroupwareJob * );
     void slotUploadJobResult( KPIM::GroupwareJob * );