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

---
 konqueror/listview/konq_listview.cc | 6 +++---
 konqueror/listview/konq_listview.h  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'konqueror/listview')

diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc
index f256e8e3b..b3b886d8d 100644
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cc
@@ -72,10 +72,10 @@ KParts::Part* KonqListViewFactory::createPartObject( TQWidget *parentWidget, con
   return obj;
 }
 
-KInstance *KonqListViewFactory::instance()
+TDEInstance *KonqListViewFactory::instance()
 {
   if ( !s_instance )
-    s_instance = new KInstance( "konqlistview" );
+    s_instance = new TDEInstance( "konqlistview" );
   return s_instance;
 }
 
@@ -88,7 +88,7 @@ KonqPropsView *KonqListViewFactory::defaultViewProps()
   return s_defaultViewProps;
 }
 
-KInstance *KonqListViewFactory::s_instance = 0;
+TDEInstance *KonqListViewFactory::s_instance = 0;
 KonqPropsView *KonqListViewFactory::s_defaultViewProps = 0;
 
 K_EXPORT_COMPONENT_FACTORY( konq_listview, KonqListViewFactory )
diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h
index a6dc8450e..40f8b2269 100644
--- a/konqueror/listview/konq_listview.h
+++ b/konqueror/listview/konq_listview.h
@@ -46,11 +46,11 @@ public:
 
   virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args );
 
-  static KInstance *instance();
+  static TDEInstance *instance();
   static KonqPropsView *defaultViewProps();
 
 private:
-  static KInstance *s_instance;
+  static TDEInstance *s_instance;
   static KonqPropsView *s_defaultViewProps;
 };
 
-- 
cgit v1.2.1