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

3 files changed, 34 insertions, 34 deletions

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) {