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

Use Core::Id in ModeManager interface

Browse Source 
Makes it more uniform to use and allows placeholder widget
creation to be independent of mode creations.

Change-Id: I4021bc9db7f8c78f0374c0cc3b3331506959afe4
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
hjk
2016-03-25 20:00:19 +01:00
parent ed7d5e0d62
commit 5e47d35fcd
29 changed files with 87 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/coreplugin/designmode.cpp
View File

@@ -197,7 +197,7 @@ void DesignMode::currentEditorChanged(IEditor *editor)
if (!mimeEditorAvailable) {
setActiveContext(Context());
if (ModeManager::currentMode() == this)
if (ModeManager::currentMode() == id())
ModeManager::activateMode(Constants::MODE_EDIT);
setEnabled(false);
d->m_currentEditor = 0;
@@ -217,11 +217,11 @@ void DesignMode::updateActions()
emit actionsUpdated(d->m_currentEditor.data());
}
void DesignMode::updateContext(IMode *newMode, IMode *oldMode)
void DesignMode::updateContext(Id newMode, Id oldMode)
{
if (newMode == this)
if (newMode == id())
ICore::addAdditionalContext(d->m_activeContext);
else if (oldMode == this)
else if (oldMode == id())
ICore::removeAdditionalContext(d->m_activeContext);
}
@@ -230,7 +230,7 @@ void DesignMode::setActiveContext(const Context &context)
if (d->m_activeContext == context)
return;
if (ModeManager::currentMode() == this)
if (ModeManager::currentMode() == id())
ICore::updateAdditionalContexts(d->m_activeContext, context);
d->m_activeContext = context;