Core::ModeManager: make some functions static

Change-Id: I5c1275ba3f596d8911fd2e4404181bf57b58f494
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
hjk
2012-01-26 01:18:02 +01:00
committed by Eike Ziller
parent 81ca5298c3
commit 2df4cb21fe
24 changed files with 102 additions and 120 deletions

View File

@@ -160,8 +160,7 @@ WelcomeMode::WelcomeMode() :
PluginManager *pluginManager = PluginManager::instance();
connect(pluginManager, SIGNAL(objectAdded(QObject*)), SLOT(welcomePluginAdded(QObject*)));
Core::ModeManager *modeManager = Core::ModeManager::instance();
connect(modeManager, SIGNAL(currentModeChanged(Core::IMode*)), SLOT(modeChanged(Core::IMode*)));
connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)), SLOT(modeChanged(Core::IMode*)));
setWidget(m_modeWidget);
}
@@ -286,12 +285,11 @@ void WelcomeMode::modeChanged(Core::IMode *mode)
// Eike doesn't like this, but I do...
// ProjectExplorer::ProjectExplorerPlugin *projectExplorer = ProjectExplorer::ProjectExplorerPlugin::instance();
// Core::ModeManager *modeManager = Core::ICore::modeManager();
// Core::EditorManager *editorManager = Core::ICore::editorManager();
// if (mode->id() == id() && (!projectExplorer->currentProject() && editorManager->openedEditors().isEmpty()))
// modeManager->setModeBarHidden(true);
// ModeManager::setModeBarHidden(true);
// else
// modeManager->setModeBarHidden(false);
// ModeManager::setModeBarHidden(false);
}
//
@@ -329,7 +327,7 @@ bool WelcomePlugin::initialize(const QStringList & /* arguments */, QString * /*
void WelcomePlugin::extensionsInitialized()
{
m_welcomeMode->initPlugins();
Core::ModeManager::instance()->activateMode(m_welcomeMode->id());
Core::ModeManager::activateMode(m_welcomeMode->id());
}
} // namespace Internal