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

---
 karm/karm_part.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'karm/karm_part.h')

diff --git a/karm/karm_part.h b/karm/karm_part.h
index 797ae47fb..f04d48ff5 100644
--- a/karm/karm_part.h
+++ b/karm/karm_part.h
@@ -116,8 +116,8 @@ protected slots:
     void startNewSession(); 
 };
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 class karmPartFactory : public KParts::Factory
 {
@@ -129,11 +129,11 @@ public:
     virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
                                             TQObject *parent, const char *name,
                                             const char *classname, const TQStringList &args );
-    static KInstance* instance();
+    static TDEInstance* instance();
  
 private:
-    static KInstance* s_instance;
-    static KAboutData* s_about;
+    static TDEInstance* s_instance;
+    static TDEAboutData* s_about;
 };
 
 #endif // _KARMPART_H_
-- 
cgit v1.2.1