From bd3c603465110b74a0ddcee72e6f020a78d44e59 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 22:00:22 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 languages/cpp/app_templates/kxt/app.cpp     | 6 +++---
 languages/cpp/app_templates/kxt/appview.cpp | 2 +-
 languages/cpp/app_templates/kxt/main.cpp    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'languages/cpp/app_templates/kxt')

diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp
index 85df8854..ecdd5127 100644
--- a/languages/cpp/app_templates/kxt/app.cpp
+++ b/languages/cpp/app_templates/kxt/app.cpp
@@ -10,11 +10,11 @@
 #include <tqpaintdevicemetrics.h>
 
 #include <tdeconfigdialog.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>
 
diff --git a/languages/cpp/app_templates/kxt/appview.cpp b/languages/cpp/app_templates/kxt/appview.cpp
index 30d627fe..dd770ad0 100644
--- a/languages/cpp/app_templates/kxt/appview.cpp
+++ b/languages/cpp/app_templates/kxt/appview.cpp
@@ -3,7 +3,7 @@
 #include "%{APPNAMELC}view.h"
 #include "settings.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 
 %{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent)
diff --git a/languages/cpp/app_templates/kxt/main.cpp b/languages/cpp/app_templates/kxt/main.cpp
index 928ddc33..4fc87301 100644
--- a/languages/cpp/app_templates/kxt/main.cpp
+++ b/languages/cpp/app_templates/kxt/main.cpp
@@ -4,7 +4,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("A TDE Application");
-- 
cgit v1.2.3