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

1 files changed, 10 insertions, 10 deletions

diff --git a/kresources/groupwise/kcal_resourcegroupwise.cpp b/kresources/groupwise/kcal_resourcegroupwise.cpp
index 060fe5f20..ed5fd3ae7 100644
--- a/kresources/groupwise/kcal_resourcegroupwise.cpp
+++ b/kresources/groupwise/kcal_resourcegroupwise.cpp
@@ -55,7 +55,7 @@ ResourceGroupwise::ResourceGroupwise()
   mPrefs->addGroupPrefix( identifier() );
 }
 
-ResourceGroupwise::ResourceGroupwise( const KConfig *config )
+ResourceGroupwise::ResourceGroupwise( const TDEConfig *config )
   : ResourceCached( config ), mLock( true )
 {
   init();
@@ -92,7 +92,7 @@ GroupwisePrefsBase *ResourceGroupwise::prefs()
   return mPrefs;
 }
 
-void ResourceGroupwise::readConfig( const KConfig *config )
+void ResourceGroupwise::readConfig( const TDEConfig *config )
 {
   kdDebug() << "KCal::ResourceGroupwise::readConfig()" << endl;
 
@@ -101,7 +101,7 @@ void ResourceGroupwise::readConfig( const KConfig *config )
   ResourceCached::readConfig( config );
 }
 
-void ResourceGroupwise::writeConfig( KConfig *config )
+void ResourceGroupwise::writeConfig( TDEConfig *config )
 {
   kdDebug() << "KCal::ResourceGroupwise::writeConfig()" << endl;
 
@@ -157,11 +157,11 @@ bool ResourceGroupwise::doLoad()
 
   mJobData = TQString();
 
-  mDownloadJob = KIO::get( url, false, false );
-  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 & ) ) );
+  mDownloadJob = TDEIO::get( url, false, false );
+  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") );
@@ -172,7 +172,7 @@ bool ResourceGroupwise::doLoad()
   return true;
 }
 
-void ResourceGroupwise::slotJobResult( KIO::Job *job )
+void ResourceGroupwise::slotJobResult( TDEIO::Job *job )
 {
   kdDebug() << "ResourceGroupwise::slotJobResult(): " << endl;
 
@@ -220,7 +220,7 @@ void ResourceGroupwise::slotJobResult( KIO::Job *job )
   mProgress = 0;
 }
 
-void ResourceGroupwise::slotJobData( KIO::Job *, const TQByteArray &data )
+void ResourceGroupwise::slotJobData( TDEIO::Job *, const TQByteArray &data )
 {
 //  kdDebug() << "ResourceGroupwise::slotJobData()" << endl;