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

2 files changed, 20 insertions, 20 deletions

diff --git a/kbugbuster/kresources/kcalresource.cpp b/kbugbuster/kresources/kcalresource.cpp
index bbd7ab27..bdad0381 100644
--- a/kbugbuster/kresources/kcalresource.cpp
+++ b/kbugbuster/kresources/kcalresource.cpp
@@ -54,13 +54,13 @@
 
 #include "kcalresource.h"
 
-KCalResource::KCalResource( const KConfig* config )
+KCalResource::KCalResource( const TDEConfig* config )
   : ResourceCached( config ), mLock( 0 )
 {
   mPrefs = new KBB::ResourcePrefs;
 
-  KConfigSkeletonItem::List items = mPrefs->items();
-  KConfigSkeletonItem::List::Iterator it;
+  TDEConfigSkeletonItem::List items = mPrefs->items();
+  TDEConfigSkeletonItem::List::Iterator it;
   for( it = items.begin(); it != items.end(); ++it ) {
     (*it)->setGroup( identifier() );
   }
@@ -93,7 +93,7 @@ void KCalResource::init()
 
   mLock = new KABC::LockNull( true );
 
-  KConfig config( "kbugbusterrc" );
+  TDEConfig config( "kbugbusterrc" );
 
   BugSystem::self()->readConfig( &config );
 }
@@ -103,12 +103,12 @@ KBB::ResourcePrefs *KCalResource::prefs()
   return mPrefs;
 }
 
-void KCalResource::readConfig( const KConfig * )
+void KCalResource::readConfig( const TDEConfig * )
 {
   mPrefs->readConfig();
 }
 
-void KCalResource::writeConfig( KConfig *config )
+void KCalResource::writeConfig( TDEConfig *config )
 {
   kdDebug() << "KCalResource::writeConfig()" << endl;
 
@@ -225,7 +225,7 @@ void KCalResource::slotBugListAvailable( const Package &, const TQString &,
   emit resourceChanged( this );
 }
 
-void KCalResource::slotLoadJobResult( KIO::Job *job )
+void KCalResource::slotLoadJobResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
     job->showErrorDialog( 0 );
@@ -267,9 +267,9 @@ bool KCalResource::doSave()
 
   mCalendar.save( cacheFile() );
 
-  mUploadJob = KIO::file_copy( KURL( cacheFile() ), mUploadUrl, -1, true );
-  connect( mUploadJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotSaveJobResult( KIO::Job * ) ) );
+  mUploadJob = TDEIO::file_copy( KURL( cacheFile() ), mUploadUrl, -1, true );
+  connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotSaveJobResult( TDEIO::Job * ) ) );
 
   return true;
 }
@@ -279,7 +279,7 @@ bool KCalResource::isSaving()
   return mUploadJob;
 }
 
-void KCalResource::slotSaveJobResult( KIO::Job *job )
+void KCalResource::slotSaveJobResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
     job->showErrorDialog( 0 );
diff --git a/kbugbuster/kresources/kcalresource.h b/kbugbuster/kresources/kcalresource.h
index d96fc1e4..cfa4e2a6 100644
--- a/kbugbuster/kresources/kcalresource.h
+++ b/kbugbuster/kresources/kcalresource.h
@@ -36,7 +36,7 @@
 
 #include <bugsystem.h>
 
-namespace KIO {
+namespace TDEIO {
 class FileCopyJob;
 class Job;
 }
@@ -64,13 +64,13 @@ class KCalResource : public KCal::ResourceCached
     enum { ReloadNever, ReloadOnStartup, ReloadOnceADay, ReloadAlways };
   
     /**
-      Create resource from configuration information stored in KConfig object.
+      Create resource from configuration information stored in TDEConfig object.
     */
-    KCalResource( const KConfig * );
+    KCalResource( const TDEConfig * );
     ~KCalResource();
 
-    void readConfig( const KConfig *config );
-    void writeConfig( KConfig *config );
+    void readConfig( const TDEConfig *config );
+    void writeConfig( TDEConfig *config );
 
     KBB::ResourcePrefs *prefs();
 
@@ -89,8 +89,8 @@ class KCalResource : public KCal::ResourceCached
     void slotBugListAvailable( const Package &, const TQString &,
                                const Bug::List &bugs );
 
-    void slotLoadJobResult( KIO::Job * );
-    void slotSaveJobResult( KIO::Job * );
+    void slotLoadJobResult( TDEIO::Job * );
+    void slotSaveJobResult( TDEIO::Job * );
 
   protected:
     bool doOpen();
@@ -112,8 +112,8 @@ class KCalResource : public KCal::ResourceCached
 
     bool mOpen;
 
-    KIO::FileCopyJob *mDownloadJob;
-    KIO::FileCopyJob *mUploadJob;
+    TDEIO::FileCopyJob *mDownloadJob;
+    TDEIO::FileCopyJob *mUploadJob;
     
     KABC::Lock *mLock;