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

---
 filters/karbon/xfig/xfigimport_factory.cc | 6 +++---
 filters/karbon/xfig/xfigimport_factory.h  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'filters/karbon/xfig')

diff --git a/filters/karbon/xfig/xfigimport_factory.cc b/filters/karbon/xfig/xfigimport_factory.cc
index d734b1761..1e2311997 100644
--- a/filters/karbon/xfig/xfigimport_factory.cc
+++ b/filters/karbon/xfig/xfigimport_factory.cc
@@ -30,14 +30,14 @@ DESCRIPTION
 
 K_EXPORT_COMPONENT_FACTORY( libxfigimport, XFIGImportFactory )
 
-KInstance *XFIGImportFactory::s_global = 0;
+TDEInstance *XFIGImportFactory::s_global = 0;
 
 XFIGImportFactory::XFIGImportFactory(
     TQObject *parent,
     const char *name) :
         KLibFactory(parent, name)
 {
-    s_global = new KInstance("xfigimport");
+    s_global = new TDEInstance("xfigimport");
 }
 
 XFIGImportFactory::~XFIGImportFactory()
@@ -61,7 +61,7 @@ TQObject *XFIGImportFactory::createObject(
     return f;
 }
 
-KInstance *XFIGImportFactory::global()
+TDEInstance *XFIGImportFactory::global()
 {
     return s_global;
 }
diff --git a/filters/karbon/xfig/xfigimport_factory.h b/filters/karbon/xfig/xfigimport_factory.h
index b8d4d666e..9760a92f2 100644
--- a/filters/karbon/xfig/xfigimport_factory.h
+++ b/filters/karbon/xfig/xfigimport_factory.h
@@ -26,7 +26,7 @@ DESCRIPTION
 
 #include <klibloader.h>
 
-class KInstance;
+class TDEInstance;
 
 class XFIGImportFactory :
     public KLibFactory
@@ -39,9 +39,9 @@ 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.3