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

23 files changed, 53 insertions, 53 deletions

diff --git a/libkcddb/asynccddbplookup.cpp b/libkcddb/asynccddbplookup.cpp
index d51ef386..0f29ae53 100644
--- a/libkcddb/asynccddbplookup.cpp
+++ b/libkcddb/asynccddbplookup.cpp
@@ -77,10 +77,10 @@ namespace KCDDB
   {
     state_ = Idle;
     
-    if ( error == KNetwork::KSocketBase::LookupFailure )
+    if ( error == KNetwork::TDESocketBase::LookupFailure )
       emit finished( HostNotFound );
-    else if ( error == KNetwork::KSocketBase::ConnectionTimedOut ||
-        error == KNetwork::KSocketBase::NetFailure )
+    else if ( error == KNetwork::TDESocketBase::ConnectionTimedOut ||
+        error == KNetwork::TDESocketBase::NetFailure )
       emit finished( NoResponse );
     else
       emit finished( UnknownError );
diff --git a/libkcddb/asynchttplookup.cpp b/libkcddb/asynchttplookup.cpp
index 45eb4353..e46df657 100644
--- a/libkcddb/asynchttplookup.cpp
+++ b/libkcddb/asynchttplookup.cpp
@@ -111,7 +111,7 @@ namespace KCDDB
   }
 
     void
-  AsyncHTTPLookup::slotData( KIO::Job *, const TQByteArray &data )
+  AsyncHTTPLookup::slotData( TDEIO::Job *, const TQByteArray &data )
   {
     if (data.size() > 0)
     {
@@ -121,7 +121,7 @@ namespace KCDDB
   }
 
     void
-  AsyncHTTPLookup::slotResult( KIO::Job *job )
+  AsyncHTTPLookup::slotResult( TDEIO::Job *job )
   {
     if ( 0 != job->error() )
     {
@@ -139,15 +139,15 @@ namespace KCDDB
   {
     kdDebug(60010) << "About to fetch: " << cgiURL_.url() << endl;
 
-    KIO::TransferJob* job = KIO::get( cgiURL_, false, false );
+    TDEIO::TransferJob* job = TDEIO::get( cgiURL_, false, false );
 
     if ( 0 == job )
       return ServerError;
 
-    connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-          TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) );
-    connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-          TQT_SLOT( slotResult( KIO::Job * ) ) );
+    connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+          TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+          TQT_SLOT( slotResult( TDEIO::Job * ) ) );
 
     return Success;
   }
diff --git a/libkcddb/asynchttplookup.h b/libkcddb/asynchttplookup.h
index 37fda8b4..1baaafd5 100644
--- a/libkcddb/asynchttplookup.h
+++ b/libkcddb/asynchttplookup.h
@@ -48,8 +48,8 @@ namespace KCDDB
       void slotQueryReady();
       void requestCDInfoForMatch();
 
-      void slotData( KIO::Job *, const TQByteArray & );
-      void slotResult( KIO::Job * );
+      void slotData( TDEIO::Job *, const TQByteArray & );
+      void slotResult( TDEIO::Job * );
 
     protected:
       virtual Result fetchURL();
diff --git a/libkcddb/asynchttpsubmit.cpp b/libkcddb/asynchttpsubmit.cpp
index 6932b49b..6caf2bf4 100644
--- a/libkcddb/asynchttpsubmit.cpp
+++ b/libkcddb/asynchttpsubmit.cpp
@@ -34,14 +34,14 @@ namespace KCDDB
 
   }
   
-  CDDB::Result AsyncHTTPSubmit::runJob(KIO::Job* job)
+  CDDB::Result AsyncHTTPSubmit::runJob(TDEIO::Job* job)
   {
-    connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotFinished(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotFinished(TDEIO::Job *)));
 
     return CDDB::Success;
   }
   
-  void AsyncHTTPSubmit::slotFinished(KIO::Job* job)
+  void AsyncHTTPSubmit::slotFinished(TDEIO::Job* job)
   {
     kdDebug() << "Finished" << endl;
 
diff --git a/libkcddb/asynchttpsubmit.h b/libkcddb/asynchttpsubmit.h
index 5fc1d3f7..0eb82ae7 100644
--- a/libkcddb/asynchttpsubmit.h
+++ b/libkcddb/asynchttpsubmit.h
@@ -34,9 +34,9 @@ namespace KCDDB
     signals:
       void finished( CDDB::Result );
     protected:
-      virtual Result runJob(KIO::Job* job);
+      virtual Result runJob(TDEIO::Job* job);
     private slots:
-      void slotFinished(KIO::Job*);
+      void slotFinished(TDEIO::Job*);
   } ;
 }
 
