summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 08:21:03 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 08:21:03 -0600
commit054f5901ab09f6ea6235bd12fbd167922fdf0f67 (patch)
tree5c5177823f0addeba5d6fe88cd568ee3295ed431
parent82fc754f7c4e43eace608a45c22e74e532bd33f1 (diff)
downloadtdevelop-054f5901.tar.gz
tdevelop-054f5901.zip
Rename KLocale to enhance compatibility with KDE4
-rw-r--r--doc/kdearch/index.docbook2
-rw-r--r--languages/cpp/app_templates/dcopservice/main.cpp2
-rw-r--r--languages/cpp/app_templates/kde4app/kapp4.cpp2
-rw-r--r--languages/cpp/app_templates/kde4app/main.cpp2
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 <kactioncollection.h>
#include <kstandardaction.h>
-#include <KDE/KLocale>
+#include <KDE/TDELocale>
%{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 <kapplication.h>
#include <kaboutdata.h>
#include <kcmdlineargs.h>
-#include <KDE/KLocale>
+#include <KDE/TDELocale>
static const char description[] =
I18N_NOOP("A KDE 4 Application");