diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:40:41 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:40:41 -0600 |
commit | 0b54abbdf80cef08e5cb8ef7b8b7af31c54dd9b4 (patch) | |
tree | 322767e10a0d28887f54f3cefe6399098713dc82 /kmouth/wordcompletion/klanguagebuttonhelper.cpp | |
parent | 11f5b1c38c194ef53638bafa0df70e821a7a6427 (diff) | |
download | tdeaccessibility-0b54abbdf80cef08e5cb8ef7b8b7af31c54dd9b4.tar.gz tdeaccessibility-0b54abbdf80cef08e5cb8ef7b8b7af31c54dd9b4.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmouth/wordcompletion/klanguagebuttonhelper.cpp')
-rw-r--r-- | kmouth/wordcompletion/klanguagebuttonhelper.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kmouth/wordcompletion/klanguagebuttonhelper.cpp b/kmouth/wordcompletion/klanguagebuttonhelper.cpp index ddc0c8f..0698b43 100644 --- a/kmouth/wordcompletion/klanguagebuttonhelper.cpp +++ b/kmouth/wordcompletion/klanguagebuttonhelper.cpp @@ -30,7 +30,7 @@ #include "klanguagebutton.h" TQString languageName (TQString languageCode) { - TQString filename = KGlobal::dirs()->findResource("locale", + TQString filename = TDEGlobal::dirs()->findResource("locale", languageCode + TQString::fromLatin1("/entry.desktop")); KSimpleConfig entry(filename); @@ -41,7 +41,7 @@ TQString languageName (TQString languageCode) { void loadLanguageList(KLanguageButton *combo) // This function was taken from tdebase/kcontrol/tdm/tdm-appear.cpp { - TQStringList langlist = KGlobal::dirs()->findAllResources("locale", + TQStringList langlist = TDEGlobal::dirs()->findAllResources("locale", TQString::fromLatin1("*/entry.desktop")); langlist.sort(); for ( TQStringList::ConstIterator it = langlist.begin(); @@ -57,8 +57,8 @@ void loadLanguageList(KLanguageButton *combo) combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString()); } - if (KGlobal::locale()) - combo->setCurrentItem (KGlobal::locale()->language()); + if (TDEGlobal::locale()) + combo->setCurrentItem (TDEGlobal::locale()->language()); else combo->setCurrentItem (KLocale::defaultLanguage()); } |