diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /konqueror/iconview | |
parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/iconview')
-rw-r--r-- | konqueror/iconview/konq_iconview.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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; |