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

17 files changed, 50 insertions, 50 deletions

diff --git a/kcontrol/kicker/advancedDialog.cpp b/kcontrol/kicker/advancedDialog.cpp
index 7e02b0da9..a56625e4a 100644
--- a/kcontrol/kicker/advancedDialog.cpp
+++ b/kcontrol/kicker/advancedDialog.cpp
@@ -78,7 +78,7 @@ advancedDialog::~advancedDialog()
 
 void advancedDialog::load()
 {
-    KConfig c(KickerConfig::the()->configName(), false, false);
+    TDEConfig c(KickerConfig::the()->configName(), false, false);
     c.setGroup("General");
 
     bool fadedOut = c.readBoolEntry("FadeOutAppletHandles", true);
@@ -112,7 +112,7 @@ void advancedDialog::load()
 
 void advancedDialog::save()
 {
-    KConfig c(KickerConfig::the()->configName(), false, false);
+    TDEConfig c(KickerConfig::the()->configName(), false, false);
 
     c.setGroup("General");
     c.writeEntry("FadeOutAppletHandles",
@@ -149,7 +149,7 @@ void advancedDialog::save()
 
         // set config group
         c.setGroup(group);
-        KConfig extConfig(c.readEntry("ConfigFile"));
+        TDEConfig extConfig(c.readEntry("ConfigFile"));
         extConfig.setGroup("General");
         extConfig.writeEntry("FadeOutAppletHandles",
                              m_advancedWidget->fadeOutHandles->isChecked());
diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp
index f2b7cc1b4..73fa16d5c 100644
--- a/kcontrol/kicker/applettab_impl.cpp
+++ b/kcontrol/kicker/applettab_impl.cpp
@@ -94,7 +94,7 @@ void AppletTab::load()
 
 void AppletTab::load( bool useDefaults )
 {
-  KConfig c(KickerConfig::the()->configName(), false, false);
+  TDEConfig c(KickerConfig::the()->configName(), false, false);
   c.setReadDefaults( useDefaults );
   c.setGroup("General");
 
@@ -153,7 +153,7 @@ void AppletTab::load( bool useDefaults )
 
 void AppletTab::save()
 {
-    KConfig c(KickerConfig::the()->configName(), false, false);
+    TDEConfig c(KickerConfig::the()->configName(), false, false);
   c.setGroup("General");
 
   int level = 0;
diff --git a/kcontrol/kicker/extensionInfo.cpp b/kcontrol/kicker/extensionInfo.cpp
index 91e19e2d3..037159d93 100644
--- a/kcontrol/kicker/extensionInfo.cpp
+++ b/kcontrol/kicker/extensionInfo.cpp
@@ -121,7 +121,7 @@ void ExtensionInfo::load()
     if (_customSizeMax < _customSizeMin) _customSizeMax = _customSizeMin;
     if (_customSize < _customSizeMin) _customSize = _customSizeMin;
 
-    KConfig c(_configFile);
+    TDEConfig c(_configFile);
     c.setGroup("General");
 
     _position           = c.readNumEntry ("Position",            _position);
@@ -159,7 +159,7 @@ void ExtensionInfo::load()
 
 void ExtensionInfo::configChanged()
 {
-    KConfig c(_configFile);
+    TDEConfig c(_configFile);
     c.setGroup("General");
 
     // check to see if the new value is different from both
@@ -223,7 +223,7 @@ void ExtensionInfo::setDefaults()
 
 void ExtensionInfo::save()
 {
-    KConfig c(_configFile);
+    TDEConfig c(_configFile);
     c.setGroup("General");
 
     c.writeEntry("Position",            _position);
diff --git a/kcontrol/kicker/hidingconfig.cpp b/kcontrol/kicker/hidingconfig.cpp
index 935fa5902..810024479 100644
--- a/kcontrol/kicker/hidingconfig.cpp
+++ b/kcontrol/kicker/hidingconfig.cpp
@@ -29,7 +29,7 @@
 #include "hidingconfig.moc"
 
 HidingConfig::HidingConfig(TQWidget *parent, const char *name)
-  : KCModule(parent, name)
+  : TDECModule(parent, name)
 {
     TQVBoxLayout *layout = new TQVBoxLayout(this);
     m_widget = new HidingTab(this);
@@ -58,7 +58,7 @@ void HidingConfig::notChanged()
 void HidingConfig::load()
 {
     m_widget->load();
-    KCModule::load();
+    TDECModule::load();
 }
 
 void HidingConfig::aboutToNotifyKicker()
@@ -69,7 +69,7 @@ void HidingConfig::aboutToNotifyKicker()
     // which is send before Kicker is notified.
     // See comment in save().
     m_widget->save();
-    KCModule::save();
+    TDECModule::save();
 }
 
 void HidingConfig::save()
@@ -85,9 +85,9 @@ void HidingConfig::save()
 void HidingConfig::defaults()
 {
     m_widget->defaults();
-    KCModule::defaults();
+    TDECModule::defaults();
 
-    // KConfigDialogManager may queue an changed(false) signal,
+    // TDEConfigDialogManager may queue an changed(false) signal,
     // so we make sure, that the module is labeled as changed,
     // while we manage some of the widgets ourselves
     TQTimer::singleShot(0, this, TQT_SLOT(changed()));
diff --git a/kcontrol/kicker/hidingconfig.h b/kcontrol/kicker/hidingconfig.h
index 647be9631..342da29b9 100644
--- a/kcontrol/kicker/hidingconfig.h
+++ b/kcontrol/kicker/hidingconfig.h
@@ -22,7 +22,7 @@
 
 class HidingTab;
 
-class HidingConfig : public KCModule
+class HidingConfig : public TDECModule
 {
     Q_OBJECT
 
diff --git a/kcontrol/kicker/lookandfeelconfig.cpp b/kcontrol/kicker/lookandfeelconfig.cpp
index 7475ad7b0..49c0cf56a 100644
--- a/kcontrol/kicker/lookandfeelconfig.cpp
+++ b/kcontrol/kicker/lookandfeelconfig.cpp
@@ -29,7 +29,7 @@
 #include "lookandfeelconfig.moc"
 
 LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name)
-  : KCModule(parent, name)
+  : TDECModule(parent, name)
 {
     TQVBoxLayout *layout = new TQVBoxLayout(this);
     m_widget = new LookAndFeelTab(this);
@@ -57,7 +57,7 @@ void LookAndFeelConfig::notChanged()
 
 void LookAndFeelConfig::load()
 {
-    KCModule::load();
+    TDECModule::load();
     m_widget->load();
 }
 
@@ -68,7 +68,7 @@ void LookAndFeelConfig::aboutToNotifyKicker()
     // This slot is triggered by the signal,
     // which is send before Kicker is notified.
     // See comment in save().
-    KCModule::save();
+    TDECModule::save();
     m_widget->save();
 }
 
@@ -84,10 +84,10 @@ void LookAndFeelConfig::save()
 
 void LookAndFeelConfig::defaults()
 {
-    KCModule::defaults();
+    TDECModule::defaults();
     m_widget->defaults();
 
-    // KConfigDialogManager may queue an changed(false) signal,
+    // TDEConfigDialogManager may queue an changed(false) signal,
     // so we make sure, that the module is labeled as changed,
     // while we manage some of the widgets ourselves
     TQTimer::singleShot(0, this, TQT_SLOT(changed()));
diff --git a/kcontrol/kicker/lookandfeelconfig.h b/kcontrol/kicker/lookandfeelconfig.h
index 7b91cc52f..c3190ce08 100644
--- a/kcontrol/kicker/lookandfeelconfig.h
+++ b/kcontrol/kicker/lookandfeelconfig.h
@@ -22,7 +22,7 @@
 
 class LookAndFeelTab;
 
-class LookAndFeelConfig : public KCModule
+class LookAndFeelConfig : public TDECModule
 {
     Q_OBJECT
 
diff --git a/kcontrol/kicker/lookandfeeltab_impl.cpp b/kcontrol/kicker/lookandfeeltab_impl.cpp
index b2e6a79dc..4d063b54e 100644
--- a/kcontrol/kicker/lookandfeeltab_impl.cpp
+++ b/kcontrol/kicker/lookandfeeltab_impl.cpp
@@ -129,7 +129,7 @@ void LookAndFeelTab::previewBackground(const TQString& themepath, bool isNew)
             KickerLib::colorize(tmpImg);
         theme_preview.convertFromImage(tmpImg);
         if(!theme_preview.isNull()) {
-            // avoid getting changed(true) from KConfigDialogManager for the default value
+            // avoid getting changed(true) from TDEConfigDialogManager for the default value
             if( KickerSettings::backgroundTheme() == themepath )
                 KickerSettings::setBackgroundTheme( theme );
             kcfg_BackgroundTheme->lineEdit()->setText(theme);
@@ -154,7 +154,7 @@ void LookAndFeelTab::load()
 
 void LookAndFeelTab::load(bool useDefaults)
 {
-    KConfig config(KickerConfig::the()->configName(), false, false);
+    TDEConfig config(KickerConfig::the()->configName(), false, false);
 
     config.setReadDefaults( useDefaults );
 
@@ -227,7 +227,7 @@ void LookAndFeelTab::load(bool useDefaults)
 
 void LookAndFeelTab::save()
 {
-    KConfig config(KickerConfig::the()->configName(), false, false);
+    TDEConfig config(KickerConfig::the()->configName(), false, false);
 
     config.setGroup("General");
 
diff --git a/kcontrol/kicker/lookandfeeltab_kcm.cpp b/kcontrol/kicker/lookandfeeltab_kcm.cpp
index 16e52c8ec..23766ce28 100644
--- a/kcontrol/kicker/lookandfeeltab_kcm.cpp
+++ b/kcontrol/kicker/lookandfeeltab_kcm.cpp
@@ -29,7 +29,7 @@
 #include <kdialog.h>
 
 LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name)
-  : KCModule(parent, name)
+  : TDECModule(parent, name)
 {
 
     TDEAboutData *about =
diff --git a/kcontrol/kicker/lookandfeeltab_kcm.h b/kcontrol/kicker/lookandfeeltab_kcm.h
index 085f87e43..ecf7ff0e6 100644
--- a/kcontrol/kicker/lookandfeeltab_kcm.h
+++ b/kcontrol/kicker/lookandfeeltab_kcm.h
@@ -22,7 +22,7 @@
 
 class LookAndFeelTab;
 
-class LookAndFeelConfig : public KCModule
+class LookAndFeelConfig : public TDECModule
 {
     Q_OBJECT
 
diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp
index 5fa5ceb06..dda2f08db 100644
--- a/kcontrol/kicker/main.cpp
+++ b/kcontrol/kicker/main.cpp
@@ -171,7 +171,7 @@ void KickerConfig::notifyKicker()
     kapp->dcopClient()->send(appname, appname, "configure()", data);
 }
 
-void KickerConfig::setupExtensionInfo(KConfig& config, bool checkExists, bool reloadIfExists)
+void KickerConfig::setupExtensionInfo(TDEConfig& config, bool checkExists, bool reloadIfExists)
 {
     config.setGroup("General");
     TQStringList elist = config.readListEntry("Extensions2");
@@ -353,7 +353,7 @@ TQString KickerConfig::quickHelp() const
 
 TDEAboutData *KickerConfig::aboutData()
 {
-    // the TDEAboutDatas are deleted by the KCModules
+    // the TDEAboutDatas are deleted by the TDECModules
     TDEAboutData *about
           = new TDEAboutData(I18N_NOOP("kcmkicker"),
                            I18N_NOOP("TDE Panel Control Module"),
@@ -371,9 +371,9 @@ TDEAboutData *KickerConfig::aboutData()
 
 extern "C"
 {
-    KDE_EXPORT KCModule *create_kicker(TQWidget *parent, const char *name)
+    KDE_EXPORT TDECModule *create_kicker(TQWidget *parent, const char *name)
     {
-        KCModuleContainer *container = new KCModuleContainer(parent, "kcmkicker");
+        TDECModuleContainer *container = new TDECModuleContainer(parent, "kcmkicker");
         container->addModule("kicker_config_arrangement");
         container->addModule("kicker_config_hiding");
         container->addModule("kicker_config_menus");
@@ -381,26 +381,26 @@ extern "C"
         return container;
     }
 
-    KDE_EXPORT KCModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/)
+    KDE_EXPORT TDECModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/)
     {
         TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
                                          "kicker/extensions");
         return new PositionConfig(parent, "kcmkicker");
     }
 
-    KDE_EXPORT KCModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/)
+    KDE_EXPORT TDECModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/)
     {
         TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
                                          "kicker/extensions");
         return new HidingConfig(parent, "kcmkicker");
     }
 
-    KDE_EXPORT KCModule *create_kicker_menus(TQWidget *parent, const char * /*name*/)
+    KDE_EXPORT TDECModule *create_kicker_menus(TQWidget *parent, const char * /*name*/)
     {
         return new MenuConfig(parent, "kcmkicker");
     }
 
-    KDE_EXPORT KCModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/)
+    KDE_EXPORT TDECModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/)
     {
         KImageIO::registerFormats();
         TDEGlobal::dirs()->addResourceType("tiles", KStandardDirs::kde_default("data") +
diff --git a/kcontrol/kicker/main.h b/kcontrol/kicker/main.h
index bbc567273..45364c366 100644
--- a/kcontrol/kicker/main.h
+++ b/kcontrol/kicker/main.h
@@ -65,7 +65,7 @@ signals:
 
 protected:
     void init();
-    void setupExtensionInfo(KConfig& c, bool checkExists, bool reloadIfExists = false);
+    void setupExtensionInfo(TDEConfig& c, bool checkExists, bool reloadIfExists = false);
 
 protected slots:
     void configChanged(const TQString&);
diff --git a/kcontrol/kicker/menuconfig.cpp b/kcontrol/kicker/menuconfig.cpp
index 03ca57582..b477cd76d 100644
--- a/kcontrol/kicker/menuconfig.cpp
+++ b/kcontrol/kicker/menuconfig.cpp
@@ -29,7 +29,7 @@
 #include "menuconfig.moc"
 
 MenuConfig::MenuConfig(TQWidget *parent, const char *name)
-  : KCModule(parent, name)
+  : TDECModule(parent, name)
 {
     TQVBoxLayout *layout = new TQVBoxLayout(this);
     m_widget = new MenuTab(this);
@@ -58,7 +58,7 @@ void MenuConfig::notChanged()
 void MenuConfig::load()
 {
     m_widget->load();
-    KCModule::load();
+    TDECModule::load();
 }
 
 void MenuConfig::aboutToNotifyKicker()
@@ -69,7 +69,7 @@ void MenuConfig::aboutToNotifyKicker()
     // which is send before Kicker is notified.
     // See comment in save().
     m_widget->save();
-    KCModule::save();
+    TDECModule::save();
 }
 
 void MenuConfig::save()
@@ -85,9 +85,9 @@ void MenuConfig::save()
 void MenuConfig::defaults()
 {
     m_widget->defaults();
-    KCModule::defaults();
+    TDECModule::defaults();
 
-    // KConfigDialogManager may queue an changed(false) signal,
+    // TDEConfigDialogManager may queue an changed(false) signal,
     // so we make sure, that the module is labeled as changedm,
     // while we manage some of the widgets ourselves
     TQTimer::singleShot(0, this, TQT_SLOT(changed()));
diff --git a/kcontrol/kicker/menuconfig.h b/kcontrol/kicker/menuconfig.h
index 490684076..30178b18c 100644
--- a/kcontrol/kicker/menuconfig.h
+++ b/kcontrol/kicker/menuconfig.h
@@ -22,7 +22,7 @@
 
 class MenuTab;
 
-class MenuConfig : public KCModule
+class MenuConfig : public TDECModule
 {
     Q_OBJECT
 
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index 5b08627cb..652f75aa7 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -93,8 +93,8 @@ MenuTab::MenuTab( TQWidget *parent, const char* name )
     kmenu_icon = ldr->loadIcon(m_kmenu_icon, KIcon::Small, KIcon::SizeSmall);
     btnCustomKMenuIcon->setPixmap(kmenu_icon);
 
-    KConfig *config;
-    config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false);
+    TDEConfig *config;
+    config = new TDEConfig(TQString::fromLatin1("kdeglobals"), false, false);
     config->setGroup(TQString::fromLatin1("RecentDocuments"));
     maxrecentdocs->setValue(config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10));
 
@@ -267,8 +267,8 @@ void MenuTab::save()
     c->sync();
 
     // Save recent documents
-    KConfig *config;
-    config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false);
+    TDEConfig *config;
+    config = new TDEConfig(TQString::fromLatin1("kdeglobals"), false, false);
     config->setGroup(TQString::fromLatin1("RecentDocuments"));
     config->writeEntry("MaxEntries", maxrecentdocs->value());
     config->sync();
diff --git a/kcontrol/kicker/positionconfig.cpp b/kcontrol/kicker/positionconfig.cpp
index 6e5dcdeb2..4eafcf677 100644
--- a/kcontrol/kicker/positionconfig.cpp
+++ b/kcontrol/kicker/positionconfig.cpp
@@ -29,7 +29,7 @@
 #include "positionconfig.moc"
 
 PositionConfig::PositionConfig(TQWidget *parent, const char *name)
-  : KCModule(parent, name)
+  : TDECModule(parent, name)
 {
     TQVBoxLayout *layout = new TQVBoxLayout(this);
     m_widget = new PositionTab(this);
@@ -58,7 +58,7 @@ void PositionConfig::notChanged()
 void PositionConfig::load()
 {
     m_widget->load();
-    KCModule::load();
+    TDECModule::load();
 }
 
 void PositionConfig::aboutToNotifyKicker()
@@ -69,7 +69,7 @@ void PositionConfig::aboutToNotifyKicker()
     // which is send before Kicker is notified.
     // See comment in save().
     m_widget->save();
-    KCModule::save();
+    TDECModule::save();
 }
 
 void PositionConfig::save()
@@ -85,9 +85,9 @@ void PositionConfig::save()
 void PositionConfig::defaults()
 {
     m_widget->defaults();
-    KCModule::defaults();
+    TDECModule::defaults();
 
-    // KConfigDialogManager may queue an changed(false) signal,
+    // TDEConfigDialogManager may queue an changed(false) signal,
     // so we make sure, that the module is labeled as changed,
     // while we manage some of the widgets ourselves
     TQTimer::singleShot(0, this, TQT_SLOT(changed()));
diff --git a/kcontrol/kicker/positionconfig.h b/kcontrol/kicker/positionconfig.h
index bf29473b4..13d026f3b 100644
--- a/kcontrol/kicker/positionconfig.h
+++ b/kcontrol/kicker/positionconfig.h
@@ -22,7 +22,7 @@
 
 class PositionTab;
 
-class PositionConfig : public KCModule
+class PositionConfig : public TDECModule
 {
     Q_OBJECT