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