QmlDesigner.designDocumentController: removing instance

We use DesignModeWidget::curentDocumentController instead.

Change-Id: I9129a0611cfbc9997e5adb46597b8846463ef7ca
Reviewed-on: http://codereview.qt-project.org/4995
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
index 98654fc..214273e 100644 (file)
--- a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
@@ -126,7 +126,6 @@ public:
     int qt_versionId;
 };
 
-DesignDocumentController *DesignDocumentController::m_this = 0;
 
 /**
   \class QmlDesigner::DesignDocumentController
@@ -138,7 +137,6 @@ DesignDocumentController::DesignDocumentController(QObject *parent) :
         QObject(parent),
         d(new DesignDocumentControllerPrivate)
 {
-    m_this = this;
     d->documentLoaded = false;
     d->syncBlocked = false;
 
@@ -149,7 +147,6 @@ DesignDocumentController::DesignDocumentController(QObject *parent) :
 
 DesignDocumentController::~DesignDocumentController()
 {
-    m_this = 0;
     delete d->model.data();
     delete d->subComponentModel.data();
 
@@ -305,9 +302,7 @@ void DesignDocumentController::setComponentView(ComponentView *componentView)
     connect(d->componentView->action(), SIGNAL(currentComponentChanged(ModelNode)), SLOT(changeCurrentModelTo(ModelNode)));
 }
 
-DesignDocumentController *DesignDocumentController::instance()
 {
-    return m_this;
 }
 
 QString DesignDocumentController::displayName() const

diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.h b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.h
index be0c3a0..9ac261e 100644 (file)
--- a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.h
+++ b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.h
@@ -146,7 +146,6 @@ private:
 
     class DesignDocumentControllerPrivate *d;
 
-    static DesignDocumentController* m_this;
 };
 
 } // namespace QmlDesigner