From c82eafd13f18511042da9f10aada8ef5d6967aad Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@digia.com>
Date: Mon, 30 Jun 2014 14:58:11 +0200
Subject: [PATCH] QmlDesigner: Refactor currentModel() getters in
 QmlDesignerPlugin

Change-Id: I6d5085b591439cc2e79ca0f9872a1c0497c5f220
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
---
 src/plugins/qmldesigner/qmldesignerplugin.cpp | 9 +++++++--
 src/plugins/qmldesigner/qmldesignerplugin.h   | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index a7705075990..8a08aaf055f 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -225,7 +225,7 @@ void QmlDesignerPlugin::showDesigner()
 void QmlDesignerPlugin::hideDesigner()
 {
     if (currentDesignDocument()
-            && currentDesignDocument()->currentModel()
+            && currentModel()
             && !currentDesignDocument()->hasQmlSyntaxErrors())
         jumpTextCursorToSelectedModelNode();
 
@@ -343,7 +343,7 @@ void QmlDesignerPlugin::deactivateAutoSynchronization()
 
 void QmlDesignerPlugin::resetModelSelection()
 {
-    if (rewriterView() && currentDesignDocument()->currentModel())
+    if (rewriterView() && currentModel())
         rewriterView()->setSelectedModelNodes(QList<ModelNode>());
 }
 
@@ -352,6 +352,11 @@ RewriterView *QmlDesignerPlugin::rewriterView() const
     return currentDesignDocument()->rewriterView();
 }
 
+Model *QmlDesignerPlugin::currentModel() const
+{
+    return currentDesignDocument()->currentModel();
+}
+
 static bool checkIfEditorIsQtQuick(Core::IEditor *editor)
 {
     if (editor)
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.h b/src/plugins/qmldesigner/qmldesignerplugin.h
index 9a96b8400ef..ace422bf926 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.h
+++ b/src/plugins/qmldesigner/qmldesignerplugin.h
@@ -114,6 +114,7 @@ private: // functions
     void deactivateAutoSynchronization();
     void resetModelSelection();
     RewriterView *rewriterView() const;
+    Model *currentModel() const;
 
 private: // variables
     QmlDesignerPluginData *data;