QmlDesigner.AbstractView: remove widget()

We use now widgetInfo() instead.

Change-Id: Icaea8f012b380368b6479fa81d370236ea5a6781
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit 54431a09)

src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp

@@ -186,11 +186,6 @@ public:
         m_designerActionList = designerActionList;
     }
 
-    QWidget *widget() QTC_OVERRIDE
-    {
-        return 0;
-    }
-
 protected:
     void setupContext()
     {

src/plugins/qmldesigner/components/debugview/debugview.cpp

@@ -220,11 +220,6 @@ void DebugView::propertiesRemoved(const QList<AbstractProperty> &propertyList)
     }
 }
 
-QWidget *DebugView::widget()
-{
-    return 0;
-}
-
 void DebugView::auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data)
 {
     if (isDebugViewEnabled()) {

src/plugins/qmldesigner/components/debugview/debugview.h

@@ -67,8 +67,6 @@ public:
     void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
     void propertiesRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE;
 
-    QWidget *widget() QTC_OVERRIDE;
-
     void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE;
 
     void rewriterBeginTransaction() QTC_OVERRIDE;

src/plugins/qmldesigner/components/formeditor/dragtool.cpp

@@ -310,7 +310,7 @@ void DragTool::dragEnterEvent(QGraphicsSceneDragDropEvent * event)
         QList<Import> importToBeAddedList;
         m_blockMove = false;
         if (event->mimeData()->hasFormat("application/vnd.bauhaus.itemlibraryinfo")) {
-            view()->widget()->setFocus();
+            view()->widgetInfo().widget->setFocus();
             m_Aborted = false;
             Q_ASSERT(!event->mimeData()->data("application/vnd.bauhaus.itemlibraryinfo").isEmpty());
 

src/plugins/qmldesigner/components/formeditor/formeditorview.cpp

@@ -274,11 +274,6 @@ void FormEditorView::bindingPropertiesChanged(const QList<BindingProperty>& prop
     QmlModelView::bindingPropertiesChanged(propertyList, propertyChange);
 }
 
-QWidget *FormEditorView::widget()
-{
-    return m_formEditorWidget.data();
-}
-
 WidgetInfo FormEditorView::widgetInfo()
 {
     return createWidgetInfo(m_formEditorWidget.data(), "FormEditor", WidgetInfo::CentralPane, 0, tr("Form Editor"));

src/plugins/qmldesigner/components/formeditor/formeditorview.h

@@ -85,7 +85,6 @@ public:
     void propertiesRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE;
 
     // FormEditorView
-    QWidget *widget() QTC_OVERRIDE;
     WidgetInfo widgetInfo() QTC_OVERRIDE;
 
     FormEditorWidget *formEditorWidget();

src/plugins/qmldesigner/components/integration/componentview.cpp

@@ -73,11 +73,6 @@ void ComponentView::setComponentNode(const ModelNode &node)
     m_componentAction->setCurrentIndex(indexForNode(node));
 }
 
-QWidget *ComponentView::widget()
-{
-    return 0;
-}
-
 void ComponentView::removeSingleNodeFromList(const ModelNode &node)
 {
     for (int row = 0; row < m_standardItemModel->rowCount(); row++) {

src/plugins/qmldesigner/components/integration/componentview.h

@@ -115,8 +115,6 @@ public:
 
     void setComponentNode(const ModelNode &node);
 
-    QWidget *widget();
-
 signals:
     void componentListChanged(const QStringList &componentList);
 

src/plugins/qmldesigner/components/integration/designdocumentview.cpp

@@ -222,9 +222,4 @@ void DesignDocumentView::fromText(QString text)
     }
 }
 
-QWidget *DesignDocumentView::widget()
-{
-    return 0;
-}
-
 }// namespace QmlDesigner

src/plugins/qmldesigner/components/integration/designdocumentview.h

@@ -87,8 +87,6 @@ public:
     QString toText() const;
     void fromText(QString text);
 
-    QWidget *widget();
-
 private:
     ModelMerger m_modelMerger;
 };

src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp

@@ -43,14 +43,6 @@ ItemLibraryView::~ItemLibraryView()
 
 }
 
