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

4 files changed, 35 insertions, 35 deletions

diff --git a/kresources/groupware/kabc_resourcegroupware.cpp b/kresources/groupware/kabc_resourcegroupware.cpp
index c7950bcb0..3c9d9792c 100644
--- a/kresources/groupware/kabc_resourcegroupware.cpp
+++ b/kresources/groupware/kabc_resourcegroupware.cpp
@@ -34,7 +34,7 @@
 
 using namespace KABC;
 
-ResourceGroupware::ResourceGroupware( const KConfig *config )
+ResourceGroupware::ResourceGroupware( const TDEConfig *config )
   : ResourceCached( config )
 {
   init();
@@ -78,14 +78,14 @@ ResourceGroupware::~ResourceGroupware()
   mPrefs = 0;
 }
 
-void ResourceGroupware::readConfig( const KConfig * )
+void ResourceGroupware::readConfig( const TDEConfig * )
 {
   mPrefs->readConfig();
 
   readAddressBooks();
 }
 
-void ResourceGroupware::writeConfig( KConfig *config )
+void ResourceGroupware::writeConfig( TDEConfig *config )
 {
   Resource::writeConfig( config );
 
@@ -244,12 +244,12 @@ bool ResourceGroupware::asyncLoad()
   mJobData = TQString();
 
   mDownloadJob = KPIM::GroupwareJob::getAddressBook( url );
-  connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotJobResult( KIO::Job * ) ) );
-  connect( mDownloadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-           TQT_SLOT( slotJobData( KIO::Job *, const TQByteArray & ) ) );
-  connect( mDownloadJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
-           TQT_SLOT( slotJobPercent( KIO::Job *, unsigned long ) ) );
+  connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
+  connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+           TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
+  connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+           TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) );
 
   mProgress = KPIM::ProgressManager::instance()->createProgressItem(
     KPIM::ProgressManager::getUniqueID(), i18n("Downloading addressbook") );
@@ -300,7 +300,7 @@ bool ResourceGroupware::asyncSave( Ticket* )
   return true;
 }
 
-void ResourceGroupware::slotJobResult( KIO::Job *job )
+void ResourceGroupware::slotJobResult( TDEIO::Job *job )
 {
   kdDebug() << "ResourceGroupware::slotJobResult(): " << endl;
 
@@ -341,14 +341,14 @@ void ResourceGroupware::slotJobResult( KIO::Job *job )
   mProgress = 0;
 }
 
-void ResourceGroupware::slotJobData( KIO::Job *, const TQByteArray &data )
+void ResourceGroupware::slotJobData( TDEIO::Job *, const TQByteArray &data )
 {
 //  kdDebug() << "ResourceGroupware::slotJobData()" << endl;
 
   mJobData.append( data.data() );
 }
 
-void ResourceGroupware::slotJobPercent( KIO::Job *, unsigned long percent )
+void ResourceGroupware::slotJobPercent( TDEIO::Job *, unsigned long percent )
 {
   kdDebug() << "ResourceGroupware::slotJobPercent() " << percent << endl;
   if ( mProgress ) mProgress->setProgress( percent );
diff --git a/kresources/groupware/kabc_resourcegroupware.h b/kresources/groupware/kabc_resourcegroupware.h
index 995301fc8..53c1d007a 100644
--- a/kresources/groupware/kabc_resourcegroupware.h
+++ b/kresources/groupware/kabc_resourcegroupware.h
@@ -26,7 +26,7 @@
 
 #include <kio/job.h>
 
-class KConfig;
+class TDEConfig;
 
 namespace KABC {
 
@@ -38,13 +38,13 @@ class ResourceGroupware : public ResourceCached
   
 
   public:
-    ResourceGroupware( const KConfig * );
+    ResourceGroupware( const TDEConfig * );
     ResourceGroupware( const KURL &url,
                        const TQString &user, const TQString &password );
     ~ResourceGroupware();
 
-    void readConfig( const KConfig * );
-    void writeConfig( KConfig * );
+    void readConfig( const TDEConfig * );
+    void writeConfig( TDEConfig * );
 
     void readAddressBooks();
     void writeAddressBooks();
@@ -68,16 +68,16 @@ class ResourceGroupware : public ResourceCached
     void init();
 
   private slots:
-    void slotJobResult( KIO::Job * );
-    void slotJobData( KIO::Job *, const TQByteArray & );
-    void slotJobPercent( KIO::Job *job, unsigned long percent );
+    void slotJobResult( TDEIO::Job * );
+    void slotJobData( TDEIO::Job *, const TQByteArray & );
+    void slotJobPercent( TDEIO::Job *job, unsigned long percent );
 
     void cancelLoad();
 
   private:
     GroupwarePrefs *mPrefs;
 
-    KIO::TransferJob *mDownloadJob;
+    TDEIO::TransferJob *mDownloadJob;
     KPIM::ProgressItem *mProgress;
     TQString mJobData;
 };
diff --git a/kresources/groupware/kcal_resourcegroupware.cpp b/kresources/groupware/kcal_resourcegroupware.cpp
index 6af5dce26..79658bb6a 100644
--- a/kresources/groupware/kcal_resourcegroupware.cpp
+++ b/kresources/groupware/kcal_resourcegroupware.cpp
@@ -55,7 +55,7 @@ ResourceGroupware::ResourceGroupware()
   mPrefs->addGroupPrefix( identifier() );
 }
 
