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/kpartapp | |
| 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/kpartapp')
| -rw-r--r-- | languages/cpp/app_templates/kpartapp/app.cpp | 4 | ||||
| -rw-r--r-- | languages/cpp/app_templates/kpartapp/app_part.cpp | 6 | ||||
| -rw-r--r-- | languages/cpp/app_templates/kpartapp/main.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp index 7c5154a6..759cbf5a 100644 --- a/languages/cpp/app_templates/kpartapp/app.cpp +++ b/languages/cpp/app_templates/kpartapp/app.cpp @@ -12,9 +12,9 @@ #include <kstdaction.h> #include <klibloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstatusbar.h> -#include <klocale.h> +#include <tdelocale.h> %{APPNAME}::%{APPNAME}() : KParts::MainWindow( 0L, "%{APPNAME}" ) diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index 937a7702..adf210b3 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -5,8 +5,8 @@ #include <tdeaction.h> #include <kstdaction.h> #include <tdefiledialog.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqfile.h> #include <tqtextstream.h> @@ -146,7 +146,7 @@ void %{APPNAME}Part::fileSaveAs() // It's usually safe to leave the factory code alone.. with the // notable exception of the TDEAboutData data #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> TDEInstance* %{APPNAME}PartFactory::s_instance = 0L; TDEAboutData* %{APPNAME}PartFactory::s_about = 0L; diff --git a/languages/cpp/app_templates/kpartapp/main.cpp b/languages/cpp/app_templates/kpartapp/main.cpp index 755813f0..83266630 100644 --- a/languages/cpp/app_templates/kpartapp/main.cpp +++ b/languages/cpp/app_templates/kpartapp/main.cpp @@ -3,7 +3,7 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static const char description[] = I18N_NOOP("A TDE KPart Application"); |