-QWidget *ItemLibraryView::widget()
-{
-    if (m_widget.isNull())
-        m_widget = new ItemLibraryWidget;
-
-    return m_widget.data();
-}
-
 bool ItemLibraryView::hasWidget() const
 {
     return true;
@@ -58,7 +50,10 @@ bool ItemLibraryView::hasWidget() const
 
 WidgetInfo ItemLibraryView::widgetInfo()
 {
-    return createWidgetInfo(widget(), QLatin1String("Library"), WidgetInfo::LeftPane, 0);
+    if (m_widget.isNull())
+            m_widget = new ItemLibraryWidget;
+
+    return createWidgetInfo(m_widget.data(), QLatin1String("Library"), WidgetInfo::LeftPane, 0);
 }
 
 void ItemLibraryView::modelAttached(Model *model)

src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h

@@ -48,7 +48,6 @@ public:
     ItemLibraryView(QObject* parent = 0);
     ~ItemLibraryView();
 
-    QWidget *widget() QTC_OVERRIDE;
     bool hasWidget() const QTC_OVERRIDE;
     WidgetInfo widgetInfo() QTC_OVERRIDE;
 

src/plugins/qmldesigner/components/navigator/navigatorview.cpp

@@ -99,11 +99,6 @@ NavigatorView::~NavigatorView()
         delete m_widget.data();
 }
 
-QWidget *NavigatorView::widget()
-{
-    return m_widget.data();
-}
-
 bool NavigatorView::hasWidget() const
 {
     return true;

src/plugins/qmldesigner/components/navigator/navigatorview.h

@@ -56,7 +56,6 @@ public:
     NavigatorView(QObject* parent = 0);
     ~NavigatorView();
 
-    QWidget *widget();
     bool hasWidget() const;
     WidgetInfo widgetInfo();
 

src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp

@@ -961,11 +961,6 @@ void PropertyEditor::select(const ModelNode &node)
     delayedResetView();
 }
 
-QWidget *PropertyEditor::widget()
-{
-    return m_stackedWidget;
-}
-
 bool PropertyEditor::hasWidget() const
 {
     return true;

src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h

@@ -83,7 +83,6 @@ public:
 
     void setQmlDir(const QString &qmlDirPath);
 
-    QWidget *widget();
     bool hasWidget() const;
     WidgetInfo widgetInfo();
 

src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp

@@ -60,11 +60,6 @@ StatesEditorView::StatesEditorView(QObject *parent) :
     // base state
 }
 
-QWidget *StatesEditorView::widget()
-{
-    return m_statesEditorWidget.data();
-}
-
 WidgetInfo StatesEditorView::widgetInfo()
 {
     return createWidgetInfo(m_statesEditorWidget.data(), "StatesEditor", WidgetInfo::TopPane, 0, tr("States Editor"));

src/plugins/qmldesigner/components/stateseditor/stateseditorview.h

@@ -74,7 +74,6 @@ public:
 
     void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList);
 
-    QWidget *widget();
     WidgetInfo widgetInfo();
 
 

src/plugins/qmldesigner/designercore/include/abstractview.h

@@ -199,7 +199,6 @@ public:
     void resetView();
 
     virtual bool hasWidget() const;
-    virtual QWidget *widget() = 0;
     virtual WidgetInfo widgetInfo();
 
 protected:

src/plugins/qmldesigner/designercore/include/nodeinstanceview.h

@@ -149,8 +149,6 @@ public:
 
     void sendToken(const QString &token, int number, const QVector<ModelNode> &nodeVector);
 
-    QWidget *widget();
-
 signals:
     void qmlPuppetCrashed();
 

src/plugins/qmldesigner/designercore/include/rewriterview.h

@@ -206,8 +206,6 @@ public:
 
     QString pathForImport(const Import &import);
 
-    QWidget *widget();
-
 signals:
     void errorsChanged(const QList<RewriterView::Error> &errors);
 

src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp

@@ -1244,9 +1244,4 @@ void NodeInstanceView::sendToken(const QString &token, int number, const QVector
     nodeInstanceServer()->token(TokenCommand(token, number, instanceIdVector));
 }
 
-QWidget *NodeInstanceView::widget()
-{
-    return 0;
-}
-
 }

src/plugins/qmldesigner/designercore/model/rewriterview.cpp

@@ -734,11 +734,6 @@ QString RewriterView::pathForImport(const Import &import)
     return QString();
 }
 
-QWidget *RewriterView::widget()
-{
-    return 0;
-}
-
 void RewriterView::qmlTextChanged()
 {
     if (inErrorState())

src/plugins/qmldesigner/designercore/model/viewlogger.cpp

@@ -287,9 +287,5 @@ void ViewLogger::actualStateChanged(const ModelNode &node)
     m_output << time() << indent("actualStateChanged:") << node << endl;
 }
 
-QWidget *ViewLogger::widget()
-{
-    return 0;
-}
 } // namespace Internal
 } // namespace QmlDesigner

src/plugins/qmldesigner/designercore/model/viewlogger.h

@@ -87,8 +87,6 @@ public:
 
     void actualStateChanged(const ModelNode &node);
 
-    QWidget *widget();
-
 protected:
     QString time() const;