From 1d061b286a8b183b39be60fe531f2b1c2915f03a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:15:55 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- konqueror/iconview/konq_iconview.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'konqueror/iconview') diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc index afe91c6ff..b3cc59d85 100644 --- a/konqueror/iconview/konq_iconview.cc +++ b/konqueror/iconview/konq_iconview.cc @@ -82,10 +82,10 @@ public: return obj; } - static KInstance *instance() + static TDEInstance *instance() { if ( !s_instance ) - s_instance = new KInstance( "konqiconview" ); + s_instance = new TDEInstance( "konqiconview" ); return s_instance; } @@ -98,11 +98,11 @@ public: } private: - static KInstance *s_instance; + static TDEInstance *s_instance; static KonqPropsView *s_defaultViewProps; }; -KInstance *KonqIconViewFactory::s_instance = 0; +TDEInstance *KonqIconViewFactory::s_instance = 0; KonqPropsView *KonqIconViewFactory::s_defaultViewProps = 0; -- cgit v1.2.1