From 972731d42eabd25eae2c5fd027a8f1178c7f909c Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 22 Sep 2015 09:17:59 +0200 Subject: [PATCH] ICore: Don't split context in contextChanged signal This way the order of the context doesn't get lost between context from the focus widget and additional contexts Change-Id: I371c411a5d9c9f31ae1f8631a6ede4eda100b0c5 Reviewed-by: David Schulz --- src/plugins/coreplugin/icore.cpp | 7 +++---- src/plugins/coreplugin/icore.h | 2 +- src/plugins/coreplugin/mainwindow.cpp | 2 +- src/plugins/qmldesigner/qmldesignerplugin.cpp | 6 ------ 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp index f295620f500..9fd605a6c5f 100644 --- a/src/plugins/coreplugin/icore.cpp +++ b/src/plugins/coreplugin/icore.cpp @@ -279,10 +279,9 @@ */ /*! - \fn void ICore::contextChanged(Core::IContext *context, const Core::Context &additionalContexts) - Indicates that a new \a context just became the current context - (meaning that its widget got focus), or that the additional context ids - specified by \a additionalContexts changed. + \fn void ICore::contextChanged(const Core::Context &context) + Indicates that a new \a context just became the current context. This includes the context + from the focus object as well as the additional context. */ #include "dialogs/newdialog.h" diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h index a381a537fd9..067e475f8d2 100644 --- a/src/plugins/coreplugin/icore.h +++ b/src/plugins/coreplugin/icore.h @@ -136,7 +136,7 @@ signals: void optionsDialogRequested(); void coreAboutToClose(); void contextAboutToChange(const QList &context); - void contextChanged(const QList &context, const Core::Context &additionalContexts); + void contextChanged(const Core::Context &context); void themeChanged(); private: diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 57026c1382a..ddb32436e3b 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -1024,7 +1024,7 @@ void MainWindow::updateContext() } ActionManager::setContext(uniquecontexts); - emit m_coreImpl->contextChanged(m_activeContext, m_additionalContexts); + emit m_coreImpl->contextChanged(uniquecontexts); } void MainWindow::aboutToShowRecentFiles() diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index c8291b38868..448c838732d 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -203,12 +203,6 @@ void QmlDesignerPlugin::createDesignModeWidget() this, SLOT(onTextEditorsClosed(QList))); -// connect(Core::ICore::editorManager(), SIGNAL(currentEditorChanged(Core::IEditor*)), -// &data->documentManager, SLOT(currentTextEditorChanged(Core::IEditor*))); - -// connect(Core::ICore::instance(), SIGNAL(contextChanged(Core::IContext*,Core::Context)), -// this, SLOT(contextChanged(Core::IContext*,Core::Context))); - connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*,Core::IMode*)), SLOT(onCurrentModeChanged(Core::IMode*,Core::IMode*)));