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

8 files changed, 44 insertions, 44 deletions

diff --git a/nsplugins/kcm_nsplugins.cpp b/nsplugins/kcm_nsplugins.cpp
index 7b3bddabd..16234c62f 100644
--- a/nsplugins/kcm_nsplugins.cpp
+++ b/nsplugins/kcm_nsplugins.cpp
@@ -67,7 +67,7 @@ static bool checkSearchPathTimestamps( TQStringList paths, TQStringList timestam
          ++it, ++t )
     {
         TQDateTime current = lastChanged( *it );
-        // store non-existent directory as "N" string rather than empty string, KConfig
+        // store non-existent directory as "N" string rather than empty string, TDEConfig
         // has a bug with storing a list of empty items
         if( *t == "N" ? !current.isNull() : current != TQDateTime::fromString( *t, Qt::ISODate ))
             changed = true;
@@ -75,7 +75,7 @@ static bool checkSearchPathTimestamps( TQStringList paths, TQStringList timestam
     }
     if( changed )
     {
-        KConfig config("kcmnspluginrc");
+        TDEConfig config("kcmnspluginrc");
         config.setGroup("Misc");
         config.writeEntry( "lastSearchPaths", paths );
         config.writeEntry( "lastSearchTimestamps", currentTimestamps );
@@ -88,7 +88,7 @@ extern "C"
 {
     KDE_EXPORT void init_nsplugin()
     {
-        KConfig *config = new KConfig("kcmnspluginrc", true /* readonly */, false /* no globals*/);
+        TDEConfig *config = new TDEConfig("kcmnspluginrc", true /* readonly */, false /* no globals*/);
         config->setGroup("Misc");
         bool scan = config->readBoolEntry( "starttdeScan", false );
         bool firstTime = config->readBoolEntry( "firstTime", true );
@@ -120,7 +120,7 @@ extern "C"
         }
 
         if (firstTime) {
-            config= new KConfig("kcmnspluginrc", false);
+            config= new TDEConfig("kcmnspluginrc", false);
             config->setGroup("Misc");
             config->writeEntry( "firstTime", false );
             config->sync();
diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp
index 71f6d588d..55fd769cf 100644
--- a/nsplugins/nspluginloader.cpp
+++ b/nsplugins/nspluginloader.cpp
@@ -64,7 +64,7 @@ void NSPluginInstance::init(const TQCString& app, const TQCString& obj)
 {
     stub = new NSPluginInstanceIface_stub( app, obj );
     TQGridLayout *_layout = new TQGridLayout(this, 1, 1);
-    KConfig cfg("kcmnspluginrc", false);
+    TDEConfig cfg("kcmnspluginrc", false);
     cfg.setGroup("Misc");
     if (cfg.readBoolEntry("demandLoad", false)) {
         _button = new TQPushButton(i18n("Start Plugin"), dynamic_cast<EMBEDCLASS*>(this));
@@ -207,7 +207,7 @@ NSPluginLoader::NSPluginLoader()
                    this, TQT_SLOT(applicationRegistered(const TQCString&)));
 
   // load configuration
-  KConfig cfg("kcmnspluginrc", false);
+  TDEConfig cfg("kcmnspluginrc", false);
   cfg.setGroup("Misc");
   _useArtsdsp = cfg.readBoolEntry( "useArtsdsp", false );
 }
diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp
index 9dab88c36..714a4c269 100644
--- a/nsplugins/plugin_part.cpp
+++ b/nsplugins/plugin_part.cpp
@@ -405,7 +405,7 @@ void PluginPart::changeSrc(const TQString& url) {
 
 void PluginPart::saveAs() {
     KURL savefile = KFileDialog::getSaveURL(TQString::null, TQString::null, _widget);
-    KIO::NetAccess::copy(m_url, savefile, _widget);
+    TDEIO::NetAccess::copy(m_url, savefile, _widget);
 }
 
 
diff --git a/nsplugins/plugin_paths.cpp b/nsplugins/plugin_paths.cpp
index 448a08f1f..121fc9d64 100644
--- a/nsplugins/plugin_paths.cpp
+++ b/nsplugins/plugin_paths.cpp
@@ -32,7 +32,7 @@ TQStringList getSearchPaths()
 {
     TQStringList searchPaths;
 
-    KConfig *config = new KConfig("kcmnspluginrc", false);
+    TDEConfig *config = new TDEConfig("kcmnspluginrc", false);
     config->setGroup("Misc");
 
     // setup default paths
diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp
index 29d4b6b4d..867497ef4 100644
--- a/nsplugins/pluginscan.cpp
+++ b/nsplugins/pluginscan.cpp
@@ -107,7 +107,7 @@ void pullInXt()
     XtFree( NULL );
 }
 
-KConfig *infoConfig = 0;
+TDEConfig *infoConfig = 0;
 
 
 bool isPluginMimeType( TQString fname )
@@ -566,7 +566,7 @@ int main( int argc, char **argv )
     TQStringList searchPaths = getSearchPaths();
     TQStringList mimeInfoList;
 
-    infoConfig = new KConfig( TDEGlobal::dirs()->saveLocation("data", "nsplugins") +
+    infoConfig = new TDEConfig( TDEGlobal::dirs()->saveLocation("data", "nsplugins") +
                               "/pluginsinfo" );
     infoConfig->writeEntry( "number", 0 );
 
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index 493f149b6..535502a87 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -849,7 +849,7 @@ void NSPluginInstance::timer()
 TQString NSPluginInstance::normalizedURL(const TQString& url) const {
     KURL bu( _baseURL );
     KURL inURL(bu, url);
-    KConfig cfg("kcmnspluginrc", true);
+    TDEConfig cfg("kcmnspluginrc", true);
     cfg.setGroup("Misc");
 
     if (!cfg.readBoolEntry("HTTP URLs Only", false) ||
@@ -1896,22 +1896,22 @@ bool NSPluginStream::get( const TQString& url, const TQString& mimeType,
     // create new stream
     if ( create( url, mimeType, notify ) ) {
         // start the kio job
-        _job = KIO::get(KURL( url ), false, false);
+        _job = TDEIO::get(KURL( url ), false, false);
         _job->addMetaData("errorPage", "false");
         _job->addMetaData("AllowCompressedPage", "false");
         _job->addMetaData("PropagateHttpHeader", "true");
         if (reload) {
             _job->addMetaData("cache", "reload");
         }
-        connect(_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-                TQT_SLOT(data(KIO::Job *, const TQByteArray &)));
-        connect(_job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(result(KIO::Job *)));
-        connect(_job, TQT_SIGNAL(totalSize(KIO::Job *, KIO::filesize_t )),
-                TQT_SLOT(totalSize(KIO::Job *, KIO::filesize_t)));
-        connect(_job, TQT_SIGNAL(mimetype(KIO::Job *, const TQString &)),
-                TQT_SLOT(mimetype(KIO::Job *, const TQString &)));
-        connect(_job, TQT_SIGNAL(redirection(KIO::Job *, const KURL&)),
-                TQT_SLOT(redirection(KIO::Job *, const KURL&)));
+        connect(_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+                TQT_SLOT(data(TDEIO::Job *, const TQByteArray &)));
+        connect(_job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(result(TDEIO::Job *)));
+        connect(_job, TQT_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
+                TQT_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
+        connect(_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
+                TQT_SLOT(mimetype(TDEIO::Job *, const TQString &)));
+        connect(_job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)),
+                TQT_SLOT(redirection(TDEIO::Job *, const KURL&)));
     }
 
     return false;
@@ -1924,27 +1924,27 @@ bool NSPluginStream::post( const TQString& url, const TQByteArray& data,
     // create new stream
     if ( create( url, mimeType, notify ) ) {
         // start the kio job
-        _job = KIO::http_post(KURL( url ), data, false);
+        _job = TDEIO::http_post(KURL( url ), data, false);
         _job->addMetaData("content-type", args.contentType());
         _job->addMetaData("errorPage", "false");
         _job->addMetaData("PropagateHttpHeader", "true");
         _job->addMetaData("AllowCompressedPage", "false");
-        connect(_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-                TQT_SLOT(data(KIO::Job *, const TQByteArray &)));
-        connect(_job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(result(KIO::Job *)));
-        connect(_job, TQT_SIGNAL(totalSize(KIO::Job *, KIO::filesize_t )),
-                TQT_SLOT(totalSize(KIO::Job *, KIO::filesize_t)));
-        connect(_job, TQT_SIGNAL(mimetype(KIO::Job *, const TQString &)),
-                TQT_SLOT(mimetype(KIO::Job *, const TQString &)));
-        connect(_job, TQT_SIGNAL(redirection(KIO::Job *, const KURL&)),
-                TQT_SLOT(redirection(KIO::Job *, const KURL&)));
+        connect(_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+                TQT_SLOT(data(TDEIO::Job *, const TQByteArray &)));
+        connect(_job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(result(TDEIO::Job *)));
+        connect(_job, TQT_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
+                TQT_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
+        connect(_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
+                TQT_SLOT(mimetype(TDEIO::Job *, const TQString &)));
+        connect(_job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)),
+                TQT_SLOT(redirection(TDEIO::Job *, const KURL&)));
     }
 
     return false;
 }
 
 
-void NSPluginStream::data(KIO::Job * job, const TQByteArray &data)
+void NSPluginStream::data(TDEIO::Job * job, const TQByteArray &data)
 {
     //kdDebug(1431) << "NSPluginStream::data - job=" << (void*)job << " data size=" << data.size() << endl;
     queue( data );
@@ -1954,18 +1954,18 @@ void NSPluginStream::data(KIO::Job * job, const TQByteArray &data)
     }
 }
 
-void NSPluginStream::redirection(KIO::Job * /*job*/, const KURL& url)
+void NSPluginStream::redirection(TDEIO::Job * /*job*/, const KURL& url)
 {
     updateURL( url );
 }
 
-void NSPluginStream::totalSize(KIO::Job * job, KIO::filesize_t size)
+void NSPluginStream::totalSize(TDEIO::Job * job, TDEIO::filesize_t size)
 {
-    kdDebug(1431) << "NSPluginStream::totalSize - job=" << (void*)job << " size=" << KIO::number(size) << endl;
+    kdDebug(1431) << "NSPluginStream::totalSize - job=" << (void*)job << " size=" << TDEIO::number(size) << endl;
     _stream->end = size;
 }
 
-void NSPluginStream::mimetype(KIO::Job * job, const TQString &mimeType)
+void NSPluginStream::mimetype(TDEIO::Job * job, const TQString &mimeType)
 {
     kdDebug(1431) << "NSPluginStream::mimetype - job=" << (void*)job << " mimeType=" << mimeType << endl;
     _mimeType = mimeType;
@@ -1992,7 +1992,7 @@ void NSPluginStream::resume()
 }
 
 
-void NSPluginStream::result(KIO::Job *job)
+void NSPluginStream::result(TDEIO::Job *job)
 {
    int err = job->error();
    _job = 0;
diff --git a/nsplugins/viewer/nsplugin.h b/nsplugins/viewer/nsplugin.h
index 2a2af35d5..d06ffada3 100644
--- a/nsplugins/viewer/nsplugin.h
+++ b/nsplugins/viewer/nsplugin.h
@@ -125,15 +125,15 @@ public:
   bool post(const TQString& url, const TQByteArray& data, const TQString& mimeType, void *notifyData, const KParts::URLArgs& args);
 
 protected slots:
-  void data(KIO::Job *job, const TQByteArray &data);
-  void totalSize(KIO::Job *job, KIO::filesize_t size);
-  void mimetype(KIO::Job * job, const TQString &mimeType);
-  void result(KIO::Job *job);
-  void redirection(KIO::Job *job, const KURL& url);
+  void data(TDEIO::Job *job, const TQByteArray &data);
+  void totalSize(TDEIO::Job *job, TDEIO::filesize_t size);
+  void mimetype(TDEIO::Job * job, const TQString &mimeType);
+  void result(TDEIO::Job *job);
+  void redirection(TDEIO::Job *job, const KURL& url);
   void resume();
 
 protected:
-  TQGuardedPtr<KIO::TransferJob> _job;
+  TQGuardedPtr<TDEIO::TransferJob> _job;
   TQTimer *_resumeTimer;
 };
 
diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp
index 654ba68e6..af72ef6cc 100644
--- a/nsplugins/viewer/viewer.cpp
+++ b/nsplugins/viewer/viewer.cpp
@@ -254,7 +254,7 @@ int main(int argc, char** argv)
 #endif
 
    {
-      KConfig cfg("kcmnspluginrc", true);
+      TDEConfig cfg("kcmnspluginrc", true);
       cfg.setGroup("Misc");
       int v = KCLAMP(cfg.readNumEntry("Nice Level", 0), 0, 19);
       if (v > 0) {