diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:22 -0600 |
| commit | bd3c603465110b74a0ddcee72e6f020a78d44e59 (patch) | |
| tree | f556266a927227ba3f30e337c4ccf06facc55ea3 /languages/cpp/app_templates/kapp | |
| parent | ef5399ae5a952065c7a0679d4a875d154c972945 (diff) | |
| download | tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.tar.gz tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'languages/cpp/app_templates/kapp')
| -rw-r--r-- | languages/cpp/app_templates/kapp/app.cpp | 4 | ||||
| -rw-r--r-- | languages/cpp/app_templates/kapp/appview.cpp | 4 | ||||
| -rw-r--r-- | languages/cpp/app_templates/kapp/main.cpp | 2 | ||||
| -rw-r--r-- | languages/cpp/app_templates/kapp/pref.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp index 9daebf13..774efe8e 100644 --- a/languages/cpp/app_templates/kapp/app.cpp +++ b/languages/cpp/app_templates/kapp/app.cpp @@ -8,8 +8,8 @@ #include <tqpainter.h> #include <tqpaintdevicemetrics.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeversion.h> #include <kstatusbar.h> diff --git a/languages/cpp/app_templates/kapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp index c700800b..16c05a3f 100644 --- a/languages/cpp/app_templates/kapp/appview.cpp +++ b/languages/cpp/app_templates/kapp/appview.cpp @@ -9,9 +9,9 @@ #include <ktrader.h> #include <klibloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <krun.h> -#include <klocale.h> +#include <tdelocale.h> %{APPNAME}View::%{APPNAME}View(TQWidget *parent) : TQWidget(parent), diff --git a/languages/cpp/app_templates/kapp/main.cpp b/languages/cpp/app_templates/kapp/main.cpp index 294a7490..8c2cc07f 100644 --- a/languages/cpp/app_templates/kapp/main.cpp +++ b/languages/cpp/app_templates/kapp/main.cpp @@ -5,7 +5,7 @@ #include <dcopclient.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static const char description[] = I18N_NOOP("A TDE Application"); diff --git a/languages/cpp/app_templates/kapp/pref.cpp b/languages/cpp/app_templates/kapp/pref.cpp index ff83190f..669f591c 100644 --- a/languages/cpp/app_templates/kapp/pref.cpp +++ b/languages/cpp/app_templates/kapp/pref.cpp @@ -2,7 +2,7 @@ #include "pref.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> |