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

---
 konsole/konsole/konsole_part.cpp | 10 +++++-----
 konsole/konsole/konsole_part.h   |  8 ++++----
 konsole/konsole/main.cpp         |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'konsole')

diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index 1054ce826..b6fa5eedf 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -57,8 +57,8 @@ K_EXPORT_COMPONENT_FACTORY( libkonsolepart, konsoleFactory )
 /**
  * We need one static instance of the factory for our C 'main' function
  */
-KInstance *konsoleFactory::s_instance = 0L;
-KAboutData *konsoleFactory::s_aboutData = 0;
+TDEInstance *konsoleFactory::s_instance = 0L;
+TDEAboutData *konsoleFactory::s_aboutData = 0;
 
 konsoleFactory::konsoleFactory()
 {
@@ -85,12 +85,12 @@ KParts::Part *konsoleFactory::createPartObject(TQWidget *parentWidget, const cha
   return obj;
 }
 
-KInstance *konsoleFactory::instance()
+TDEInstance *konsoleFactory::instance()
 {
   if ( !s_instance )
     {
-      s_aboutData = new KAboutData("konsole", I18N_NOOP("Konsole"), "1.5");
-      s_instance = new KInstance( s_aboutData );
+      s_aboutData = new TDEAboutData("konsole", I18N_NOOP("Konsole"), "1.5");
+      s_instance = new TDEInstance( s_aboutData );
     }
   return s_instance;
 }
diff --git a/konsole/konsole/konsole_part.h b/konsole/konsole/konsole_part.h
index 1f65106ad..ae97f553b 100644
--- a/konsole/konsole/konsole_part.h
+++ b/konsole/konsole/konsole_part.h
@@ -32,7 +32,7 @@
 #include "schema.h"
 #include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -57,11 +57,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp
index f8859da75..840ac6ac1 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -162,8 +162,8 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
   bool scrollbaron = true;
   bool showtip = true;
 
-  KAboutData aboutData( "konsole", I18N_NOOP("Konsole"),
-    KONSOLE_VERSION, description, KAboutData::License_GPL_V2,
+  TDEAboutData aboutData( "konsole", I18N_NOOP("Konsole"),
+    KONSOLE_VERSION, description, TDEAboutData::License_GPL_V2,
     "Copyright (c) 1997-2006, Lars Doelle");
   aboutData.addAuthor("Robert Knight",I18N_NOOP("Maintainer"), "robertknight@gmail.com");
   aboutData.addAuthor("Lars Doelle",I18N_NOOP("Author"), "lars.doelle@on-line.de");
-- 
cgit v1.2.1