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

3 files changed, 12 insertions, 12 deletions

diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index 01b5090de..48c649c9a 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -122,7 +122,7 @@ int KAccessApp::newInstance()
 
 void KAccessApp::readSettings()
 {
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
 
   // bell ---------------------------------------------------------------
 
@@ -790,7 +790,7 @@ void KAccessApp::applyChanges() {
    unsigned int enabled  = requestedFeatures & ~features;
    unsigned int disabled = features & ~requestedFeatures;
 
-   KConfig *config = TDEGlobal::config();
+   TDEConfig *config = TDEGlobal::config();
    config->setGroup("Keyboard");
 
    if (enabled & XkbSlowKeysMask)
@@ -823,7 +823,7 @@ void KAccessApp::yesClicked() {
       dialog->deleteLater();
    dialog = 0;
 
-   KConfig *config = TDEGlobal::config();
+   TDEConfig *config = TDEGlobal::config();
    config->setGroup("Keyboard");
    switch (showModeCombobox->currentItem()) {
       case 0:
@@ -854,7 +854,7 @@ void KAccessApp::noClicked() {
    dialog = 0;
    requestedFeatures = features;
 
-   KConfig *config = TDEGlobal::config();
+   TDEConfig *config = TDEGlobal::config();
    config->setGroup("Keyboard");
    switch (showModeCombobox->currentItem()) {
       case 0:
diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index 64cb290e9..218dbfbb4 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -101,7 +101,7 @@ void ExtendedIntNumInput::slotSliderValueChanged(int val)
 	m_spin->setValue ((int)floor(0.5 + linearVal));
 }
 
-static bool needToRunKAccessDaemon( KConfig *config )
+static bool needToRunKAccessDaemon( TDEConfig *config )
 {
 	// We always start the KAccess Daemon, if it is not needed,
 	// it will terminate itself after configuring the AccessX
@@ -222,7 +222,7 @@ TQString mouseKeysShortcut (Display *display) {
 }
 
 KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
-  : KCModule(parent, "kcmaccess")
+  : TDECModule(parent, "kcmaccess")
 {
 
   TDEAboutData *about =
@@ -602,7 +602,7 @@ void KAccessConfig::load()
 
 void KAccessConfig::load( bool useDefaults )
 {
-  KConfig *config = new KConfig("kaccessrc", true, false);
+  TDEConfig *config = new TDEConfig("kaccessrc", true, false);
 
   config->setGroup("Bell");
   config->setReadDefaults( useDefaults );
@@ -657,7 +657,7 @@ void KAccessConfig::load( bool useDefaults )
 
 void KAccessConfig::save()
 {
-  KConfig *config= new KConfig("kaccessrc", false);
+  TDEConfig *config= new TDEConfig("kaccessrc", false);
 
   config->setGroup("Bell");
 
@@ -707,7 +707,7 @@ void KAccessConfig::save()
       customBell->isChecked() ||
       visibleBell->isChecked())
   {
-    KConfig cfg("kdeglobals", false, false);
+    TDEConfig cfg("kdeglobals", false, false);
     cfg.setGroup("General");
     cfg.writeEntry("UseSystemBell", true);
     cfg.sync();
@@ -783,7 +783,7 @@ void KAccessConfig::checkAccess()
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_access(TQWidget *parent, const char *name)
+  KDE_EXPORT TDECModule *create_access(TQWidget *parent, const char *name)
   {
     return new KAccessConfig(parent, name);
   }
@@ -793,7 +793,7 @@ extern "C"
    */
   KDE_EXPORT void init_access()
   {
-    KConfig *config = new KConfig("kaccessrc", true, false);
+    TDEConfig *config = new TDEConfig("kaccessrc", true, false);
     bool run = needToRunKAccessDaemon( config );
 
     delete config;
diff --git a/kcontrol/access/kcmaccess.h b/kcontrol/access/kcmaccess.h
index fac04aef4..0553979bc 100644
--- a/kcontrol/access/kcmaccess.h
+++ b/kcontrol/access/kcmaccess.h
@@ -57,7 +57,7 @@ class ExtendedIntNumInput : public KIntNumInput
 		int sliderMax;
 };
 
-class KAccessConfig : public KCModule
+class KAccessConfig : public TDECModule
 {
   Q_OBJECT