From 054f5901ab09f6ea6235bd12fbd167922fdf0f67 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 08:21:03 -0600 Subject: Rename KLocale to enhance compatibility with KDE4 --- doc/kdearch/index.docbook | 2 +- languages/cpp/app_templates/dcopservice/main.cpp | 2 +- languages/cpp/app_templates/kde4app/kapp4.cpp | 2 +- languages/cpp/app_templates/kde4app/main.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook index 685a5ef8..e0c7a832 100644 --- a/doc/kdearch/index.docbook +++ b/doc/kdearch/index.docbook @@ -3119,7 +3119,7 @@ extern "C" { int kdemain(int argc, char **argv); } int kdemain(int argc, char **argv) { - KLocale::setMainCatalogue("tdelibs"); + TDELocale::setMainCatalogue("tdelibs"); TDEInstance instance("tdeio_ftp"); (void) TDEGlobal::locale(); diff --git a/languages/cpp/app_templates/dcopservice/main.cpp b/languages/cpp/app_templates/dcopservice/main.cpp index 90ce4623..e1c41044 100644 --- a/languages/cpp/app_templates/dcopservice/main.cpp +++ b/languages/cpp/app_templates/dcopservice/main.cpp @@ -20,7 +20,7 @@ static KCmdLineOptions options[] = int main (int argc, char *argv[]) { - KLocale::setMainCatalogue("tdelibs"); + TDELocale::setMainCatalogue("tdelibs"); TDEAboutData aboutdata("%{APPNAMELC}", I18N_NOOP("TDE"), version, description, TDEAboutData::License_GPL, "(C) %{YEAR}, %{AUTHOR}"); diff --git a/languages/cpp/app_templates/kde4app/kapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp index ec0d9dda..b6a93a2b 100644 --- a/languages/cpp/app_templates/kde4app/kapp4.cpp +++ b/languages/cpp/app_templates/kde4app/kapp4.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include %{APPNAME}::%{APPNAME}() : KXmlGuiWindow(), diff --git a/languages/cpp/app_templates/kde4app/main.cpp b/languages/cpp/app_templates/kde4app/main.cpp index a77d5e14..4c37bd4b 100644 --- a/languages/cpp/app_templates/kde4app/main.cpp +++ b/languages/cpp/app_templates/kde4app/main.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include static const char description[] = I18N_NOOP("A KDE 4 Application"); -- cgit v1.2.3