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/qmldesigner | |
| 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/qmldesigner')
| -rw-r--r-- | src/plugins/qmldesigner/designmodewidget.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/qmldesignerplugin.cpp | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index 8752925907..db3fff1eb8 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -182,7 +182,7 @@ QList<QToolButton *> NavigatorSideBarItem::createToolBarWidgets() void DocumentWarningWidget::goToError() { m_designModeWidget->textEditor()->gotoLine(m_error.line(), m_error.column() - 1); - Core::ModeManager::instance()->activateMode(Core::Constants::MODE_EDIT); + Core::ModeManager::activateMode(Core::Constants::MODE_EDIT); } // ---------- DesignModeWidget diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index 2cc6f2ba43..b2f1898d13 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -288,7 +288,7 @@ void BauhausPlugin::createDesignModeWidget() void BauhausPlugin::updateEditor(Core::IEditor *editor) { if (editor && editor->id() == QmlJSEditor::Constants::C_QMLJSEDITOR_ID - && Core::ModeManager::instance()->currentMode() == m_designMode) + && Core::ModeManager::currentMode() == m_designMode) { m_mainWidget->showEditor(editor); } @@ -371,18 +371,16 @@ BauhausPlugin *BauhausPlugin::pluginInstance() void BauhausPlugin::switchTextDesign() { - Core::ModeManager *modeManager = Core::ModeManager::instance(); Core::EditorManager *editorManager = Core::EditorManager::instance(); Core::IEditor *editor = editorManager->currentEditor(); - - if (modeManager->currentMode()->id() == Core::Constants::MODE_EDIT) { + if (Core::ModeManager::currentMode()->id() == Core::Constants::MODE_EDIT) { if (editor->id() == QmlJSEditor::Constants::C_QMLJSEDITOR_ID) { - modeManager->activateMode(Core::Constants::MODE_DESIGN); + Core::ModeManager::activateMode(Core::Constants::MODE_DESIGN); m_mainWidget->setFocus(); } - } else if (modeManager->currentMode()->id() == Core::Constants::MODE_DESIGN) { - modeManager->activateMode(Core::Constants::MODE_EDIT); + } else if (Core::ModeManager::currentMode()->id() == Core::Constants::MODE_DESIGN) { + Core::ModeManager::activateMode(Core::Constants::MODE_EDIT); } } |