From 3a044decb0a5d7be822c888b2d5374573d7df96e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:23:50 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 languages/cpp/app_templates/kscons_kmdi/app_part.cpp | 4 ++--
 languages/cpp/app_templates/kscons_kmdi/app_part.h   | 4 ++--
 languages/cpp/app_templates/kscons_kmdi/main.cpp     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
index 06a6409c..70f13d98 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
@@ -49,11 +49,11 @@ K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory );
 {
 }
 
-KAboutData *%{APPNAMELC}Part::createAboutData()
+TDEAboutData *%{APPNAMELC}Part::createAboutData()
 {
         // The non-i18n name here must be the same as the directory in
         // which the part's rc file is installed
-        KAboutData *aboutData = new KAboutData("%{APPNAMELC}part", I18N_NOOP("%{APPNAMELC}Part"), "0.0.1");
+        TDEAboutData *aboutData = new TDEAboutData("%{APPNAMELC}part", I18N_NOOP("%{APPNAMELC}Part"), "0.0.1");
         aboutData->addAuthor("%{AUTHOR}", 0, "%{EMAIL}");
         return aboutData;
 }
diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.h b/languages/cpp/app_templates/kscons_kmdi/app_part.h
index 1c9e4d14..42d1b22c 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app_part.h
+++ b/languages/cpp/app_templates/kscons_kmdi/app_part.h
@@ -10,7 +10,7 @@ class TQMultiLineEdit;
 class TQWidget;
 class TQPainter;
 class KURL;
-class KAboutData;
+class TDEAboutData;
 
 /**
  * This is a "Part".  It that does all the real work in a KPart
@@ -51,7 +51,7 @@ public:
     /**
      * About data for the part
      */
-    static KAboutData *createAboutData();
+    static TDEAboutData *createAboutData();
 	    
 protected:
     /**
diff --git a/languages/cpp/app_templates/kscons_kmdi/main.cpp b/languages/cpp/app_templates/kscons_kmdi/main.cpp
index 5795feb9..dca1e7a6 100644
--- a/languages/cpp/app_templates/kscons_kmdi/main.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/main.cpp
@@ -21,8 +21,8 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-	KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
-			KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}" );
+	TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
+			TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}" );
 	about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
 
 	// warning, utf-8 char
-- 
cgit v1.2.1