diff --git a/src/konqmainwindow.cpp b/src/konqmainwindow.cpp --- a/src/konqmainwindow.cpp +++ b/src/konqmainwindow.cpp @@ -2084,8 +2084,6 @@ m_currentView->setLocationBarURL(m_currentView->locationBarURL()); updateToolBarActions(); - - m_currentView->setActiveComponent(); } void KonqMainWindow::insertChildView(KonqView *childView) diff --git a/src/konqview.cpp b/src/konqview.cpp --- a/src/konqview.cpp +++ b/src/konqview.cpp @@ -1194,35 +1194,19 @@ } } +#ifdef KActivities_FOUND if (e->type() == QEvent::FocusIn) { - setActiveComponent(); + m_activityResourceInstance->notifyFocusedIn(); } -#ifdef KActivities_FOUND if (e->type() == QEvent::FocusOut) { m_activityResourceInstance->notifyFocusedOut(); } #endif return false; } -void KonqView::setActiveComponent() -{ -#if 0 // Removed with the port to KF5. The concept no longer exists, the about dialog and bug report - // dialog just use the application information rather than the one of the current part. - if (m_bBuiltinView) { - KComponentData::setActiveComponent(KGlobal::mainComponent()); - } else { - KComponentData::setActiveComponent(KComponentData(m_pPart->componentData())); - } -#endif - -#ifdef KActivities_FOUND - m_activityResourceInstance->notifyFocusedIn(); -#endif -} - bool KonqView::prepareReload(KParts::OpenUrlArguments &args, KParts::BrowserArguments &browserArgs, bool softReload) { args.setReload(true);