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/kofficepart/kopart_aboutdata.h | 2 +-
 languages/cpp/app_templates/kofficepart/kopart_factory.cpp | 4 ++--
 languages/cpp/app_templates/kofficepart/kopart_view.cpp    | 2 +-
 languages/cpp/app_templates/kofficepart/main.cpp           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h b/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h
index 8a141a5e..b1ac0f5a 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h
+++ b/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h
@@ -7,7 +7,7 @@
 #define %{APPNAME}_ABOUTDATA
 
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] = I18N_NOOP("%{APPNAME} KOffice Program");
 static const char version[]     = "%{VERSION}";
diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
index f0173476..db665500 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
+++ b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
@@ -7,9 +7,9 @@
 #include <%{APPNAMELC}_aboutdata.h>
 #include <kinstance.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 extern "C"
 {
diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp
index 50633e04..6e2c943c 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp
+++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp
@@ -10,7 +10,7 @@
 #include <tqiconset.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 %{APPNAME}View::%{APPNAME}View( %{APPNAME}Part* part, TQWidget* parent, const char* name )
diff --git a/languages/cpp/app_templates/kofficepart/main.cpp b/languages/cpp/app_templates/kofficepart/main.cpp
index 98369dde..52bd02ff 100644
--- a/languages/cpp/app_templates/kofficepart/main.cpp
+++ b/languages/cpp/app_templates/kofficepart/main.cpp
@@ -7,7 +7,7 @@
 #include <koDocument.h>
 #include <koMainWindow.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include "%{APPNAMELC}_aboutdata.h"
 
-- 
cgit v1.2.1