Commit fefbc0ce authored by Ahmad Samir's avatar Ahmad Samir
Browse files

[Konqueror] Remove KonqView::setActiveComponent()

Summary:
It's mostly redundant since KF5 port; the remaining bit
m_activityResourceInstance->notifyFocusedIn() call can be moved to
KonqView::eventFilter().

Test Plan: It compiles, koqueror still loads.

Reviewers: dfaure, stefanocrocco

Reviewed By: dfaure

Subscribers: kde-frameworks-devel

Differential Revision: https://phabricator.kde.org/D24793
parent b165ee39
......@@ -2084,8 +2084,6 @@ void KonqMainWindow::slotPartActivated(KParts::Part *part)
m_currentView->setLocationBarURL(m_currentView->locationBarURL());
updateToolBarActions();
m_currentView->setActiveComponent();
}
void KonqMainWindow::insertChildView(KonqView *childView)
......
......@@ -1194,11 +1194,11 @@ bool KonqView::eventFilter(QObject *obj, QEvent *e)
}
}
#ifdef KActivities_FOUND
if (e->type() == QEvent::FocusIn) {
setActiveComponent();
m_activityResourceInstance->notifyFocusedIn();
}
#ifdef KActivities_FOUND
if (e->type() == QEvent::FocusOut) {
m_activityResourceInstance->notifyFocusedOut();
}
......@@ -1207,22 +1207,6 @@ bool KonqView::eventFilter(QObject *obj, QEvent *e)
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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment