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/listview/konq_listview.cc | |
parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/listview/konq_listview.cc')
-rw-r--r-- | konqueror/listview/konq_listview.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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 ) |