diff --git a/libkcddb/asyncsmtpsubmit.cpp b/libkcddb/asyncsmtpsubmit.cpp
index ff120fac..1214e951 100644
--- a/libkcddb/asyncsmtpsubmit.cpp
+++ b/libkcddb/asyncsmtpsubmit.cpp
@@ -36,15 +36,15 @@ namespace KCDDB
 
   }
 
-  CDDB::Result AsyncSMTPSubmit::runJob(KIO::Job* job)
+  CDDB::Result AsyncSMTPSubmit::runJob(TDEIO::Job* job)
   {
-    connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-               this, TQT_SLOT(slotDone( KIO::Job* ) ) ); 
+    connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+               this, TQT_SLOT(slotDone( TDEIO::Job* ) ) ); 
 
     return Success;
   }
 
-  void AsyncSMTPSubmit::slotDone( KIO::Job* job )
+  void AsyncSMTPSubmit::slotDone( TDEIO::Job* job )
   {
       kdDebug(60010) << k_funcinfo << endl;
       if ( job->error()==0 )
diff --git a/libkcddb/asyncsmtpsubmit.h b/libkcddb/asyncsmtpsubmit.h
index 303a993e..aebf53a9 100644
--- a/libkcddb/asyncsmtpsubmit.h
+++ b/libkcddb/asyncsmtpsubmit.h
@@ -37,9 +37,9 @@ namespace KCDDB
     signals:
       void finished( CDDB::Result );
     protected slots:
-      void slotDone( KIO::Job * );
+      void slotDone( TDEIO::Job * );
     protected:
-      virtual Result runJob(KIO::Job* job);
+      virtual Result runJob(TDEIO::Job* job);
   } ;
 }
 
diff --git a/libkcddb/config.cpp b/libkcddb/config.cpp
index 8772d5c9..5c4a82f2 100644
--- a/libkcddb/config.cpp
+++ b/libkcddb/config.cpp
@@ -37,11 +37,11 @@ namespace KCDDB
     KEMailSettings kes;
     kes.setProfile( kes.defaultProfileName() );
 
-    static_cast<KConfigSkeleton::ItemString *>(findItem("emailAddress"))
+    static_cast<TDEConfigSkeleton::ItemString *>(findItem("emailAddress"))
       ->setDefaultValue(kes.getSetting( KEMailSettings::EmailAddress ));
-    static_cast<KConfigSkeleton::ItemString *>(findItem("replyTo"))
+    static_cast<TDEConfigSkeleton::ItemString *>(findItem("replyTo"))
       ->setDefaultValue(kes.getSetting( KEMailSettings::ReplyToAddress ));
-    static_cast<KConfigSkeleton::ItemString *>(findItem("smtpHostname"))
+    static_cast<TDEConfigSkeleton::ItemString *>(findItem("smtpHostname"))
       ->setDefaultValue(kes.getSetting( KEMailSettings::OutServer ));
   }
 
diff --git a/libkcddb/httplookup.h b/libkcddb/httplookup.h
index 6e865303..d7499b49 100644
--- a/libkcddb/httplookup.h
+++ b/libkcddb/httplookup.h
@@ -26,7 +26,7 @@
 
 #include "lookup.h"
 
-namespace KIO
+namespace TDEIO
 {
   class TransferJob;
   class Job;
diff --git a/libkcddb/httpsubmit.cpp b/libkcddb/httpsubmit.cpp
index fa4c2d98..d42d5a3d 100644
--- a/libkcddb/httpsubmit.cpp
+++ b/libkcddb/httpsubmit.cpp
@@ -37,9 +37,9 @@ namespace KCDDB
 
   }
 
