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

2 files changed, 11 insertions, 11 deletions

diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp
index f26e064..8c8e9c3 100644
--- a/konq-plugins/uachanger/uachangerplugin.cpp
+++ b/konq-plugins/uachanger/uachangerplugin.cpp
@@ -68,8 +68,8 @@ UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name,
   if ( parent && parent->inherits( "KHTMLPart" ) )
   {
     m_part = static_cast<KHTMLPart*>(parent);
-    connect( m_part, TQT_SIGNAL(started(KIO::Job*)), this,
-             TQT_SLOT(slotStarted(KIO::Job*)) );
+    connect( m_part, TQT_SIGNAL(started(TDEIO::Job*)), this,
+             TQT_SLOT(slotStarted(TDEIO::Job*)) );
   }
 }
 
@@ -179,7 +179,7 @@ void UAChangerPlugin::parseDescFiles()
   }
 }
 
-void UAChangerPlugin::slotStarted( KIO::Job* )
+void UAChangerPlugin::slotStarted( TDEIO::Job* )
 {
   m_currentURL = m_part->url();
 
@@ -201,7 +201,7 @@ void UAChangerPlugin::slotAboutToShow()
 {
   if (!m_config)
   {
-    m_config = new KConfig( "kio_httprc" );
+    m_config = new TDEConfig( "kio_httprc" );
     parseDescFiles();
   }
 
@@ -336,7 +336,7 @@ void UAChangerPlugin::slotDefault()
 void UAChangerPlugin::updateIOSlaves ()
 {
   // Inform running http(s) io-slaves about the change...
-  if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", TQString()))
+  if (!DCOPRef("*", "TDEIO::Scheduler").send("reparseSlaveConfiguration", TQString()))
     kdWarning() << "UAChangerPlugin::updateIOSlaves: Unable to update running application!" << endl;
 }
 
@@ -413,7 +413,7 @@ void UAChangerPlugin::saveSettings()
 {
   if(!m_bSettingsLoaded) return;
 
-  KConfig cfg ("uachangerrc", false, false);
+  TDEConfig cfg ("uachangerrc", false, false);
   cfg.setGroup ("General");
 
   cfg.writeEntry ("applyToDomain", m_bApplyToDomain);
@@ -421,7 +421,7 @@ void UAChangerPlugin::saveSettings()
 
 void UAChangerPlugin::loadSettings()
 {
-  KConfig cfg ("uachangerrc", false, false);
+  TDEConfig cfg ("uachangerrc", false, false);
   cfg.setGroup ("General");
 
   m_bApplyToDomain = cfg.readBoolEntry ("applyToDomain", true);
diff --git a/konq-plugins/uachanger/uachangerplugin.h b/konq-plugins/uachanger/uachangerplugin.h
index 77bb73f..9aaff84 100644
--- a/konq-plugins/uachanger/uachangerplugin.h
+++ b/konq-plugins/uachanger/uachangerplugin.h
@@ -31,9 +31,9 @@
 
 class KHTMLPart;
 class KActionMenu;
-class KConfig;
+class TDEConfig;
 
-namespace KIO
+namespace TDEIO
 {
   class Job;
 }
@@ -57,7 +57,7 @@ protected slots:
   void slotAboutToShow();
   void slotApplyToDomain();
   void slotItemSelected(int);
-  void slotStarted(KIO::Job*);
+  void slotStarted(TDEIO::Job*);
   void slotReloadDescriptions();
 
 protected:
@@ -74,7 +74,7 @@ private:
 
   KHTMLPart* m_part;
   KActionMenu* m_pUAMenu;
-  KConfig* m_config;
+  TDEConfig* m_config;
 
   KURL m_currentURL;
   TQString m_currentUserAgent;