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

1 files changed, 12 insertions, 12 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 );