feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: Introduce ICore::{add,remove}AdditionalContext

Browse Source 
Simplify single operation

Change-Id: I172b9dfe8f97324d931d4f332ac1609d230e3400
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2014-11-16 11:47:18 +02:00
committed by Orgad Shaneh
parent e6020b7067
commit aee3c2f531
5 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/debugger/debuggermainwindow.cpp
View File

@@ -346,15 +346,14 @@ void DebuggerMainWindowPrivate::activateQmlCppLayout()
if (m_previousDebugLanguages & QmlLanguage) {
m_dockWidgetActiveStateQmlCpp = q->saveSettings();
ICore::updateAdditionalContexts(qmlCppContext, Context());
ICore::removeAdditionalContext(qmlCppContext);
} else if (m_previousDebugLanguages & CppLanguage) {
m_dockWidgetActiveStateCpp = q->saveSettings();
ICore::updateAdditionalContexts(m_contextsForLanguage.value(CppLanguage),
Context());
ICore::removeAdditionalContext(m_contextsForLanguage.value(CppLanguage));
}
q->restoreSettings(m_dockWidgetActiveStateQmlCpp);
ICore::updateAdditionalContexts(Context(), qmlCppContext);
ICore::addAdditionalContext(qmlCppContext);
}
void DebuggerMainWindowPrivate::activateCppLayout()
@@ -368,17 +367,16 @@ void DebuggerMainWindowPrivate::activateCppLayout()
if (m_previousDebugLanguages & QmlLanguage) {
m_dockWidgetActiveStateQmlCpp = q->saveSettings();
ICore::updateAdditionalContexts(qmlCppContext, Context());
ICore::removeAdditionalContext(qmlCppContext);
} else if (m_previousDebugLanguages & CppLanguage) {
m_dockWidgetActiveStateCpp = q->saveSettings();
ICore::updateAdditionalContexts(m_contextsForLanguage.value(CppLanguage),
Context());
ICore::removeAdditionalContext(m_contextsForLanguage.value(CppLanguage));
}
q->restoreSettings(m_dockWidgetActiveStateCpp);
const Context &cppContext = m_contextsForLanguage.value(CppLanguage);
ICore::updateAdditionalContexts(Context(), cppContext);
ICore::addAdditionalContext(cppContext);
}
void DebuggerMainWindow::setToolBar(DebuggerLanguage language, QWidget *widget)