-  KIO::Job* HTTPSubmit::createJob(const CDInfo& cdInfo)
+  TDEIO::Job* HTTPSubmit::createJob(const CDInfo& cdInfo)
   {
-    KIO::TransferJob* job = KIO::http_post(url_, diskData_.utf8(), false);
+    TDEIO::TransferJob* job = TDEIO::http_post(url_, diskData_.utf8(), false);
 
     job->addMetaData("content-type", "Content-Type: text/plain");
     TQString header;
diff --git a/libkcddb/httpsubmit.h b/libkcddb/httpsubmit.h
index 40131ea4..7afae949 100644
--- a/libkcddb/httpsubmit.h
+++ b/libkcddb/httpsubmit.h
@@ -31,7 +31,7 @@ namespace KCDDB
       virtual ~HTTPSubmit();
 
     protected:
-      virtual KIO::Job* createJob(const CDInfo& cdInfo);
+      virtual TDEIO::Job* createJob(const CDInfo& cdInfo);
 
       KURL url_;
       TQString from_;
diff --git a/libkcddb/kcmcddb/kcmcddb.cpp b/libkcddb/kcmcddb/kcmcddb.cpp
index 5235d40a..75dd8501 100644
--- a/libkcddb/kcmcddb/kcmcddb.cpp
+++ b/libkcddb/kcmcddb/kcmcddb.cpp
@@ -46,7 +46,7 @@ typedef KGenericFactory<CDDBModule, TQWidget> KCDDBFactory;
 K_EXPORT_COMPONENT_FACTORY ( kcm_cddb, KCDDBFactory( "kcmcddb" ) )
 
 CDDBModule::CDDBModule(TQWidget *parent, const char *name, const TQStringList &)
-  : KCModule(parent, name)
+  : TDECModule(parent, name)
 {
   TDEGlobal::locale()->insertCatalogue("libkcddb");
   setButtons(Default | Apply);
@@ -71,7 +71,7 @@ CDDBModule::CDDBModule(TQWidget *parent, const char *name, const TQStringList &)
   void
 CDDBModule::defaults()
 {
-  KCModule::defaults();
+  TDECModule::defaults();
 
   updateWidgetsFromConfig(KCDDB::Config());
 }
@@ -112,7 +112,7 @@ CDDBModule::updateWidgetsFromConfig(const KCDDB::Config & config)
   void
 CDDBModule::save()
 {
-  KCModule::save();
+  TDECModule::save();
 
   checkSettings();
 }
@@ -120,7 +120,7 @@ CDDBModule::save()
   void
 CDDBModule::load()
 {
-  KCModule::load();
+  TDECModule::load();
 
   KCDDB::Config config;
   config.readConfig();
diff --git a/libkcddb/kcmcddb/kcmcddb.h b/libkcddb/kcmcddb/kcmcddb.h
index 0e58998f..af83fe80 100644
--- a/libkcddb/kcmcddb/kcmcddb.h
+++ b/libkcddb/kcmcddb/kcmcddb.h
@@ -25,9 +25,9 @@
 #include "libkcddb/config.h"
 
 class CDDBConfigWidgetBase;
-class KConfigDialogManager;
+class TDEConfigDialogManager;
 
-class CDDBModule : public KCModule
+class CDDBModule : public TDECModule
 {
   Q_OBJECT
   
diff --git a/libkcddb/sites.cpp b/libkcddb/sites.cpp
index 16a7ac79..a031c949 100644
--- a/libkcddb/sites.cpp
+++ b/libkcddb/sites.cpp
@@ -53,10 +53,10 @@ namespace KCDDB
     TQValueList<Mirror> result;
 
     TQString tmpFile;
-    if( KIO::NetAccess::download( url, tmpFile, 0 ) )
+    if( TDEIO::NetAccess::download( url, tmpFile, 0 ) )
     {
       result = readFile( tmpFile );
-      KIO::NetAccess::removeTempFile( tmpFile );
+      TDEIO::NetAccess::removeTempFile( tmpFile );
     }
 
     return result;
diff --git a/libkcddb/smtpsubmit.cpp b/libkcddb/smtpsubmit.cpp
index 07f34b61..ed4e7357 100644
--- a/libkcddb/smtpsubmit.cpp
+++ b/libkcddb/smtpsubmit.cpp
@@ -40,13 +40,13 @@ namespace KCDDB
 
   }
 
-  KIO::Job* SMTPSubmit::createJob(const CDInfo& cdInfo)
+  TDEIO::Job* SMTPSubmit::createJob(const CDInfo& cdInfo)
   {
     url_.setQuery(TQString("to=%1&subject=cddb %2 %3&from=%4")
       .arg(to_, cdInfo.category, cdInfo.id, from_));
     kdDebug(60010) << "Url is: " << url_.prettyURL() << endl;
 
-    return KIO::storedPut(diskData_.utf8(), url_, -1, false, false, false);
+    return TDEIO::storedPut(diskData_.utf8(), url_, -1, false, false, false);
   }
 
   void SMTPSubmit::makeDiskData( const CDInfo& cdInfo, const TrackOffsetList& offsetList )
diff --git a/libkcddb/smtpsubmit.h b/libkcddb/smtpsubmit.h
index b2c4eaf1..7890d77e 100644
--- a/libkcddb/smtpsubmit.h
+++ b/libkcddb/smtpsubmit.h
@@ -33,7 +33,7 @@ namespace KCDDB
     protected:
       virtual void makeDiskData( const CDInfo&, const TrackOffsetList& );
 
-      virtual KIO::Job* createJob(const CDInfo& cdInfo);
+      virtual TDEIO::Job* createJob(const CDInfo& cdInfo);
 
       KURL url_;
       TQString from_, to_;
diff --git a/libkcddb/submit.cpp b/libkcddb/submit.cpp
index 63a0951b..26a70283 100644
--- a/libkcddb/submit.cpp
+++ b/libkcddb/submit.cpp
@@ -46,7 +46,7 @@ namespace KCDDB
     if (!validCategory(cdInfo.category))
       return InvalidCategory;
 
-    KIO::Job* job = createJob(cdInfo);
+    TDEIO::Job* job = createJob(cdInfo);
 
     if (!job)
       return UnknownError;
diff --git a/libkcddb/submit.h b/libkcddb/submit.h
index 512e69b9..60f43b43 100644
--- a/libkcddb/submit.h
+++ b/libkcddb/submit.h
@@ -27,7 +27,7 @@
 #include "cdinfo.h"
 #include <tqobject.h>
 
-namespace KIO
+namespace TDEIO
 {
   class Job;
 }
@@ -50,8 +50,8 @@ namespace KCDDB
       Result submit( CDInfo cdInfo, const TrackOffsetList &offsetList);
 
     protected:
-      virtual KIO::Job* createJob(const CDInfo& cdInfo) = 0;
-      virtual Result runJob(KIO::Job* job) = 0;
+      virtual TDEIO::Job* createJob(const CDInfo& cdInfo) = 0;
+      virtual Result runJob(TDEIO::Job* job) = 0;
     
       bool validCategory(const TQString&);
 
diff --git a/libkcddb/synchttplookup.cpp b/libkcddb/synchttplookup.cpp
index fb2c90d7..c50618e1 100644
--- a/libkcddb/synchttplookup.cpp
+++ b/libkcddb/synchttplookup.cpp
@@ -114,12 +114,12 @@ namespace KCDDB
   {
     kdDebug(60010) << "About to fetch: " << cgiURL_.url() << endl;
 
-    KIO::TransferJob* job = KIO::get( cgiURL_, false, false );
+    TDEIO::TransferJob* job = TDEIO::get( cgiURL_, false, false );
 
     if ( 0 == job )
       return ServerError;
 
-    if (!KIO::NetAccess::synchronousRun(job, 0, &data_))
+    if (!TDEIO::NetAccess::synchronousRun(job, 0, &data_))
       return ServerError;
 
     jobFinished();
diff --git a/libkcddb/synchttpsubmit.cpp b/libkcddb/synchttpsubmit.cpp
index 8be4c60b..7920fce2 100644
--- a/libkcddb/synchttpsubmit.cpp
+++ b/libkcddb/synchttpsubmit.cpp
@@ -34,9 +34,9 @@ namespace KCDDB
 
   }
   
-  CDDB::Result SyncHTTPSubmit::runJob(KIO::Job* job)
+  CDDB::Result SyncHTTPSubmit::runJob(TDEIO::Job* job)
   {
-    bool success = KIO::NetAccess::synchronousRun(job, 0);
+    bool success = TDEIO::NetAccess::synchronousRun(job, 0);
 
     if (success)
       return CDDB::Success;
diff --git a/libkcddb/synchttpsubmit.h b/libkcddb/synchttpsubmit.h
index bd2974ac..a52f76e9 100644
--- a/libkcddb/synchttpsubmit.h
+++ b/libkcddb/synchttpsubmit.h
@@ -30,7 +30,7 @@ namespace KCDDB
       virtual ~SyncHTTPSubmit();
 
     protected:
-      virtual Result runJob(KIO::Job* job);
+      virtual Result runJob(TDEIO::Job* job);
   } ;
 }
 
diff --git a/libkcddb/syncsmtpsubmit.cpp b/libkcddb/syncsmtpsubmit.cpp
index 717c77a5..002c3304 100644
--- a/libkcddb/syncsmtpsubmit.cpp
+++ b/libkcddb/syncsmtpsubmit.cpp
@@ -36,9 +36,9 @@ namespace KCDDB
 
   }
 
-  CDDB::Result SyncSMTPSubmit::runJob(KIO::Job* job)
+  CDDB::Result SyncSMTPSubmit::runJob(TDEIO::Job* job)
   {
-    if ( KIO::NetAccess::synchronousRun(job, 0) )
+    if ( TDEIO::NetAccess::synchronousRun(job, 0) )
       return Success;
 
     return UnknownError;
diff --git a/libkcddb/syncsmtpsubmit.h b/libkcddb/syncsmtpsubmit.h
index 57c660f7..a6fb23df 100644
--- a/libkcddb/syncsmtpsubmit.h
+++ b/libkcddb/syncsmtpsubmit.h
@@ -30,7 +30,7 @@ namespace KCDDB
                      const TQString& from, const TQString& to);
       virtual ~SyncSMTPSubmit();
     protected:
-      virtual Result runJob(KIO::Job* job);
+      virtual Result runJob(TDEIO::Job* job);
   } ;
 }