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/konq_extensionmanager.cc | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/konq_extensionmanager.cc')
| -rw-r--r-- | konqueror/konq_extensionmanager.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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()); } |