From 3a41b8717f3769966a157f243f46bc58dea9bbd7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 08:18:52 -0600 Subject: Rename KLocale to enhance compatibility with KDE4 --- dcoprss/main.cpp | 2 +- knewsticker/knewstickerstub/knewstickerstub.cpp | 2 +- kopete/protocols/oscar/icq/icqprotocol.cpp | 4 ++-- ktalkd/ktalkdlg/ktalkdlg.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dcoprss/main.cpp b/dcoprss/main.cpp index 3dd84415..4d00133c 100644 --- a/dcoprss/main.cpp +++ b/dcoprss/main.cpp @@ -12,7 +12,7 @@ int main (int argc, char *argv[]) { - KLocale::setMainCatalogue("dcoprss"); + TDELocale::setMainCatalogue("dcoprss"); TDEAboutData aboutdata("rssservice", I18N_NOOP("TDE RSS Service"), "0.8", I18N_NOOP("A RSS data service."), TDEAboutData::License_GPL, "(C) 2003, Ian Reinhart Geiser"); diff --git a/knewsticker/knewstickerstub/knewstickerstub.cpp b/knewsticker/knewstickerstub/knewstickerstub.cpp index 30046809..ae9c97b8 100644 --- a/knewsticker/knewstickerstub/knewstickerstub.cpp +++ b/knewsticker/knewstickerstub/knewstickerstub.cpp @@ -34,7 +34,7 @@ static const KCmdLineOptions options[] = int main(int argc, char **argv) { - KLocale::setMainCatalogue("knewsticker"); + TDELocale::setMainCatalogue("knewsticker"); TDEAboutData aboutData(name, verbname, version, description, TDEAboutData::License_BSD, copyright); diff --git a/kopete/protocols/oscar/icq/icqprotocol.cpp b/kopete/protocols/oscar/icq/icqprotocol.cpp index a7e3f001..26284a35 100644 --- a/kopete/protocols/oscar/icq/icqprotocol.cpp +++ b/kopete/protocols/oscar/icq/icqprotocol.cpp @@ -219,7 +219,7 @@ void ICQProtocol::initGenders() void ICQProtocol::initCountries() { mCountries.insert(0, ""); // unspecified - KLocale *kl = TDEGlobal::locale(); //KLocale(TQString::fromLatin1("kopete")); + TDELocale *kl = TDEGlobal::locale(); //TDELocale(TQString::fromLatin1("kopete")); mCountries.insert(93, kl->twoAlphaToCountryName("af")); mCountries.insert(355, kl->twoAlphaToCountryName("al")); @@ -468,7 +468,7 @@ void ICQProtocol::initCountries() void ICQProtocol::initLang() { - KLocale *kl = TDEGlobal::locale(); //KLocale(TQString::fromLatin1("kopete")); + TDELocale *kl = TDEGlobal::locale(); //TDELocale(TQString::fromLatin1("kopete")); mLanguages.insert(0 , ""); mLanguages.insert(1 , kl->twoAlphaToLanguageName("ar") /*i18n("Arabic")*/); diff --git a/ktalkd/ktalkdlg/ktalkdlg.cpp b/ktalkd/ktalkdlg/ktalkdlg.cpp index b3a1b28e..942c53dd 100644 --- a/ktalkd/ktalkdlg/ktalkdlg.cpp +++ b/ktalkd/ktalkdlg/ktalkdlg.cpp @@ -76,7 +76,7 @@ int main (int argc, char **argv) { TDECmdLineArgs::init(argc, argv, "ktalkdlg", description, version ); TDECmdLineArgs::addCmdLineOptions( option ); - KLocale::setMainCatalogue( "kcmktalkd" ); + TDELocale::setMainCatalogue( "kcmktalkd" ); TDEApplication a; struct timeval clock; -- cgit v1.2.3