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 /kttsd/libkttsd/talkercode.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 'kttsd/libkttsd/talkercode.cpp')
-rw-r--r-- | kttsd/libkttsd/talkercode.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kttsd/libkttsd/talkercode.cpp b/kttsd/libkttsd/talkercode.cpp index c0d26ed..25b674e 100644 --- a/kttsd/libkttsd/talkercode.cpp +++ b/kttsd/libkttsd/talkercode.cpp @@ -182,7 +182,7 @@ void TalkerCode::normalize() TQString language = lang; if (language.left(1) == "*") language = language.mid(1); TQString charSet; - KGlobal::locale()->splitLocale(language, languageCode, countryCode, charSet); + TDEGlobal::locale()->splitLocale(language, languageCode, countryCode, charSet); } /** @@ -218,11 +218,11 @@ void TalkerCode::normalize() else { splitFullLanguageCode(languageCode, twoAlpha, countryCode); - language = KGlobal::locale()->twoAlphaToLanguageName(twoAlpha); + language = TDEGlobal::locale()->twoAlphaToLanguageName(twoAlpha); } if (!countryCode.isEmpty()) { - TQString countryName = KGlobal::locale()->twoAlphaToCountryName(countryCode); + TQString countryName = TDEGlobal::locale()->twoAlphaToCountryName(countryCode); // Some abbreviations to save screen space. if (countryName == i18n("full country name", "United States of America")) countryName = i18n("abbreviated country name", "USA"); |