From 6944dc7af86c898a41871977b4dbca26012b757a Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@digia.com>
Date: Fri, 7 Feb 2014 14:03:59 +0100
Subject: [PATCH] QmlDesigner: Use QmlJSEditorDocument instead of widget

It doesn't need the widget in this case, so the preferred way is to use
the document.

Change-Id: I5ff3943603c6883f27f29702cf48a30992204179
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
---
 .../model/basetexteditmodifier.cpp            | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp b/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp
index 6b3b179df97..a00f7f78fe6 100644
--- a/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp
+++ b/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp
@@ -30,7 +30,6 @@
 #include "basetexteditmodifier.h"
 
 #include <qmljs/qmljsmodelmanagerinterface.h>
-#include <qmljseditor/qmljseditor.h>
 #include <qmljseditor/qmljseditordocument.h>
 #include <texteditor/tabsettings.h>
 #include <utils/changeset.h>
@@ -70,18 +69,20 @@ int BaseTextEditModifier::indentDepth() const
 
 bool BaseTextEditModifier::renameId(const QString &oldId, const QString &newId)
 {
-    if (QmlJSEditor::QmlJSTextEditorWidget *qmljse = qobject_cast<QmlJSEditor::QmlJSTextEditorWidget*>(plainTextEdit())) {
-        Utils::ChangeSet changeSet;
-        foreach (const QmlJS::AST::SourceLocation &loc,
-                 qmljse->qmlJsEditorDocument()->semanticInfo().idLocations.value(oldId)) {
-            changeSet.replace(loc.begin(), loc.end(), newId);
+    if (TextEditor::BaseTextEditorWidget *bte = qobject_cast<TextEditor::BaseTextEditorWidget*>(plainTextEdit())) {
+        if (QmlJSEditor::QmlJSEditorDocument *document
+                = qobject_cast<QmlJSEditor::QmlJSEditorDocument *>(bte->baseTextDocument())) {
+            Utils::ChangeSet changeSet;
+            foreach (const QmlJS::AST::SourceLocation &loc,
+                    document->semanticInfo().idLocations.value(oldId)) {
+                changeSet.replace(loc.begin(), loc.end(), newId);
+            }
+            QTextCursor tc = bte->textCursor();
+            changeSet.apply(&tc);
+            return true;
         }
-        QTextCursor tc = qmljse->textCursor();
-        changeSet.apply(&tc);
-        return true;
-    } else {
-        return false;
     }
+    return false;
 }
 
 QmlJS::Snapshot BaseTextEditModifier::getSnapshot() const