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

---
 kivio/plugins/kiviosmlconnector/plugin.cpp | 6 +++---
 kivio/plugins/kiviosmlconnector/plugin.h   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kivio/plugins/kiviosmlconnector')

diff --git a/kivio/plugins/kiviosmlconnector/plugin.cpp b/kivio/plugins/kiviosmlconnector/plugin.cpp
index 5c4b74f7..3f01b263 100644
--- a/kivio/plugins/kiviosmlconnector/plugin.cpp
+++ b/kivio/plugins/kiviosmlconnector/plugin.cpp
@@ -29,12 +29,12 @@
  ***************************************************/
 K_EXPORT_COMPONENT_FACTORY( libkiviosmlconnector, SMLConnectorFactory )
 
-KInstance* SMLConnectorFactory::s_global = 0;
+TDEInstance* SMLConnectorFactory::s_global = 0;
 
 SMLConnectorFactory::SMLConnectorFactory( TQObject* parent, const char* name )
 : KLibFactory( parent, name )
 {
-  s_global = new KInstance("kivio");
+  s_global = new TDEInstance("kivio");
 }
 
 SMLConnectorFactory::~SMLConnectorFactory()
@@ -51,7 +51,7 @@ TQObject* SMLConnectorFactory::createObject( TQObject* parent, const char*, cons
   return obj;
 }
 
-KInstance* SMLConnectorFactory::global()
+TDEInstance* SMLConnectorFactory::global()
 {
   return s_global;
 }
diff --git a/kivio/plugins/kiviosmlconnector/plugin.h b/kivio/plugins/kiviosmlconnector/plugin.h
index 2b3e8028..54c81ebc 100644
--- a/kivio/plugins/kiviosmlconnector/plugin.h
+++ b/kivio/plugins/kiviosmlconnector/plugin.h
@@ -24,7 +24,7 @@
 
 #include <klibloader.h>
 
-class KInstance;
+class TDEInstance;
 
 class SMLConnectorFactory : public KLibFactory
 { Q_OBJECT
@@ -36,10 +36,10 @@ public:
   virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
                            const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
-  static KInstance* global();
+  static TDEInstance* global();
 
 private:
-  static KInstance* s_global;
+  static TDEInstance* s_global;
 };
 
 #endif
-- 
cgit v1.2.1