summaryrefslogtreecommitdiffstats
path: root/languages/cpp/app_templates/kscons_tdemdi
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/kscons_tdemdi
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/kscons_tdemdi')
-rw-r--r--languages/cpp/app_templates/kscons_tdemdi/app_part.cpp4
-rw-r--r--languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp10
-rw-r--r--languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp4
-rw-r--r--languages/cpp/app_templates/kscons_tdemdi/main.cpp2
-rw-r--r--languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp2
5 files changed, 11 insertions, 11 deletions
diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
index 73e1492d..cde31592 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
@@ -7,8 +7,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>
diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
index 20f5f3fb..c63cb223 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
@@ -8,7 +8,7 @@
#include <tqtoolbutton.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <ktip.h>
#include <tdeparts/part.h>
#include <tdeparts/partmanager.h>
@@ -23,14 +23,14 @@
#include <tdeaboutdata.h>
#include <tdefiledialog.h>
#include <tdeactionclasses.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdeversion.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kstatusbar.h>
#include <kkeydialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <ktabwidget.h>
#include <kedittoolbar.h>
#include <tdeversion.h>
diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp
index a9b9845e..1feb1b8b 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp
@@ -4,11 +4,11 @@
#include <tqlayout.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdemdichildview.h>
#include <kdebug.h>
#include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "%{APPNAMELC}tdemdiView.h"
diff --git a/languages/cpp/app_templates/kscons_tdemdi/main.cpp b/languages/cpp/app_templates/kscons_tdemdi/main.cpp
index 253f45dc..32a00043 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/main.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/main.cpp
@@ -4,7 +4,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "%{APPNAMELC}tdemdi.h"
diff --git a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp
index 0eab6525..229c28a8 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp
@@ -6,7 +6,7 @@
#include <tdeparts/part.h>
#include <kate/document.h>
#include <kate/view.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klibloader.h>
#include <kurl.h>