summaryrefslogtreecommitdiffstats
path: root/kturtle/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:44:46 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:44:46 -0600
commitcee429821aa6f1acc97fb482d325fb4eb37376ca (patch)
tree4f55e04b7f000c854fe2b8347dcdb62d97de3c73 /kturtle/src
parentab801f72ab45e8066a8ec6c533ef13c2da67e559 (diff)
downloadtdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.tar.gz
tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kturtle/src')
-rw-r--r--kturtle/src/kturtle.cpp2
-rw-r--r--kturtle/src/kturtle.kcfg4
2 files changed, 3 insertions, 3 deletions
diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp
index 0d827d88..02ecddb8 100644
--- a/kturtle/src/kturtle.cpp
+++ b/kturtle/src/kturtle.cpp
@@ -930,7 +930,7 @@ void MainWindow::slotSettings()
TQStringList LogoLanguageList = Settings::logoLanguageList();
// Add the full language names to the items
for ( TQStringList::Iterator it = LogoLanguageList.begin(); it != LogoLanguageList.end(); ++it ) {
- *it = KGlobal::locale()->twoAlphaToLanguageName( (*it).left(2) ) + " (" + *it + ")";
+ *it = TDEGlobal::locale()->twoAlphaToLanguageName( (*it).left(2) ) + " (" + *it + ")";
}
kcfg_LanguageComboBox->insertStringList(LogoLanguageList);
diff --git a/kturtle/src/kturtle.kcfg b/kturtle/src/kturtle.kcfg
index dd57013a..f3fec672 100644
--- a/kturtle/src/kturtle.kcfg
+++ b/kturtle/src/kturtle.kcfg
@@ -26,7 +26,7 @@
// We assume keyword and highlight files come in pairs (if not there will be no highlight style)
- TQStringList xmlFiles = KGlobal::dirs()->findAllResources("data", "kturtle/data/*.xml");
+ TQStringList xmlFiles = TDEGlobal::dirs()->findAllResources("data", "kturtle/data/*.xml");
TQStringList LogoLanguageList;
TQString xmlTranslationFiles; // for debug purposes
for ( TQStringList::Iterator it = xmlFiles.begin(); it != xmlFiles.end(); ++it ) {
@@ -52,7 +52,7 @@
// The KconfigXT framework makes shure the value that is saved in the kturtlerc file will be used in stead of the defaultLanguage that we find here.
// Get the desktops language
- KConfigBase *globalConf = KGlobal::config();
+ KConfigBase *globalConf = TDEGlobal::config();
globalConf->setGroup("Locale");
TQString desktopLanguage = globalConf->readEntry("Language");
kdDebug(0) &lt;&lt; "desktopLanguage: "&lt;&lt; desktopLanguage &lt;&lt;endl;