diff options
| author | hjk <qthjk@ovi.com> | 2012-01-26 01:18:02 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2012-01-27 14:52:24 +0100 |
| commit | 2df4cb21fedb279d003006e30db145957edcb6b7 (patch) | |
| tree | 60f0b4c32ace57b01c2a1ec7ee56cdc336f824da /src/plugins/help | |
| parent | 81ca5298c30a283c2b59426faadc64d8f44164e4 (diff) | |
| download | qt-creator-2df4cb21fedb279d003006e30db145957edcb6b7.tar.gz | |
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>
Diffstat (limited to 'src/plugins/help')
| -rw-r--r-- | src/plugins/help/helpplugin.cpp | 14 | ||||
| -rw-r--r-- | src/plugins/help/openpagesmanager.cpp | 3 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index 0fcc83ff8b..b54c73a7c9 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -663,7 +663,7 @@ void HelpPlugin::resetRightPaneScale() void HelpPlugin::activateHelpMode() { if (contextHelpOption() != Help::Constants::ExternalHelpAlways) - Core::ModeManager::instance()->activateMode(QLatin1String(Constants::ID_MODE_HELP)); + Core::ModeManager::activateMode(QLatin1String(Constants::ID_MODE_HELP)); else showExternalWindow(); } @@ -785,8 +785,8 @@ void HelpPlugin::contextHelpOptionChanged() m_externalWindow->show(); connectExternalHelpWindow(); - if (m_oldMode && m_mode == ModeManager::instance()->currentMode()) - ModeManager::instance()->activateMode(m_oldMode->id()); + if (m_oldMode && m_mode == ModeManager::currentMode()) + ModeManager::activateMode(m_oldMode->id()); } } } else if (modeWidget != m_splitter @@ -815,15 +815,15 @@ void HelpPlugin::contextHelpOptionChanged() void HelpPlugin::setupHelpEngineIfNeeded() { m_helpManager->setEngineNeedsUpdate(); - if (Core::ModeManager::instance()->currentMode() == m_mode + if (Core::ModeManager::currentMode() == m_mode || contextHelpOption() == Help::Constants::ExternalHelpAlways) m_helpManager->setupGuiHelpEngine(); } HelpViewer *HelpPlugin::viewerForContextMode() { - if (ModeManager::instance()->currentMode()->id() == Core::Constants::MODE_WELCOME) - ModeManager::instance()->activateMode(Core::Constants::MODE_EDIT); + if (ModeManager::currentMode()->id() == Core::Constants::MODE_WELCOME) + ModeManager::activateMode(Core::Constants::MODE_EDIT); bool showSideBySide = false; RightPanePlaceHolder *placeHolder = RightPanePlaceHolder::current(); @@ -873,7 +873,7 @@ void HelpPlugin::activateContext() switchToHelpMode(); return; } - if (ModeManager::instance()->currentMode() == m_mode) + if (ModeManager::currentMode() == m_mode) return; // Find out what to show diff --git a/src/plugins/help/openpagesmanager.cpp b/src/plugins/help/openpagesmanager.cpp index 9fe1083871..1ea30e4596 100644 --- a/src/plugins/help/openpagesmanager.cpp +++ b/src/plugins/help/openpagesmanager.cpp @@ -243,8 +243,7 @@ void OpenPagesManager::closeCurrentPage() false).toBool(); if (m_model->rowCount() == 1 && closeOnReturn) { - Core::ModeManager *modeManager = Core::ModeManager::instance(); - modeManager->activateMode(Core::Constants::MODE_EDIT); + Core::ModeManager::activateMode(Core::Constants::MODE_EDIT); } else { Q_ASSERT(indexes.count() == 1); removePage(indexes.first().row()); |