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/sidebar/sidebar_widget.cpp | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/sidebar/sidebar_widget.cpp')
| -rw-r--r-- | konqueror/sidebar/sidebar_widget.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index dfdf90780..aba5e3a26 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -903,8 +903,8 @@ KonqSidebarPlugin *Sidebar_Widget::loadModule(TQWidget *par,TQString &desktopNam { // create the module - KonqSidebarPlugin* (*func)(KInstance*,TQObject *, TQWidget*, TQString&, const char *); - func = (KonqSidebarPlugin* (*)(KInstance*,TQObject *, TQWidget *, TQString&, const char *)) create; + KonqSidebarPlugin* (*func)(TDEInstance*,TQObject *, TQWidget*, TQString&, const char *); + func = (KonqSidebarPlugin* (*)(TDEInstance*,TQObject *, TQWidget *, TQString&, const char *)) create; TQString fullPath(m_path+desktopName); return (KonqSidebarPlugin*)func(getInstance(),bi,par,fullPath,0); } @@ -1084,7 +1084,7 @@ void Sidebar_Widget::dockWidgetHasUndocked(KDockWidget* wid) } } -KInstance *Sidebar_Widget::getInstance() +TDEInstance *Sidebar_Widget::getInstance() { return ((KonqSidebar*)m_partParent)->getInstance(); } |