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

5 files changed, 15 insertions, 15 deletions

diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
index d8015ce..a2894f9 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
+++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
@@ -34,7 +34,7 @@ typedef KGenericFactory<KCMKuick, TQWidget> KuickFactory;
 K_EXPORT_COMPONENT_FACTORY ( kcm_kuick, KuickFactory( "kcmkuick" ) )
 
 KCMKuick::KCMKuick(TQWidget *parent, const char *name, const TQStringList &)
-:KCModule(parent, name)
+:TDECModule(parent, name)
 {
     TDEAboutData *ab=new TDEAboutData( "kcmkuick", I18N_NOOP("KCM Kuick"),
        "0.2",I18N_NOOP("KControl module for Kuick's configuration"), TDEAboutData::License_GPL,
@@ -66,14 +66,14 @@ void KCMKuick::slotShowToggled()
 
 void KCMKuick::load()
 {
-    KConfig config( "konquerorrc");
+    TDEConfig config( "konquerorrc");
     config.setGroup("kuick-copy");
     dialog->m_sbCopy->setValue(config.readNumEntry("ShowRecent",5) );
 
     config.setGroup("kuick-move" );
     dialog->m_sbMove->setValue(config.readNumEntry("ShowRecent",5) );
     
-    KConfig cfg("kuick_plugin.desktop", true, false, "services");
+    TDEConfig cfg("kuick_plugin.desktop", true, false, "services");
     cfg.setDesktopGroup();
     bool hidden=cfg.readBoolEntry("Hidden", false);
     dialog->m_chkShow->setChecked(!hidden);
@@ -97,7 +97,7 @@ void KCMKuick::configChanged()
 
 void KCMKuick::save()
 {
-    KConfig config("konquerorrc" );
+    TDEConfig config("konquerorrc" );
     config.setGroup("kuick-copy");
 
     config.writeEntry("ShowRecent", dialog->m_sbCopy->value() );
@@ -112,7 +112,7 @@ void KCMKuick::save()
        TQFile::remove(servicespath+"/kuick_plugin.desktop");
     }
     else {
-       KConfig cfg("kuick_plugin.desktop", false, false, "services");
+       TDEConfig cfg("kuick_plugin.desktop", false, false, "services");
        cfg.setDesktopGroup();
        cfg.writeEntry("Hidden", true);
     }
@@ -122,14 +122,14 @@ void KCMKuick::save()
 }
 
 void KCMKuick::slotClearCopyCache( ) {
-    KConfig config("konquerorrc");
+    TDEConfig config("konquerorrc");
     config.setGroup("kuick-copy" );
     config.writePathEntry("Paths", TQStringList() );
     config.sync();		//is it necessary ?
 }
 
 void KCMKuick::slotClearMoveCache() {
-    KConfig config("konquerorrc");
+    TDEConfig config("konquerorrc");
     config.setGroup("kuick-move" );
     config.writePathEntry("Paths", TQStringList() );
     config.sync();		//is it necessary ?
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.h b/konq-plugins/kuick/kcmkuick/kcmkuick.h
index c56250e..9c77d93 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuick.h
+++ b/konq-plugins/kuick/kcmkuick/kcmkuick.h
@@ -21,7 +21,7 @@
 
 
 class KCMKuick
-	: public KCModule
+	: public TDECModule
 {
 	Q_OBJECT
   
diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp
index 76dbd95..cfe19f0 100644
--- a/konq-plugins/kuick/kdirmenu.cpp
+++ b/konq-plugins/kuick/kdirmenu.cpp
@@ -133,7 +133,7 @@ void KDirMenu::slotAboutToShow( ) {
         if (kapp->authorizeURLAction("list", u, u))
         {
            insert(new KDirMenu(this, src, (*it)->absFilePath(), name),
-			KIO::decodeFileName( fileName ));
+			TDEIO::decodeFileName( fileName ));
 	}
     }
 }
diff --git a/konq-plugins/kuick/kmetamenu.h b/konq-plugins/kuick/kmetamenu.h
index a28501e..3d60b86 100644
--- a/konq-plugins/kuick/kmetamenu.h
+++ b/konq-plugins/kuick/kmetamenu.h
@@ -27,7 +27,7 @@
 
 class TQIconSet;
 class TQStringList;
-class KConfig;
+class TDEConfig;
 class KDirMenu;
 class KIMContactMenu;
 class KIMProxy;
@@ -59,7 +59,7 @@ private:
      KIMProxy *m_proxy;
      KAction *m_browse;
      TQStringList list;
-     KConfig *conf;
+     TDEConfig *conf;
      TQString group;
      TQPtrList<KAction> actions;
 };
diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp
index 1b45791..16e11fd 100644
--- a/konq-plugins/kuick/kuick_plugin.cpp
+++ b/konq-plugins/kuick/kuick_plugin.cpp
@@ -58,14 +58,14 @@ void KTestMenu::slotPopupMaeh( ){
 }
 void KTestMenu::slotStartCopyJob( const TQString &path ) {
      KURL url = KURL::fromPathOrURL( path );
-     KIO::CopyJob *copy;
-     copy = KIO::copy( popup->popupURLList(), url);
+     TDEIO::CopyJob *copy;
+     copy = TDEIO::copy( popup->popupURLList(), url);
      copy->setAutoErrorHandlingEnabled( true );
 }
 void KTestMenu::slotStartMoveJob( const TQString &path) {
      KURL url = KURL::fromPathOrURL( path );
-     KIO::CopyJob *move;
-     move = KIO::move( popup->popupURLList(), url );
+     TDEIO::CopyJob *move;
+     move = TDEIO::move( popup->popupURLList(), url );
      move->setAutoErrorHandlingEnabled( true );
 }