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

3 files changed, 13 insertions, 13 deletions

diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp
index e845750a1..58fd0b7b8 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.cpp
+++ b/kdesktop/kwebdesktop/kwebdesktop.cpp
@@ -51,16 +51,16 @@ KWebDesktopRun::KWebDesktopRun( KWebDesktop* webDesktop, const KURL & url )
     : m_webDesktop(webDesktop), m_url(url)
 {
     kdDebug() << "KWebDesktopRun::KWebDesktopRun starting get" << endl;
-    KIO::Job * job = KIO::get(m_url, false, false);
-    connect( job, TQT_SIGNAL( result( KIO::Job *)),
-             this, TQT_SLOT( slotFinished(KIO::Job *)));
-    connect( job, TQT_SIGNAL( mimetype( KIO::Job *, const TQString &)),
-             this, TQT_SLOT( slotMimetype(KIO::Job *, const TQString &)));
+    TDEIO::Job * job = TDEIO::get(m_url, false, false);
+    connect( job, TQT_SIGNAL( result( TDEIO::Job *)),
+             this, TQT_SLOT( slotFinished(TDEIO::Job *)));
+    connect( job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &)),
+             this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &)));
 }
 
-void KWebDesktopRun::slotMimetype( KIO::Job *job, const TQString &_type )
+void KWebDesktopRun::slotMimetype( TDEIO::Job *job, const TQString &_type )
 {
-    KIO::SimpleJob *sjob = static_cast<KIO::SimpleJob *>(job);
+    TDEIO::SimpleJob *sjob = static_cast<TDEIO::SimpleJob *>(job);
     // Update our URL in case of a redirection
     m_url = sjob->url();
     TQString type = _type; // necessary copy if we plan to use it
@@ -73,7 +73,7 @@ void KWebDesktopRun::slotMimetype( KIO::Job *job, const TQString &_type )
         part->openURL( m_url );
 }
 
-void KWebDesktopRun::slotFinished( KIO::Job * job )
+void KWebDesktopRun::slotFinished( TDEIO::Job * job )
 {
     // The whole point of all this is to abort silently on error
     if (job->error())
@@ -126,7 +126,7 @@ int main( int argc, char **argv )
 
     int ret = app.exec();
 
-    KIO::SimpleJob::removeOnHold(); // Kill any slave that was put on hold.
+    TDEIO::SimpleJob::removeOnHold(); // Kill any slave that was put on hold.
     delete webDesktop;
     delete run;
     //khtml::Cache::clear();
diff --git a/kdesktop/kwebdesktop/kwebdesktop.h b/kdesktop/kwebdesktop/kwebdesktop.h
index b4b5cc0fc..089a25673 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.h
+++ b/kdesktop/kwebdesktop/kwebdesktop.h
@@ -24,7 +24,7 @@
 #include <kparts/browserextension.h>
 #include <khtml_part.h>
 
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 class KWebDesktop : public TQObject
 {
@@ -59,8 +59,8 @@ public:
     ~KWebDesktopRun() {}
 
 protected slots:
-    void slotMimetype( KIO::Job *job, const TQString &_type );
-    void slotFinished( KIO::Job * job );
+    void slotMimetype( TDEIO::Job *job, const TQString &_type );
+    void slotFinished( TDEIO::Job * job );
 
 private:
     KWebDesktop* m_webDesktop;
diff --git a/kdesktop/kwebdesktop/kwebdesktop.kcfg b/kdesktop/kwebdesktop/kwebdesktop.kcfg
index fad395a19..b0920f410 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.kcfg
+++ b/kdesktop/kwebdesktop/kwebdesktop.kcfg
@@ -4,7 +4,7 @@
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
                            http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
   <kcfgfile name="kwebdesktoprc" />
-  <!-- generated by KConfig XTraKtor -->
+  <!-- generated by TDEConfig XTraKtor -->
 
   <group name="Settings">
     <entry key="URL" type="String">