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/about/konq_aboutpage.cc | 4 ++-- konqueror/about/konq_aboutpage.h | 6 +++--- konqueror/client/kfmclient.cc | 4 ++-- konqueror/iconview/konq_iconview.cc | 8 ++++---- konqueror/keditbookmarks/kbookmarkmerger.cpp | 4 ++-- konqueror/keditbookmarks/main.cpp | 4 ++-- konqueror/konq_extensionmanager.cc | 2 +- konqueror/konq_factory.cc | 8 ++++---- konqueror/konq_factory.h | 6 +++--- konqueror/konq_guiclients.cc | 2 +- konqueror/konq_viewmgr.h | 2 +- konqueror/kttsplugin/khtmlkttsd.h | 2 +- konqueror/listview/konq_listview.cc | 6 +++--- konqueror/listview/konq_listview.h | 4 ++-- konqueror/sidebar/konqsidebar.cpp | 14 +++++++------- konqueror/sidebar/konqsidebar.h | 12 ++++++------ konqueror/sidebar/konqsidebarplugin.cpp | 4 ++-- konqueror/sidebar/konqsidebarplugin.h | 6 +++--- konqueror/sidebar/sidebar_widget.cpp | 6 +++--- konqueror/sidebar/sidebar_widget.h | 2 +- konqueror/sidebar/test/konqsidebartest.cpp | 2 +- konqueror/sidebar/test/konqsidebartest.h | 2 +- konqueror/sidebar/trees/konqsidebar_tree.cpp | 4 ++-- konqueror/sidebar/trees/konqsidebar_tree.h | 2 +- konqueror/sidebar/web_module/web_module.cpp | 4 ++-- konqueror/sidebar/web_module/web_module.h | 2 +- 26 files changed, 61 insertions(+), 61 deletions(-) (limited to 'konqueror') diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index d9e62d28a..6b573d438 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -21,7 +21,7 @@ K_EXPORT_COMPONENT_FACTORY( konq_aboutpage, KonqAboutPageFactory ) -KInstance *KonqAboutPageFactory::s_instance = 0; +TDEInstance *KonqAboutPageFactory::s_instance = 0; TQString *KonqAboutPageFactory::s_launch_html = 0; TQString *KonqAboutPageFactory::s_intro_html = 0; TQString *KonqAboutPageFactory::s_specs_html = 0; @@ -31,7 +31,7 @@ TQString *KonqAboutPageFactory::s_plugins_html = 0; KonqAboutPageFactory::KonqAboutPageFactory( TQObject *parent, const char *name ) : KParts::Factory( parent, name ) { - s_instance = new KInstance( "konqaboutpage" ); + s_instance = new TDEInstance( "konqaboutpage" ); } KonqAboutPageFactory::~KonqAboutPageFactory() diff --git a/konqueror/about/konq_aboutpage.h b/konqueror/about/konq_aboutpage.h index c72a85250..96229c42c 100644 --- a/konqueror/about/konq_aboutpage.h +++ b/konqueror/about/konq_aboutpage.h @@ -5,7 +5,7 @@ #include class KHTMLPart; -class KInstance; +class TDEInstance; class KonqAboutPageFactory : public KParts::Factory { @@ -17,7 +17,7 @@ public: TQObject *parent, const char *name, const char *classname, const TQStringList &args ); - static KInstance *instance() { return s_instance; } + static TDEInstance *instance() { return s_instance; } static TQString launch(); static TQString intro(); @@ -28,7 +28,7 @@ public: private: static TQString loadFile( const TQString& file ); - static KInstance *s_instance; + static TDEInstance *s_instance; static TQString *s_launch_html, *s_intro_html, *s_specs_html, *s_tips_html, *s_plugins_html; }; diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index 30f5b9c6a..566bb543d 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cc @@ -459,7 +459,7 @@ bool clientApp::doIt() if ( command == "openURL" || command == "newTab" ) { - KInstance inst(appName); + TDEInstance inst(appName); if( !TDEApplication::dcopClient()->attach()) { TDEApplication::startKdeinit(); @@ -484,7 +484,7 @@ bool clientApp::doIt() } else if ( command == "openProfile" ) { - KInstance inst(appName); + TDEInstance inst(appName); if( !TDEApplication::dcopClient()->attach()) { TDEApplication::startKdeinit(); 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; diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp index b5dfe553f..1fbcd6c03 100644 --- a/konqueror/keditbookmarks/kbookmarkmerger.cpp +++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp @@ -59,9 +59,9 @@ int main( int argc, char**argv ) { const bool kdeRunning = kdeIsRunning(); - KAboutData aboutData( "kbookmarkmerger", I18N_NOOP( "KBookmarkMerger" ), + TDEAboutData aboutData( "kbookmarkmerger", I18N_NOOP( "KBookmarkMerger" ), "1.0", I18N_NOOP( "Merges bookmarks installed by 3rd parties into the user's bookmarks" ), - KAboutData::License_BSD, + TDEAboutData::License_BSD, I18N_NOOP( "Copyright © 2005 Frerich Raabe" ) ); aboutData.addAuthor( "Frerich Raabe", I18N_NOOP( "Original author" ), "raabe@kde.org" ); diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp index 50b7d2046..0c47ff65f 100644 --- a/konqueror/keditbookmarks/main.cpp +++ b/konqueror/keditbookmarks/main.cpp @@ -114,9 +114,9 @@ static int askUser(TDEApplication &app, TQString filename, bool &readonly) { extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { KLocale::setMainCatalogue("konqueror"); - KAboutData aboutData("keditbookmarks", I18N_NOOP("Bookmark Editor"), VERSION, + TDEAboutData aboutData("keditbookmarks", I18N_NOOP("Bookmark Editor"), VERSION, I18N_NOOP("Konqueror Bookmarks Editor"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 2000 - 2003, KDE developers") ); aboutData.addAuthor("David Faure", I18N_NOOP("Initial author"), "faure@kde.org"); aboutData.addAuthor("Alexander Kellett", I18N_NOOP("Author"), "lypanov@kde.org"); diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cc index 93bccfc01..be14f7e63 100644 --- a/konqueror/konq_extensionmanager.cc +++ b/konqueror/konq_extensionmanager.cc @@ -63,7 +63,7 @@ KonqExtensionManager::KonqExtensionManager(TQWidget *parent, KonqMainWindow *mai // have their config in the same KConfig[Group]. So we can't show konqueror extensions and khtml extensions in the same tab. d->pluginSelector->addPlugins("konqueror", i18n("Extensions"), "Extensions", KGlobal::config()); if ( activePart ) { - KInstance* instance = activePart->instance(); + TDEInstance* instance = activePart->instance(); d->pluginSelector->addPlugins(instance->instanceName(), i18n("Tools"), "Tools", instance->config()); d->pluginSelector->addPlugins(instance->instanceName(), i18n("Statusbar"), "Statusbar", instance->config()); } diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc index 97da7b4f6..a61ae8068 100644 --- a/konqueror/konq_factory.cc +++ b/konqueror/konq_factory.cc @@ -35,7 +35,7 @@ #include -KAboutData *KonqFactory::s_aboutData = 0; +TDEAboutData *KonqFactory::s_aboutData = 0; KonqViewFactory::KonqViewFactory( KLibFactory *factory, const TQStringList &args, bool createBrowser ) @@ -211,14 +211,14 @@ void KonqFactory::getOffers( const TQString & serviceType, } -const KAboutData *KonqFactory::aboutData() +const TDEAboutData *KonqFactory::aboutData() { if (!s_aboutData) { - s_aboutData = new KAboutData( "konqueror", I18N_NOOP("Konqueror"), + s_aboutData = new TDEAboutData( "konqueror", I18N_NOOP("Konqueror"), KONQUEROR_VERSION, I18N_NOOP("Web browser, file manager, ..."), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 1999-2010, The Konqueror developers"), 0, I18N_NOOP("http://konqueror.kde.org") ); diff --git a/konqueror/konq_factory.h b/konqueror/konq_factory.h index ac24061e6..4307defb9 100644 --- a/konqueror/konq_factory.h +++ b/konqueror/konq_factory.h @@ -32,7 +32,7 @@ class BrowserView; class KonqMainWindow; -class KAboutData; +class TDEAboutData; class KonqViewFactory { @@ -77,10 +77,10 @@ public: KTrader::OfferList *partServiceOffers = 0, KTrader::OfferList *appServiceOffers = 0); - static const KAboutData* aboutData(); + static const TDEAboutData* aboutData(); private: - static KAboutData *s_aboutData; + static TDEAboutData *s_aboutData; }; #endif diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc index 782d55e06..a2be33e4e 100644 --- a/konqueror/konq_guiclients.cc +++ b/konqueror/konq_guiclients.cc @@ -33,7 +33,7 @@ PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow, { //giving a name to each guiclient: just for debugging // (needs delete instance() in the dtor if enabled for good) - //setInstance( new KInstance( "PopupMenuGUIClient" ) ); + //setInstance( new TDEInstance( "PopupMenuGUIClient" ) ); m_mainWindow = mainWindow; diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h index 0e1a7f3dc..9b5c4e5b3 100644 --- a/konqueror/konq_viewmgr.h +++ b/konqueror/konq_viewmgr.h @@ -313,7 +313,7 @@ protected: const TQString &name, const KURL & defaultURL, bool openURL, bool openAfterCurrentPage = false ); // Disabled - we do it ourselves - virtual void setActiveInstance( KInstance * ) {} + virtual void setActiveInstance( TDEInstance * ) {} private: diff --git a/konqueror/kttsplugin/khtmlkttsd.h b/konqueror/kttsplugin/khtmlkttsd.h index b4e5702ca..cfe1e7d38 100644 --- a/konqueror/kttsplugin/khtmlkttsd.h +++ b/konqueror/kttsplugin/khtmlkttsd.h @@ -20,7 +20,7 @@ #include class KURL; -class KInstance; +class TDEInstance; /** * KHTML KParts Plugin 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 ) 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; }; diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp index 29f8de794..61e0f3b82 100644 --- a/konqueror/sidebar/konqsidebar.cpp +++ b/konqueror/sidebar/konqsidebar.cpp @@ -41,7 +41,7 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName, setWidget(TQT_TQWIDGET(m_widget)); } -KInstance *KonqSidebar::getInstance() +TDEInstance *KonqSidebar::getInstance() { kdDebug() << "KonqSidebar::getInstance()" << endl; return KonqSidebarFactory::instance(); @@ -76,13 +76,13 @@ void KonqSidebar::customEvent(TQCustomEvent* ev) // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include #include #include -KInstance* KonqSidebarFactory::s_instance = 0L; -KAboutData* KonqSidebarFactory::s_about = 0L; +TDEInstance* KonqSidebarFactory::s_instance = 0L; +TDEAboutData* KonqSidebarFactory::s_about = 0L; KonqSidebarFactory::KonqSidebarFactory() : KParts::Factory() @@ -111,13 +111,13 @@ KParts::Part* KonqSidebarFactory::createPartObject( TQWidget *parentWidget, cons return obj; } -KInstance* KonqSidebarFactory::instance() +TDEInstance* KonqSidebarFactory::instance() { if( !s_instance ) { - s_about = new KAboutData("konqsidebartng", I18N_NOOP("Extended Sidebar"), "0.1"); + s_about = new TDEAboutData("konqsidebartng", I18N_NOOP("Extended Sidebar"), "0.1"); s_about->addAuthor("Joseph WENNINGER", 0, "jowenn@bigfoot.com"); - s_instance = new KInstance(s_about); + s_instance = new TDEInstance(s_about); } return s_instance; } diff --git a/konqueror/sidebar/konqsidebar.h b/konqueror/sidebar/konqsidebar.h index 258bde835..660fda9df 100644 --- a/konqueror/sidebar/konqsidebar.h +++ b/konqueror/sidebar/konqsidebar.h @@ -90,7 +90,7 @@ public: virtual bool openURL(const KURL &url); KonqSidebarBrowserExtension* extension() const { return m_extension; } - KInstance *getInstance(); + TDEInstance *getInstance(); virtual bool universalMode() {return m_universalMode;} protected: /** @@ -106,8 +106,8 @@ private: bool m_universalMode; }; -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class KonqSidebarFactory : public KParts::Factory { @@ -119,11 +119,11 @@ public: virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ); - static KInstance* instance(); + static TDEInstance* instance(); private: - static KInstance* s_instance; - static KAboutData* s_about; + static TDEInstance* s_instance; + static TDEAboutData* s_about; }; #endif // KPARTAPPPART_H diff --git a/konqueror/sidebar/konqsidebarplugin.cpp b/konqueror/sidebar/konqsidebarplugin.cpp index 52cfc11f9..b9fb16f61 100644 --- a/konqueror/sidebar/konqsidebarplugin.cpp +++ b/konqueror/sidebar/konqsidebarplugin.cpp @@ -22,7 +22,7 @@ #include -KonqSidebarPlugin::KonqSidebarPlugin(KInstance *instance,TQObject *parent, +KonqSidebarPlugin::KonqSidebarPlugin(TDEInstance *instance,TQObject *parent, TQWidget * /*widgetParent*/, TQString &desktopName_, const char* name) : TQObject(parent,name), desktopName(desktopName_) { @@ -31,7 +31,7 @@ KonqSidebarPlugin::KonqSidebarPlugin(KInstance *instance,TQObject *parent, KonqSidebarPlugin::~KonqSidebarPlugin() { } -KInstance *KonqSidebarPlugin::parentInstance(){return m_parentInstance;} +TDEInstance *KonqSidebarPlugin::parentInstance(){return m_parentInstance;} void KonqSidebarPlugin::openURL(const KURL& url){handleURL(url);} diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h index 8f3077b37..ad859d025 100644 --- a/konqueror/sidebar/konqsidebarplugin.h +++ b/konqueror/sidebar/konqsidebarplugin.h @@ -34,17 +34,17 @@ class KDE_EXPORT KonqSidebarPlugin : public TQObject { Q_OBJECT public: - KonqSidebarPlugin(KInstance *instance,TQObject *parent,TQWidget *widgetParent,TQString &desktopName_, const char* name=0); + KonqSidebarPlugin(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent,TQString &desktopName_, const char* name=0); ~KonqSidebarPlugin(); virtual TQWidget *getWidget()=0; virtual void *provides(const TQString &)=0; - KInstance *parentInstance(); + TDEInstance *parentInstance(); protected: virtual void handleURL(const KURL &url)=0; virtual void handlePreview(const KFileItemList & items); virtual void handlePreviewOnMouseOver(const KFileItem &items); //not used yet, perhaps in KDE 3.1 TQString desktopName; - KInstance* m_parentInstance; + TDEInstance* m_parentInstance; private: KonqSidebarPluginPrivate *d; 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(); } diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h index 75975f35e..d258c9c3b 100644 --- a/konqueror/sidebar/sidebar_widget.h +++ b/konqueror/sidebar/sidebar_widget.h @@ -137,7 +137,7 @@ signals: public: /* interface KonqSidebar_PluginInterface*/ - KInstance *getInstance(); + TDEInstance *getInstance(); // virtual void showError(TQString &); for later extension // virtual void showMessage(TQString &); for later extension /* end of interface implementation */ diff --git a/konqueror/sidebar/test/konqsidebartest.cpp b/konqueror/sidebar/test/konqsidebartest.cpp index a790ee7e1..2032fe202 100644 --- a/konqueror/sidebar/test/konqsidebartest.cpp +++ b/konqueror/sidebar/test/konqsidebartest.cpp @@ -19,7 +19,7 @@ extern "C" { - KDE_EXPORT void* create_konq_sidebartest(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) + KDE_EXPORT void* create_konq_sidebartest(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new SidebarTest(instance,par,widp,desktopname,name); } diff --git a/konqueror/sidebar/test/konqsidebartest.h b/konqueror/sidebar/test/konqsidebartest.h index 5c36080fd..c5abab26c 100644 --- a/konqueror/sidebar/test/konqsidebartest.h +++ b/konqueror/sidebar/test/konqsidebartest.h @@ -24,7 +24,7 @@ class SidebarTest : public KonqSidebarPlugin { Q_OBJECT public: - SidebarTest(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0): + SidebarTest(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0): KonqSidebarPlugin(inst,parent,widgetParent,desktopName_,name) { widget=new TQLabel("Init Value",widgetParent); diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp index ffde542b0..0dc9303b4 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.cpp +++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp @@ -14,7 +14,7 @@ #include #include -KonqSidebar_Tree::KonqSidebar_Tree(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name): +KonqSidebar_Tree::KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name): KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name) { KSimpleConfig ksc(desktopName_); @@ -124,7 +124,7 @@ void KonqSidebar_Tree::rename() extern "C" { - KDE_EXPORT void* create_konqsidebar_tree(KInstance *inst,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) + KDE_EXPORT void* create_konqsidebar_tree(TDEInstance *inst,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new KonqSidebar_Tree(inst,par,widp,desktopname,name); } diff --git a/konqueror/sidebar/trees/konqsidebar_tree.h b/konqueror/sidebar/trees/konqsidebar_tree.h index 06f6b16b5..b70230b9e 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.h +++ b/konqueror/sidebar/trees/konqsidebar_tree.h @@ -18,7 +18,7 @@ class KonqSidebar_Tree: public KonqSidebarPlugin { Q_OBJECT public: - KonqSidebar_Tree(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); + KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); ~KonqSidebar_Tree(); virtual void *provides(const TQString &); // void emitStatusBarText (const TQString &); diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp index 695bc4d69..3697c443f 100644 --- a/konqueror/sidebar/web_module/web_module.cpp +++ b/konqueror/sidebar/web_module/web_module.cpp @@ -32,7 +32,7 @@ #include -KonqSideBarWebModule::KonqSideBarWebModule(KInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name) +KonqSideBarWebModule::KonqSideBarWebModule(TDEInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name) : KonqSidebarPlugin(instance, parent, widgetParent, desktopName, name) { _htmlPart = new KHTMLSideBar(universalMode()); @@ -182,7 +182,7 @@ void KonqSideBarWebModule::pageLoaded() { extern "C" { - KDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(KInstance *instance, TQObject *parent, TQWidget *widget, TQString &desktopName, const char *name) { + KDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(TDEInstance *instance, TQObject *parent, TQWidget *widget, TQString &desktopName, const char *name) { return new KonqSideBarWebModule(instance, parent, widget, desktopName, name); } } diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h index 36109ff86..4e0c3d6d7 100644 --- a/konqueror/sidebar/web_module/web_module.h +++ b/konqueror/sidebar/web_module/web_module.h @@ -166,7 +166,7 @@ class KonqSideBarWebModule : public KonqSidebarPlugin { Q_OBJECT public: - KonqSideBarWebModule(KInstance *instance, TQObject *parent, + KonqSideBarWebModule(TDEInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char *name); virtual ~KonqSideBarWebModule(); -- cgit v1.2.1