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

1 files changed, 26 insertions, 26 deletions

diff --git a/kresources/groupwise/kabc_resourcegroupwise.cpp b/kresources/groupwise/kabc_resourcegroupwise.cpp
index d14d1a419..b3930bfbe 100644
--- a/kresources/groupwise/kabc_resourcegroupwise.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwise.cpp
@@ -33,7 +33,7 @@
 
 using namespace KABC;
 
-ResourceGroupwise::ResourceGroupwise( const KConfig *config )
+ResourceGroupwise::ResourceGroupwise( const TDEConfig *config )
   : ResourceCached( config )
 {
   init();
@@ -95,14 +95,14 @@ ResourceGroupwise::~ResourceGroupwise()
   mPrefs = 0;
 }
 
-void ResourceGroupwise::readConfig( const KConfig * )
+void ResourceGroupwise::readConfig( const TDEConfig * )
 {
   mPrefs->readConfig();
 
   readAddressBooks();
 }
 
-void ResourceGroupwise::writeConfig( KConfig *config )
+void ResourceGroupwise::writeConfig( TDEConfig *config )
 {
   Resource::writeConfig( config );
 
@@ -346,18 +346,18 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
     return;
   }
 
-  mJob = KIO::get( url, false, false );  // TODO: make the GW jobs call finished if the URL 
+  mJob = TDEIO::get( url, false, false );  // TODO: make the GW jobs call finished if the URL 
                                          // contains no address book IDs
   kdDebug() << "  Job address: " << mJob << endl;
-  connect( mJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-           TQT_SLOT( slotReadJobData( KIO::Job *, const TQByteArray & ) ) );
-  connect( mJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
-           TQT_SLOT( slotJobPercent( KIO::Job *, unsigned long ) ) );
+  connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+           TQT_SLOT( slotReadJobData( TDEIO::Job *, const TQByteArray & ) ) );
+  connect( mJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+           TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) );
 
   if ( bookType == System )
   {
-    connect( mJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( fetchSABResult( KIO::Job * ) ) );
+    connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( fetchSABResult( TDEIO::Job * ) ) );
     mSABProgress = KPIM::ProgressManager::instance()->createProgressItem(
         mProgress, KPIM::ProgressManager::getUniqueID(),
         i18n( "Fetching System Address Book" ), TQString(),
@@ -366,8 +366,8 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
   }
   else
   {
-    connect( mJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( fetchUABResult( KIO::Job * ) ) );
+    connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( fetchUABResult( TDEIO::Job * ) ) );
     mUABProgress = KPIM::ProgressManager::instance()->createProgressItem(
         mProgress, KPIM::ProgressManager::getUniqueID(),
         i18n( "Fetching User Address Books" ), TQString(),
@@ -378,7 +378,7 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
   return;
 }
 
-void ResourceGroupwise::fetchSABResult( KIO::Job *job )
+void ResourceGroupwise::fetchSABResult( TDEIO::Job *job )
 {
   kdDebug() << "ResourceGroupwise::fetchSABResult() " << endl;
 
@@ -402,7 +402,7 @@ void ResourceGroupwise::fetchSABResult( KIO::Job *job )
     loadCompleted();
 }
 
-void ResourceGroupwise::fetchUABResult( KIO::Job *job )
+void ResourceGroupwise::fetchUABResult( TDEIO::Job *job )
 {
   kdDebug() << "ResourceGroupwise::fetchUABResult() " << endl;
 
@@ -444,19 +444,19 @@ void ResourceGroupwise::updateSystemAddressBook()
       false /*CannotBeCancelled*/,
       mPrefs->url().startsWith("https" ) );
 
-  mJob = KIO::get( url, false, false );
+  mJob = TDEIO::get( url, false, false );
   mJob->setInteractive( false );
-  connect( mJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( updateSABResult( KIO::Job * ) ) );
-  connect( mJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-           TQT_SLOT( slotUpdateJobData( KIO::Job *, const TQByteArray & ) ) );
-  connect( mJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
-           TQT_SLOT( slotJobPercent( KIO::Job *, unsigned long ) ) );
+  connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( updateSABResult( TDEIO::Job * ) ) );
+  connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+           TQT_SLOT( slotUpdateJobData( TDEIO::Job *, const TQByteArray & ) ) );
+  connect( mJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+           TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) );
 
   return;
 }
 
-void ResourceGroupwise::updateSABResult( KIO::Job *job )
+void ResourceGroupwise::updateSABResult( TDEIO::Job *job )
 {
   kdDebug() << "ResourceGroupwise::updateSABResult() " << endl;
 
@@ -467,7 +467,7 @@ void ResourceGroupwise::updateSABResult( KIO::Job *job )
 
   int errorCode = job->error();
   if ( errorCode != 0 ) {
-    if ( errorCode == KIO::ERR_NO_CONTENT ) // we need to refresh the SAB
+    if ( errorCode == TDEIO::ERR_NO_CONTENT ) // we need to refresh the SAB
     {
       kdDebug() << "  update SAB failed, fetching all of it again" << endl;
       mPrefs->setLastSequenceNumber( 0 );
@@ -486,7 +486,7 @@ void ResourceGroupwise::updateSABResult( KIO::Job *job )
     loadCompleted();
 }
 
-void ResourceGroupwise::slotReadJobData( KIO::Job *job , const TQByteArray &data )
+void ResourceGroupwise::slotReadJobData( TDEIO::Job *job , const TQByteArray &data )
 {
   kdDebug() << "ResourceGroupwise::slotReadJobData()" << endl;
   Q_UNUSED( job );
@@ -520,7 +520,7 @@ void ResourceGroupwise::slotReadJobData( KIO::Job *job , const TQByteArray &data
   mJobData = TQString();
 }
 
-void ResourceGroupwise::slotUpdateJobData( KIO::Job *job, const TQByteArray &data )
+void ResourceGroupwise::slotUpdateJobData( TDEIO::Job *job, const TQByteArray &data )
 {
   kdDebug() << "ResourceGroupwise::slotUpdateJobData()" << endl;
   kdDebug() << "  Job address: " << job << endl;
@@ -585,7 +585,7 @@ void ResourceGroupwise::loadCompleted()
   addressBook()->emitAddressBookChanged();
 }
 
-void ResourceGroupwise::slotJobPercent( KIO::Job *, unsigned long percent )
+void ResourceGroupwise::slotJobPercent( TDEIO::Job *, unsigned long percent )
 {
   // TODO: make this act on the correct progress item
   kdDebug() << "ResourceGroupwise::slotJobPercent() " << percent << endl;