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

6 files changed, 15 insertions, 15 deletions

diff --git a/kpoker/global.h b/kpoker/global.h
index d4755abd..997cfe09 100644
--- a/kpoker/global.h
+++ b/kpoker/global.h
@@ -21,7 +21,7 @@
 #include <kconfig.h>
 
 extern KLocale  *locale;
-extern KConfig  *conf;
+extern TDEConfig  *conf;
 
 #endif
 
diff --git a/kpoker/kpoker.cpp b/kpoker/kpoker.cpp
index 7d50e198..534b43b6 100644
--- a/kpoker/kpoker.cpp
+++ b/kpoker/kpoker.cpp
@@ -208,7 +208,7 @@ kpok::~kpok()
     //	cashPerRound = mOptions->getCashPerRound(); // NOT(!) configurable
   }
 
-  KConfig* conf = kapp->config();
+  TDEConfig* conf = kapp->config();
   conf->setGroup("General");
   conf->writeEntry("MinBet", m_game.getMinBet());
   conf->writeEntry("MaxBet", m_game.getMaxBet());
@@ -314,7 +314,7 @@ void kpok::initWindow()
   cardImages = new CardImages(this, 0);
 
   // The configuration
-  KConfig* conf = kapp->config();
+  TDEConfig* conf = kapp->config();
   conf->setGroup("General");
 
   // Load the card deck.
@@ -1215,7 +1215,7 @@ PokerPlayer* kpok::findHumanPlayer()
 bool kpok::readEntriesAndInitPoker()
 {
   NewGameDlg  *newGameDlg = NULL;
-  KConfig     *conf       = kapp->config();
+  TDEConfig     *conf       = kapp->config();
   int          numPlayers = DEFAULT_PLAYERS;
 
   conf->setGroup("NewGameDlg");
@@ -1298,7 +1298,7 @@ void kpok::saveGame()
 }
 
 
-void kpok::saveGame(KConfig* conf)
+void kpok::saveGame(TDEConfig* conf)
 {
   // kdWarning() << "save game" << endl;
   int players = m_game.getNumPlayers();
@@ -1398,7 +1398,7 @@ bool kpok::loadGame()
 }
 
 
-bool kpok::loadGame(KConfig* conf)
+bool kpok::loadGame(TDEConfig* conf)
 {
   int numPlayers = DEFAULT_PLAYERS;
 
diff --git a/kpoker/kpoker.h b/kpoker/kpoker.h
index 6e789a5d..d15e7814 100644
--- a/kpoker/kpoker.h
+++ b/kpoker/kpoker.h
@@ -41,7 +41,7 @@ class TQHBoxLayout;
 class TQVBoxLayout;
 
 // KDE classes
-class KConfig;
+class TDEConfig;
 
 
 // own classes
@@ -285,9 +285,9 @@ class kpok : public TQWidget
    * The game can be loaded on startup by activating the button
    * 'read from config'
    **/
-  void saveGame(KConfig* conf);
+  void saveGame(TDEConfig* conf);
 
-  bool loadGame(KConfig* conf);
+  bool loadGame(TDEConfig* conf);
   bool loadGame();
   //	void commandCallback(int id);
   void newGame();
diff --git a/kpoker/newgamedlg.cpp b/kpoker/newgamedlg.cpp
index 80a9a501..083e0b4f 100644
--- a/kpoker/newgamedlg.cpp
+++ b/kpoker/newgamedlg.cpp
@@ -41,7 +41,7 @@ NewGameDlg::NewGameDlg(TQWidget* parent)
   TQVBoxLayout  *topLayout = new TQVBoxLayout(plainPage(), spacingHint());
   TQHBoxLayout  *l         = new TQHBoxLayout(topLayout);
 
-  KConfig* conf = kapp->config();
+  TDEConfig* conf = kapp->config();
   conf->setGroup("NewGameDlg");
   bool showNewGameDlg = conf->readBoolEntry("showNewGameDlgOnStartup", 
 					    SHOWNEWGAME_DEFAULT);
@@ -100,7 +100,7 @@ NewGameDlg::NewGameDlg(TQWidget* parent)
 NewGameDlg::~NewGameDlg()
 {
   if (result() == Accepted) {
-    KConfig* conf = kapp->config(); 
+    TDEConfig* conf = kapp->config(); 
     conf->setGroup("NewGameDlg"); // defaults for the newGameDlg only
     conf->writeEntry("showNewGameDlgOnStartup", showOnStartup());
     conf->writeEntry("readFromConfig", readFromConfigFile()); // just a default!
diff --git a/kpoker/top.cpp b/kpoker/top.cpp
index 270fd2e5..38c7be4b 100644
--- a/kpoker/top.cpp
+++ b/kpoker/top.cpp
@@ -127,7 +127,7 @@ void PokerWindow::initKAction()
 
 void PokerWindow::readOptions()
 {
-  KConfig* conf = kapp->config();
+  TDEConfig* conf = kapp->config();
   conf->setGroup("General");
 
   if (m_kpok->getSound() != conf->readBoolEntry("Sound", true))
@@ -235,7 +235,7 @@ void PokerWindow::clearStatusBar()
 
 void PokerWindow::saveOptions()
 {
-  KConfig* conf = kapp->config();
+  TDEConfig* conf = kapp->config();
   conf->setGroup("General");
 
   conf->writeEntry("Sound",         soundAction->isChecked());
diff --git a/kpoker/top.h b/kpoker/top.h
index 330c568d..995e8575 100644
--- a/kpoker/top.h
+++ b/kpoker/top.h
@@ -43,8 +43,8 @@ class PokerWindow : public KMainWindow
     void  readOptions();
 
   protected slots:
-    //     void saveProperties(KConfig*);
-    //     void readProperties(KConfig*);
+    //     void saveProperties(TDEConfig*);
+    //     void readProperties(TDEConfig*);
     void  setHand(const TQString &newHand, bool lastHand = true);
     void  showClickToHold(bool show);
     void  statusBarMessage(TQString);