-ResourceGroupware::ResourceGroupware( const KConfig *config )
+ResourceGroupware::ResourceGroupware( const TDEConfig *config )
   : ResourceCached( config ), mLock( true )
 {
   init();
@@ -96,7 +96,7 @@ GroupwarePrefsBase *ResourceGroupware::prefs()
   return mPrefs;
 }
 
-void ResourceGroupware::readConfig( const KConfig *config )
+void ResourceGroupware::readConfig( const TDEConfig *config )
 {
   kdDebug() << "KCal::ResourceGroupware::readConfig()" << endl;
 
@@ -105,7 +105,7 @@ void ResourceGroupware::readConfig( const KConfig *config )
   ResourceCached::readConfig( config );
 }
 
-void ResourceGroupware::writeConfig( KConfig *config )
+void ResourceGroupware::writeConfig( TDEConfig *config )
 {
   kdDebug() << "KCal::ResourceGroupware::writeConfig()" << endl;
 
@@ -159,10 +159,10 @@ bool ResourceGroupware::doLoad()
   mJobData = TQString();
 
   mDownloadJob = KPIM::GroupwareJob::getCalendar( url );
-  connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotJobResult( KIO::Job * ) ) );
-  connect( mDownloadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-           TQT_SLOT( slotJobData( KIO::Job *, const TQByteArray & ) ) );
+  connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
+  connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+           TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
 
   mProgress = KPIM::ProgressManager::instance()->createProgressItem(
     KPIM::ProgressManager::getUniqueID(), i18n("Downloading calendar") );
@@ -173,7 +173,7 @@ bool ResourceGroupware::doLoad()
   return true;
 }
 
-void ResourceGroupware::slotJobResult( KIO::Job *job )
+void ResourceGroupware::slotJobResult( TDEIO::Job *job )
 {
   kdDebug() << "ResourceGroupware::slotJobResult(): " << endl;
 
@@ -221,7 +221,7 @@ void ResourceGroupware::slotJobResult( KIO::Job *job )
   mProgress = 0;
 }
 
-void ResourceGroupware::slotJobData( KIO::Job *, const TQByteArray &data )
+void ResourceGroupware::slotJobData( TDEIO::Job *, const TQByteArray &data )
 {
 //  kdDebug() << "ResourceGroupware::slotJobData()" << endl;
 
diff --git a/kresources/groupware/kcal_resourcegroupware.h b/kresources/groupware/kcal_resourcegroupware.h
index 9674b0bf5..d3c809db7 100644
--- a/kresources/groupware/kcal_resourcegroupware.h
+++ b/kresources/groupware/kcal_resourcegroupware.h
@@ -46,11 +46,11 @@ class ResourceGroupware : public ResourceCached
   public:
     ResourceGroupware();
   
-    ResourceGroupware( const KConfig * );
+    ResourceGroupware( const TDEConfig * );
     virtual ~ResourceGroupware();
 
-    void readConfig( const KConfig *config );
-    void writeConfig( KConfig *config );
+    void readConfig( const TDEConfig *config );
+    void writeConfig( TDEConfig *config );
 
     GroupwarePrefsBase *prefs();
 
@@ -70,8 +70,8 @@ class ResourceGroupware : public ResourceCached
   protected slots:
     void loadFinished();
 
-    void slotJobResult( KIO::Job * );
-    void slotJobData( KIO::Job *, const TQByteArray & );
+    void slotJobResult( TDEIO::Job * );
+    void slotJobData( TDEIO::Job *, const TQByteArray & );
 
     void cancelLoad();
 
@@ -79,7 +79,7 @@ class ResourceGroupware : public ResourceCached
     GroupwarePrefsBase *mPrefs;
     KABC::LockNull mLock;
 
-    KIO::TransferJob *mDownloadJob;
+    TDEIO::TransferJob *mDownloadJob;
     KPIM::ProgressItem *mProgress;
     TQString mJobData;