From 3218a831f0421a2cee36784fb8561d915163f5e9 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 6 Oct 2016 18:12:08 +0200 Subject: [PATCH] QmlDesigner: move code Change-Id: I5367fc95fb7d54fad7ad3dfbf77412e96613049b Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/qmldesignerplugin.cpp | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index bdc240a79b1..27526298deb 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -130,17 +130,6 @@ static bool shouldAssertInException() return !processEnvironment.value("QMLDESIGNER_ASSERT_ON_EXCEPTION").isEmpty(); } -static void switchTextDesign() -{ - if (Core::ModeManager::currentMode() == Core::Constants::MODE_EDIT) { - Core::IEditor *editor = Core::EditorManager::currentEditor(); - if (checkIfEditorIsQtQuick(editor)) - Core::ModeManager::activateMode(Core::Constants::MODE_DESIGN); - } else if (Core::ModeManager::currentMode() == Core::Constants::MODE_DESIGN) { - Core::ModeManager::activateMode(Core::Constants::MODE_EDIT); - } -} - QmlDesignerPlugin::QmlDesignerPlugin() { m_instance = this; @@ -206,7 +195,15 @@ bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString *e MetaInfo::setPluginPaths(QStringList(pluginPath)); createDesignModeWidget(); - connect(switchTextDesignAction, &QAction::triggered, this, &switchTextDesign); + connect(switchTextDesignAction, &QAction::triggered, this, [](){ + if (Core::ModeManager::currentMode() == Core::Constants::MODE_EDIT) { + Core::IEditor *editor = Core::EditorManager::currentEditor(); + if (checkIfEditorIsQtQuick(editor)) + Core::ModeManager::activateMode(Core::Constants::MODE_DESIGN); + } else if (Core::ModeManager::currentMode() == Core::Constants::MODE_DESIGN) { + Core::ModeManager::activateMode(Core::Constants::MODE_EDIT); + } + }); addAutoReleasedObject(new Internal::SettingsPage);