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

14
src/plugins/coreplugin/modemanager.cpp
View File

@@ -115,15 +115,15 @@ ModeManager::~ModeManager()
m_instance = 0;
}
IMode *ModeManager::currentMode()
Id ModeManager::currentMode()
{
int currentIndex = d->m_modeStack->currentIndex();
if (currentIndex < 0)
return 0;
return d->m_modes.at(currentIndex);
return d->m_modes.at(currentIndex)->id();
}
IMode *ModeManager::mode(Id id)
static IMode *findMode(Id id)
{
const int index = indexOf(id);
if (index >= 0)
@@ -205,7 +205,7 @@ void ModeManager::enabledStateChanged()
d->m_modeStack->setTabEnabled(index, mode->isEnabled());
// Make sure we leave any disabled mode to prevent possible crashes:
if (mode == currentMode() && !mode->isEnabled()) {
if (mode->id() == currentMode() && !mode->isEnabled()) {
// This assumes that there is always at least one enabled mode.
for (int i = 0; i < d->m_modes.count(); ++i) {
if (d->m_modes.at(i) != mode &&
@@ -256,7 +256,7 @@ void ModeManager::currentTabAboutToChange(int index)
if (index >= 0) {
IMode *mode = d->m_modes.at(index);
if (mode)
emit currentModeAboutToChange(mode);
emit currentModeAboutToChange(mode->id());
}
}
@@ -276,13 +276,13 @@ void ModeManager::currentTabChanged(int index)
if (d->m_oldCurrent >= 0)
oldMode = d->m_modes.at(d->m_oldCurrent);
d->m_oldCurrent = index;
emit currentModeChanged(mode, oldMode);
emit currentModeChanged(mode ? mode->id() : Id(), oldMode ? oldMode->id() : Id());
}
}
void ModeManager::setFocusToCurrentMode()
{
IMode *mode = currentMode();
IMode *mode = findMode(currentMode());
QTC_ASSERT(mode, return);
QWidget *widget = mode->widget();
if (widget) {