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

---
 knode/aboutdata.cpp  | 4 ++--
 knode/aboutdata.h    | 2 +-
 knode/knglobals.h    | 4 ++--
 knode/knode_part.cpp | 2 +-
 knode/knode_part.h   | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'knode')

diff --git a/knode/aboutdata.cpp b/knode/aboutdata.cpp
index 5d3afd29..0ded58c9 100644
--- a/knode/aboutdata.cpp
+++ b/knode/aboutdata.cpp
@@ -42,11 +42,11 @@ namespace KNode
   };
 
   AboutData::AboutData()
-    : KAboutData( "knode",
+    : TDEAboutData( "knode",
                   I18N_NOOP("KNode"),
                   KNODE_VERSION,
                   I18N_NOOP("A newsreader for TDE"),
-                  KAboutData::License_GPL,
+                  TDEAboutData::License_GPL,
                   I18N_NOOP("Copyright (c) 1999-2005 the KNode authors"),
                   0,
                   "http://knode.sourceforge.net/" )
diff --git a/knode/aboutdata.h b/knode/aboutdata.h
index 05f8dc3f..b1796897 100644
--- a/knode/aboutdata.h
+++ b/knode/aboutdata.h
@@ -22,7 +22,7 @@
 
 namespace KNode
 {
-  class KDE_EXPORT AboutData : public KAboutData
+  class KDE_EXPORT AboutData : public TDEAboutData
   {
   public:
     AboutData();
diff --git a/knode/knglobals.h b/knode/knglobals.h
index 9db4f22e..568a9ef8 100644
--- a/knode/knglobals.h
+++ b/knode/knglobals.h
@@ -22,7 +22,7 @@
 
 #include <tdepimmacros.h>
 
-class KInstance;
+class TDEInstance;
 class KNConfigManager;
 class KNNetAccess;
 class KNProgress;
@@ -63,7 +63,7 @@ class KDE_EXPORT KNGlobals {
     KNArticleFactory      *artFactory;
     Kpgp::Module          *pgp;
     KConfig               *config();
-    KInstance             *instance;
+    TDEInstance             *instance;
 
     KNConfigManager       *configManager();
     KNNetAccess           *netAccess();
diff --git a/knode/knode_part.cpp b/knode/knode_part.cpp
index b20a5bb8..23bb3fba 100644
--- a/knode/knode_part.cpp
+++ b/knode/knode_part.cpp
@@ -94,7 +94,7 @@ KNodePart::~KNodePart()
   mainWidget->prepareShutdown();
 }
 
-KAboutData *KNodePart::createAboutData()
+TDEAboutData *KNodePart::createAboutData()
 {
   return new KNode::AboutData();
 }
diff --git a/knode/knode_part.h b/knode/knode_part.h
index 1f9d9b3b..badfbee5 100644
--- a/knode/knode_part.h
+++ b/knode/knode_part.h
@@ -33,8 +33,8 @@
 
 #include <tqwidget.h>
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 class ActionManager;
 class KNMainWidget;
@@ -50,7 +50,7 @@ class KNodePart: public KParts::ReadOnlyPart
 
     TQWidget* parentWidget() const;
 
-    static KAboutData *createAboutData();
+    static TDEAboutData *createAboutData();
 
   protected:
     virtual bool openFile();
-- 
cgit v1.2.3