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

2 files changed, 7 insertions, 7 deletions

diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index 49ab2950..45a94701 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -727,12 +727,12 @@ void KSCD::showConfig()
 {
     static configWidget* confWidget = 0;
 
-    if (KConfigDialog::showDialog("settings")) {
+    if (TDEConfigDialog::showDialog("settings")) {
         updateConfigDialog(confWidget);
         return;
     }
 
-    configDialog = new KConfigDialog(this, "settings", Prefs::self());
+    configDialog = new TDEConfigDialog(this, "settings", Prefs::self());
 
     configDialog->setHelp(TQString());
 
@@ -745,10 +745,10 @@ void KSCD::showConfig()
     KService::Ptr libkcddb = KService::serviceByDesktopName("libkcddb");
     if (libkcddb && libkcddb->isValid())
     {
-        KCModuleInfo info(libkcddb->desktopEntryPath());
+        TDECModuleInfo info(libkcddb->desktopEntryPath());
         if (info.service()->isValid())
         {
-            KCModule *m = KCModuleLoader::loadModule(info, KCModuleLoader::Inline);
+            TDECModule *m = TDECModuleLoader::loadModule(info, TDECModuleLoader::Inline);
             if (m)
             {
                 m->load();
@@ -1491,7 +1491,7 @@ void KSCD::information(int i)
 bool KSCD::saveState(TQSessionManager& /*sm*/)
 {
   writeSettings();
-  KConfig* config = TDEApplication::kApplication()->sessionConfig();
+  TDEConfig* config = TDEApplication::kApplication()->sessionConfig();
   config->setGroup("General");
   config->writeEntry("Show", isVisible());
   return true;
@@ -1659,7 +1659,7 @@ int main( int argc, char *argv[] )
 
     if (kapp->isRestored())
     {
-        KConfig* config = TDEApplication::kApplication()->sessionConfig();
+        TDEConfig* config = TDEApplication::kApplication()->sessionConfig();
         config->setGroup("General");
         if (config->readBoolEntry("Show"))
             k->show();
diff --git a/kscd/kscd.h b/kscd/kscd.h
index 8ed84a37..01c6e163 100644
--- a/kscd/kscd.h
+++ b/kscd/kscd.h
@@ -181,7 +181,7 @@ protected:
     void updateConfigDialog(configWidget* widget);
 
 private:
-    KConfigDialog   *configDialog;
+    TDEConfigDialog   *configDialog;
     CDDBDlg         *cddialog;
     TQPopupMenu      *mainPopup;
     TQPopupMenu      *infoPopup;