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

1 files changed, 7 insertions, 7 deletions

diff --git a/kresources/tvanytime/kcal_resourcetvanytime.cpp b/kresources/tvanytime/kcal_resourcetvanytime.cpp
index 4933768ab..e447008c3 100644
--- a/kresources/tvanytime/kcal_resourcetvanytime.cpp
+++ b/kresources/tvanytime/kcal_resourcetvanytime.cpp
@@ -59,7 +59,7 @@ ResourceTVAnytime::ResourceTVAnytime()
   mPrefs->addGroupPrefix( identifier() );
 }
 
-ResourceTVAnytime::ResourceTVAnytime( const KConfig *config )
+ResourceTVAnytime::ResourceTVAnytime( const TDEConfig *config )
   : ResourceCached( config ), mLock( true )
 {
   init();
@@ -102,7 +102,7 @@ TVAnytimePrefsBase *ResourceTVAnytime::prefs()
   return mPrefs;
 }
 
-void ResourceTVAnytime::readConfig( const KConfig *config )
+void ResourceTVAnytime::readConfig( const TDEConfig *config )
 {
   kdDebug() << "KCal::ResourceTVAnytime::readConfig()" << endl;
 
@@ -116,7 +116,7 @@ void ResourceTVAnytime::readConfig( const KConfig *config )
   
 }
 
-void ResourceTVAnytime::writeConfig( KConfig *config )
+void ResourceTVAnytime::writeConfig( TDEConfig *config )
 {
   kdDebug() << "KCal::ResourceTVAnytime::writeConfig()" << endl;
 
@@ -178,9 +178,9 @@ bool ResourceTVAnytime::doLoad()
   kdDebug(5850) << "  DESTINATION: " << destination.url() << endl;
 
   // TODO: find out if the file to download is fresh.  if not, just work with the cache.
-  mDownloadJob = KIO::file_copy( url, destination, -1, true );
-  connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotJobResult( KIO::Job * ) ) );
+  mDownloadJob = TDEIO::file_copy( url, destination, -1, true );
+  connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
 
   mProgress = KPIM::ProgressManager::instance()->createProgressItem(
     KPIM::ProgressManager::getUniqueID(), i18n("Downloading program schedule") );
@@ -192,7 +192,7 @@ bool ResourceTVAnytime::doLoad()
   return true;
 }
 
-void ResourceTVAnytime::slotJobResult( KIO::Job *job )
+void ResourceTVAnytime::slotJobResult( TDEIO::Job *job )
 {
   kdDebug() << "ResourceTVAnytime::slotJobResult(): " << endl;