diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:45:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:45:16 -0600 |
| commit | f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7 (patch) | |
| tree | b312fd7d5b7a34b88941b2fc50661431637b78b4 /kgoldrunner | |
| parent | 23a5c62758c4898e3afc1b8bb4c3ae78f4b526ac (diff) | |
| download | tdegames-f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7.tar.gz tdegames-f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kgoldrunner')
| -rw-r--r-- | kgoldrunner/src/kgoldrunner.cpp | 14 | ||||
| -rw-r--r-- | kgoldrunner/src/kgrdialog.cpp | 2 | ||||
| -rw-r--r-- | kgoldrunner/src/kgrgame.cpp | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/kgoldrunner/src/kgoldrunner.cpp b/kgoldrunner/src/kgoldrunner.cpp index 9497a7ef..3e6bc0b4 100644 --- a/kgoldrunner/src/kgoldrunner.cpp +++ b/kgoldrunner/src/kgoldrunner.cpp @@ -76,7 +76,7 @@ KGoldrunner::KGoldrunner() /******************************************************************************/ // Get catalog for translation - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); // Tell the KMainWindow that this is the main widget setCentralWidget (view); @@ -769,12 +769,12 @@ void KGoldrunner::optionsConfigureToolbars() // use the standard toolbar editor #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else - saveMainWindowSettings(KGlobal::config()); + saveMainWindowSettings(TDEGlobal::config()); # endif #else - saveMainWindowSettings(KGlobal::config()); + saveMainWindowSettings(TDEGlobal::config()); #endif } @@ -786,12 +786,12 @@ void KGoldrunner::newToolbarConfig() #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); # endif #else - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); #endif } diff --git a/kgoldrunner/src/kgrdialog.cpp b/kgoldrunner/src/kgrdialog.cpp index 4a58b235..79d19f3a 100644 --- a/kgoldrunner/src/kgrdialog.cpp +++ b/kgoldrunner/src/kgrdialog.cpp @@ -782,7 +782,7 @@ KGrLGDialog::KGrLGDialog (TQFile * savedGames, #ifdef KGR_PORTABLE TQFont f ("courier", 12); #else - TQFont f = KGlobalSettings::fixedFont(); // KDE version. + TQFont f = TDEGlobalSettings::fixedFont(); // KDE version. #endif f.setFixedPitch (TRUE); lgList-> setFont (f); diff --git a/kgoldrunner/src/kgrgame.cpp b/kgoldrunner/src/kgrgame.cpp index 6962d7a1..13157225 100644 --- a/kgoldrunner/src/kgrgame.cpp +++ b/kgoldrunner/src/kgrgame.cpp @@ -1162,7 +1162,7 @@ void KGrGame::showHighScores() #ifdef KGR_PORTABLE TQFont f ("courier", 12); #else - TQFont f = KGlobalSettings::fixedFont(); // KDE version. + TQFont f = TDEGlobalSettings::fixedFont(); // KDE version. #endif f. setFixedPitch (TRUE); f. setBold (TRUE); |