diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:44:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:44:46 -0600 |
| commit | cee429821aa6f1acc97fb482d325fb4eb37376ca (patch) | |
| tree | 4f55e04b7f000c854fe2b8347dcdb62d97de3c73 /klettres | |
| parent | ab801f72ab45e8066a8ec6c533ef13c2da67e559 (diff) | |
| download | tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.tar.gz tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'klettres')
| -rw-r--r-- | klettres/klettres/klettres.cpp | 4 | ||||
| -rw-r--r-- | klettres/klettres/klettres.kcfg | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp index c777f2b0..a4836f58 100644 --- a/klettres/klettres/klettres.cpp +++ b/klettres/klettres/klettres.cpp @@ -88,7 +88,7 @@ void KLettres::findLanguages() m_languageNames.clear(); //m_sortedNames.clear(); //the program scans in khangman/data/ to see what languages data is found - TQStringList mdirs = KGlobal::dirs()->findDirs("data", "klettres/"); + TQStringList mdirs = TDEGlobal::dirs()->findDirs("data", "klettres/"); if (mdirs.isEmpty()) return; for (TQStringList::Iterator it =mdirs.begin(); it !=mdirs.end(); ++it ) { TQDir dir(*it); @@ -152,7 +152,7 @@ void KLettres::findLanguages() TQString Prefs::defaultLanguage() { //see what is the user language for KDE - TQStringList defaultLanguages = KGlobal::locale()->languagesTwoAlpha(); + TQStringList defaultLanguages = TDEGlobal::locale()->languagesTwoAlpha(); if (!defaultLanguages.isEmpty()) { //scan to see if defaultLanguages[0] belongs to m_languages. If not, en is default. int i = Prefs::self()->m_languages.findIndex(defaultLanguages[0]); diff --git a/klettres/klettres/klettres.kcfg b/klettres/klettres/klettres.kcfg index b79d220f..59562169 100644 --- a/klettres/klettres/klettres.kcfg +++ b/klettres/klettres/klettres.kcfg @@ -43,7 +43,7 @@ <group name="mFont"> <entry name="Font" type="Font" key="mFont"> <label>Font</label> - <code>TQFont defaultFont = KGlobalSettings::largeFont(); + <code>TQFont defaultFont = TDEGlobalSettings::largeFont(); defaultFont.setPointSize(48); defaultFont.setBold(true); </code> |