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/konqsidebarplugin.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/konqsidebarplugin.cpp')
| -rw-r--r-- | konqueror/sidebar/konqsidebarplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 <kdebug.h> -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);} |