From 59d153016be1e09cb31cdb18bef0a649acfc6292 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 08:17:52 -0600 Subject: Rename KLocale to enhance compatibility with KDE4 --- kded/kded.cpp | 2 +- kded/khostname.cpp | 2 +- kded/tde-menu.cpp | 4 ++-- kded/tdebuildsycoca.cpp | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'kded') diff --git a/kded/kded.cpp b/kded/kded.cpp index b769fa508..704dd9fbf 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -885,7 +885,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) TDECmdLineArgs::addCmdLineOptions( options ); // this program is in tdelibs so it uses tdelibs as catalog - KLocale::setMainCatalogue("tdelibs"); + TDELocale::setMainCatalogue("tdelibs"); // WABA: Make sure not to enable session management. putenv(strdup("SESSION_MANAGER=")); diff --git a/kded/khostname.cpp b/kded/khostname.cpp index 7e080378b..7bdc12858 100644 --- a/kded/khostname.cpp +++ b/kded/khostname.cpp @@ -365,7 +365,7 @@ void KHostName::changeSessionManager() int main(int argc, char **argv) { - KLocale::setMainCatalogue("tdelibs"); + TDELocale::setMainCatalogue("tdelibs"); TDEAboutData d(appName, I18N_NOOP("KDontChangeTheHostName"), appVersion, I18N_NOOP("Informs TDE about a change in hostname"), TDEAboutData::License_GPL, "(c) 2001 Waldo Bastian"); diff --git a/kded/tde-menu.cpp b/kded/tde-menu.cpp index 6a8721915..e1f79f77c 100644 --- a/kded/tde-menu.cpp +++ b/kded/tde-menu.cpp @@ -107,7 +107,7 @@ static void findMenuEntry(KServiceGroup::Ptr parent, const TQString &name, const int main(int argc, char **argv) { - KLocale::setMainCatalogue("tdelibs"); + TDELocale::setMainCatalogue("tdelibs"); const char *description = I18N_NOOP("TDE Menu query tool.\n" "This tool can be used to find in which menu a specific application is shown.\n" "The --highlight option can be used to visually indicate to the user where\n" @@ -126,7 +126,7 @@ int main(int argc, char **argv) k.disableSessionManagement(); // this program is in tdelibs so it uses tdelibs as catalog - KLocale::setMainCatalogue("tdelibs"); + TDELocale::setMainCatalogue("tdelibs"); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->count() != 1) diff --git a/kded/tdebuildsycoca.cpp b/kded/tdebuildsycoca.cpp index 47b7a9bf4..f9b0238c7 100644 --- a/kded/tdebuildsycoca.cpp +++ b/kded/tdebuildsycoca.cpp @@ -717,7 +717,7 @@ public: extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { - KLocale::setMainCatalogue("tdelibs"); + TDELocale::setMainCatalogue("tdelibs"); TDEAboutData d(appName, I18N_NOOP("KBuildSycoca"), appVersion, I18N_NOOP("Rebuilds the system configuration cache."), TDEAboutData::License_GPL, "(c) 1999-2002 KDE Developers"); @@ -764,8 +764,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) KCrash::setApplicationName(TQString(appName)); // this program is in tdelibs so it uses tdelibs as catalog - KLocale::setMainCatalogue("tdelibs"); - // force generating of KLocale object. if not, the database will get + TDELocale::setMainCatalogue("tdelibs"); + // force generating of TDELocale object. if not, the database will get // be translated TDEGlobal::locale(); TDEGlobal::dirs()->addResourceType("app-reg", "share/application-registry" ); -- cgit v1.2.1