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.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'konqueror/listview/konq_listview.h')

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