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

---
 libk3b/plugin/k3bpluginfactory.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'libk3b/plugin/k3bpluginfactory.h')

diff --git a/libk3b/plugin/k3bpluginfactory.h b/libk3b/plugin/k3bpluginfactory.h
index 7892dfa..6e4da16 100644
--- a/libk3b/plugin/k3bpluginfactory.h
+++ b/libk3b/plugin/k3bpluginfactory.h
@@ -49,7 +49,7 @@ class K3bPluginFactory : public KLibFactory
     s_self = 0;
   }
 
-  static KInstance* instance();
+  static TDEInstance* instance();
 
  protected:
   virtual void setupTranslations( void ) {
@@ -74,13 +74,13 @@ class K3bPluginFactory : public KLibFactory
   TQCString m_instanceName;
   bool m_catalogueInitialized;
 
-  static KInstance* s_instance;
+  static TDEInstance* s_instance;
   static K3bPluginFactory<T> *s_self;
 };
 
 
 template <class T>
-KInstance* K3bPluginFactory<T>::s_instance = 0;
+TDEInstance* K3bPluginFactory<T>::s_instance = 0;
 
 
 template <class T>
@@ -88,10 +88,10 @@ K3bPluginFactory<T>* K3bPluginFactory<T>::s_self = 0;
 
 
 template <class T>
-KInstance* K3bPluginFactory<T>::instance()
+TDEInstance* K3bPluginFactory<T>::instance()
 {
   if( !s_instance && s_self )
-    s_instance = new KInstance( s_self->m_instanceName );
+    s_instance = new TDEInstance( s_self->m_instanceName );
   return s_instance;
 }
 
-- 
cgit v1.2.3