summaryrefslogtreecommitdiffstats
path: root/languages/cpp/app_templates/kmake
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:22 -0600
commitbd3c603465110b74a0ddcee72e6f020a78d44e59 (patch)
treef556266a927227ba3f30e337c4ccf06facc55ea3 /languages/cpp/app_templates/kmake
parentef5399ae5a952065c7a0679d4a875d154c972945 (diff)
downloadtdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.tar.gz
tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'languages/cpp/app_templates/kmake')
-rw-r--r--languages/cpp/app_templates/kmake/app.cpp2
-rw-r--r--languages/cpp/app_templates/kmake/mainviewimp.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/languages/cpp/app_templates/kmake/app.cpp b/languages/cpp/app_templates/kmake/app.cpp
index 5c0d534f..f62a1c23 100644
--- a/languages/cpp/app_templates/kmake/app.cpp
+++ b/languages/cpp/app_templates/kmake/app.cpp
@@ -2,7 +2,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "mainviewimp.h"
static const char description[] = I18N_NOOP("A TDE Application");
diff --git a/languages/cpp/app_templates/kmake/mainviewimp.cpp b/languages/cpp/app_templates/kmake/mainviewimp.cpp
index 8a0de706..02a4682f 100644
--- a/languages/cpp/app_templates/kmake/mainviewimp.cpp
+++ b/languages/cpp/app_templates/kmake/mainviewimp.cpp
@@ -1,7 +1,7 @@
#include "mainviewimp.h"
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
MainViewImp::MainViewImp(TQWidget* parent, const char* name, WFlags fl)
: MainView(parent,name,fl)