1 files changed, 9 insertions, 10 deletions
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index 03d29bac69..473c585520 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -81,7 +81,7 @@ QmlDesignerPlugin *QmlDesignerPlugin::m_instance = 0;
 
 static bool isInDesignerMode()
 {
-    return Core::ModeManager::currentMode() == Core::DesignMode::instance();
+    return Core::ModeManager::currentMode() == Core::Constants::MODE_DESIGN;
 }
 
 bool shouldAssertInException()
@@ -203,9 +203,8 @@ void QmlDesignerPlugin::createDesignModeWidget()
             this,
             SLOT(onTextEditorsClosed(QList<Core::IEditor*>)));
 
-    connect(Core::ModeManager::instance(),
-            SIGNAL(currentModeChanged(Core::IMode*,Core::IMode*)),
-            SLOT(onCurrentModeChanged(Core::IMode*,Core::IMode*)));
+    connect(Core::ModeManager::instance(), &Core::ModeManager::currentModeChanged,
+            this, &QmlDesignerPlugin::onCurrentModeChanged);
 
 }
 
@@ -392,21 +391,21 @@ void QmlDesignerPlugin::onCurrentEditorChanged(Core::IEditor *editor)
     }
 }
 
-static bool isDesignerMode(Core::IMode *mode)
+static bool isDesignerMode(Core::Id mode)
 {
-    return mode == Core::DesignMode::instance();
+    return mode == Core::DesignMode::instance()->id();
 }
 
 
 
-static bool documentIsAlreadyOpen(DesignDocument *designDocument, Core::IEditor *editor, Core::IMode *newMode)
+static bool documentIsAlreadyOpen(DesignDocument *designDocument, Core::IEditor *editor, Core::Id newMode)
 {
     return designDocument
             && editor == designDocument->editor()
             && isDesignerMode(newMode);
 }
 
-void QmlDesignerPlugin::onCurrentModeChanged(Core::IMode *newMode, Core::IMode *oldMode)
+void QmlDesignerPlugin::onCurrentModeChanged(Core::Id newMode, Core::Id oldMode)
 {
     if (data
             && Core::EditorManager::currentEditor()
@@ -492,11 +491,11 @@ const DesignerActionManager &QmlDesignerPlugin::designerActionManager() const
 
 void QmlDesignerPlugin::switchTextDesign()
 {
-    if (Core::ModeManager::currentMode()->id() == Core::Constants::MODE_EDIT) {
+    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()->id() == Core::Constants::MODE_DESIGN) {
+    } else if (Core::ModeManager::currentMode() == Core::Constants::MODE_DESIGN) {
         Core::ModeManager::activateMode(Core::Constants::MODE_EDIT);
     }
 }