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/konqsidebarplugin.h | |
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/konqsidebarplugin.h')
-rw-r--r-- | konqueror/sidebar/konqsidebarplugin.h | 6 |
1 files changed, 3 insertions, 3 deletions
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; |