diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /konqueror/sidebar/web_module | |
| 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/web_module')
| -rw-r--r-- | konqueror/sidebar/web_module/web_module.cpp | 4 | ||||
| -rw-r--r-- | konqueror/sidebar/web_module/web_module.h | 2 |
2 files changed, 3 insertions, 3 deletions
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 <kstandarddirs.h> -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(); |