From 2f84d0e2d3d4252e6aee24aceafa45dbdb7f4d1d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:32:59 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kreversi/board.h | 2 +- kreversi/highscores.cpp | 2 +- kreversi/kreversi.cpp | 16 ++++++++-------- kreversi/kreversi.h | 8 ++++---- kreversi/qreversigame.h | 6 +++--- kreversi/qreversigameview.h | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) (limited to 'kreversi') diff --git a/kreversi/board.h b/kreversi/board.h index 6f9c057b..d69ab846 100644 --- a/kreversi/board.h +++ b/kreversi/board.h @@ -47,7 +47,7 @@ #include "Move.h" -class KConfig; +class TDEConfig; class QReversiGame; diff --git a/kreversi/highscores.cpp b/kreversi/highscores.cpp index fae86a40..e8aa0a94 100644 --- a/kreversi/highscores.cpp +++ b/kreversi/highscores.cpp @@ -75,7 +75,7 @@ void ExtManager::convertLegacy(uint gameType) if ( gameType!=0 ) return; - KConfigGroupSaver cg(kapp->config(), "High Score"); + TDEConfigGroupSaver cg(kapp->config(), "High Score"); for (uint i = 1; i <= 10; i++) { TQString key = "Pos" + TQString::number(i); diff --git a/kreversi/kreversi.cpp b/kreversi/kreversi.cpp index 22d1f5c5..207e0952 100644 --- a/kreversi/kreversi.cpp +++ b/kreversi/kreversi.cpp @@ -258,7 +258,7 @@ void KReversi::slotNewGame() void KReversi::slotOpenGame() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Savegame"); if (loadGame(config)) @@ -274,7 +274,7 @@ void KReversi::slotOpenGame() void KReversi::slotSave() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Savegame"); saveGame(config); @@ -643,7 +643,7 @@ void KReversi::showGameOver(Color color) // Only one game at a time can be saved. // -void KReversi::saveGame(KConfig *config) +void KReversi::saveGame(TDEConfig *config) { // Stop thinking. slotInterrupt(); @@ -679,7 +679,7 @@ void KReversi::saveGame(KConfig *config) // Loads the game. Only one game at a time can be saved. -bool KReversi::loadGame(KConfig *config) +bool KReversi::loadGame(TDEConfig *config) { slotInterrupt(); // stop thinking @@ -725,13 +725,13 @@ bool KReversi::loadGame(KConfig *config) // ---------------------------------------------------------------- -void KReversi::saveProperties(KConfig *c) +void KReversi::saveProperties(TDEConfig *c) { saveGame(c); } -void KReversi::readProperties(KConfig *config) { +void KReversi::readProperties(TDEConfig *config) { loadGame(config); m_gameOver = false; m_cheating = false; // FIXME: Is this true? It isn't saved. @@ -747,10 +747,10 @@ void KReversi::showHighScoreDialog() void KReversi::slotEditSettings() { // If we are already editing the settings, then do nothing. - if (KConfigDialog::showDialog("settings")) + if (TDEConfigDialog::showDialog("settings")) return; - KConfigDialog *dialog = new KConfigDialog(this, "settings", Prefs::self(), + TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Prefs::self(), KDialogBase::Swallow); Settings *general = new Settings(0, "General"); diff --git a/kreversi/kreversi.h b/kreversi/kreversi.h index a37ecf35..f702189b 100644 --- a/kreversi/kreversi.h +++ b/kreversi/kreversi.h @@ -98,8 +98,8 @@ private: virtual void writeMenubarVisibleSetting(bool visible); virtual bool menubarVisibleSetting() const; - virtual void saveProperties(KConfig *); - virtual void readProperties(KConfig *); + virtual void saveProperties(TDEConfig *); + virtual void readProperties(TDEConfig *); virtual bool queryExit(); @@ -145,8 +145,8 @@ private: void illegalMove(); void showGameOver(Color); - void saveGame(KConfig *); - bool loadGame(KConfig *); + void saveGame(TDEConfig *); + bool loadGame(TDEConfig *); private: diff --git a/kreversi/qreversigame.h b/kreversi/qreversigame.h index 97546407..a1b16ab3 100644 --- a/kreversi/qreversigame.h +++ b/kreversi/qreversigame.h @@ -47,7 +47,7 @@ #include "Move.h" -class KConfig; +class TDEConfig; @@ -77,8 +77,8 @@ class QReversiGame : public TQObject, public Game { #if 0 void loadSettings(); - bool loadGame(KConfig *, bool noupdate = FALSE); - void saveGame(KConfig *); + bool loadGame(TDEConfig *, bool noupdate = FALSE); + void saveGame(TDEConfig *); #endif signals: diff --git a/kreversi/qreversigameview.h b/kreversi/qreversigameview.h index c4f4ebc5..338cd55c 100644 --- a/kreversi/qreversigameview.h +++ b/kreversi/qreversigameview.h @@ -47,7 +47,7 @@ #include "board.h" -class KConfig; +class TDEConfig; class TQLabel; -- cgit v1.2.3