summaryrefslogtreecommitdiffstats
path: root/kgoldrunner/src/kgoldrunner.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:45:16 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:45:16 -0600
commitf3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7 (patch)
treeb312fd7d5b7a34b88941b2fc50661431637b78b4 /kgoldrunner/src/kgoldrunner.cpp
parent23a5c62758c4898e3afc1b8bb4c3ae78f4b526ac (diff)
downloadtdegames-f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7.tar.gz
tdegames-f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kgoldrunner/src/kgoldrunner.cpp')
-rw-r--r--kgoldrunner/src/kgoldrunner.cpp14
1 files changed, 7 insertions, 7 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
}