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

3 files changed, 5 insertions, 5 deletions

diff --git a/kspaceduel/dialogs.cpp b/kspaceduel/dialogs.cpp
index f7570ef9..636ac21e 100644
--- a/kspaceduel/dialogs.cpp
+++ b/kspaceduel/dialogs.cpp
@@ -389,7 +389,7 @@ void ConfigSetup::sliderChanged(int val)
 }
 
 SettingsDialog::SettingsDialog(SConfig *customConfig, TQWidget *parent, const char *name)
-  : KConfigDialog( parent, name, Options::self())
+  : TDEConfigDialog( parent, name, Options::self())
 {
   General *general = new General();
   addPage(general, i18n("General"), "package_settings", i18n("General Settings"));
diff --git a/kspaceduel/dialogs.h b/kspaceduel/dialogs.h
index 33c77cb2..c772857e 100644
--- a/kspaceduel/dialogs.h
+++ b/kspaceduel/dialogs.h
@@ -77,7 +77,7 @@ private:
    int selectedConfig;
 };
 
-class SettingsDialog : public KConfigDialog
+class SettingsDialog : public TDEConfigDialog
 {
         Q_OBJECT
   
diff --git a/kspaceduel/mainview.cpp b/kspaceduel/mainview.cpp
index fcb0cf40..2486882d 100644
--- a/kspaceduel/mainview.cpp
+++ b/kspaceduel/mainview.cpp
@@ -110,7 +110,7 @@ void MyMainView::setActionCollection(KActionCollection *a)
 
 void MyMainView::readConfig()
 {
-   KConfig *cfg = kapp->config();
+   TDEConfig *cfg = kapp->config();
    int i;
 
    cfg->setGroup("Game");
@@ -185,7 +185,7 @@ void MyMainView::readConfig()
 
 void MyMainView::writeConfig()
 {
-   KConfig *cfg;
+   TDEConfig *cfg;
    cfg=TDEApplication::kApplication()->config();
    cfg->setGroup("Game");
 
@@ -986,7 +986,7 @@ void MyMainView::gameSetup()
   if(!waitForStart)
     pause();
    
-  if (KConfigDialog::showDialog("settings"))
+  if (TDEConfigDialog::showDialog("settings"))
     return;
 
   SettingsDialog *settings=new SettingsDialog(&customConfig,this,"settings");