From b3119d1994db8e23c253f9f5e7314e8858eaf8f2 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Mon, 28 Nov 2016 10:34:39 +0100 Subject: [PATCH] QmlDesigner: Using passive consistently in AbstractView api Using "changed" for all methods of AbstractView. Change-Id: Idd607d7e6087b83954b081fb49fd39e0bd196c3d Reviewed-by: Tim Jenssen --- .../qmldesigner/components/debugview/debugview.cpp | 10 +++++----- .../qmldesigner/components/debugview/debugview.h | 6 +++--- .../components/formeditor/formeditorview.cpp | 8 ++++---- .../qmldesigner/components/formeditor/formeditorview.h | 4 ++-- .../qmldesigner/components/navigator/navigatorview.cpp | 2 +- .../qmldesigner/components/navigator/navigatorview.h | 2 +- .../components/propertyeditor/propertyeditorview.cpp | 6 +++--- .../components/propertyeditor/propertyeditorview.h | 4 ++-- .../qmldesigner/designercore/include/abstractview.h | 6 +++--- .../qmldesigner/designercore/model/abstractview.cpp | 6 +++--- src/plugins/qmldesigner/designercore/model/model.cpp | 10 +++++----- 11 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/plugins/qmldesigner/components/debugview/debugview.cpp b/src/plugins/qmldesigner/components/debugview/debugview.cpp index d34e9f4c9c2..bc23e329a25 100644 --- a/src/plugins/qmldesigner/components/debugview/debugview.cpp +++ b/src/plugins/qmldesigner/components/debugview/debugview.cpp @@ -289,7 +289,7 @@ bool DebugView::hasWidget() const return false; } -void DebugView::instancePropertyChange(const QList > &propertyList) +void DebugView::instancePropertyChanged(const QList > &propertyList) { if (isDebugViewEnabled()) { QTextStream message; @@ -308,7 +308,7 @@ void DebugView::instancePropertyChange(const QList &/*errorNodeList*/) +void DebugView::instanceErrorChanged(const QVector &/*errorNodeList*/) { } @@ -330,16 +330,16 @@ void DebugView::instancesCompleted(const QVector &completedNodeList) } } -void DebugView::instanceInformationsChange(const QMultiHash &informationChangeHash) +void DebugView::instanceInformationsChanged(const QMultiHash &informationChangedHash) { if (isDebugViewEnabled()) { QTextStream message; QString string; message.setString(&string); - foreach (const ModelNode &modelNode, informationChangeHash.keys()) { + foreach (const ModelNode &modelNode, informationChangedHash.keys()) { message << modelNode; - message << informationChangeHash.value(modelNode); + message << informationChangedHash.value(modelNode); } logInstance(tr("Instance completed"), string); diff --git a/src/plugins/qmldesigner/components/debugview/debugview.h b/src/plugins/qmldesigner/components/debugview/debugview.h index 51344f06967..23e6a7db155 100644 --- a/src/plugins/qmldesigner/components/debugview/debugview.h +++ b/src/plugins/qmldesigner/components/debugview/debugview.h @@ -72,10 +72,10 @@ public: WidgetInfo widgetInfo() override; bool hasWidget() const override; - void instancePropertyChange(const QList > &propertyList) override; - void instanceErrorChange(const QVector &errorNodeList) override; + void instancePropertyChanged(const QList > &propertyList) override; + void instanceErrorChanged(const QVector &errorNodeList) override; void instancesCompleted(const QVector &completedNodeList) override; - void instanceInformationsChange(const QMultiHash &informationChangeHash) override; + void instanceInformationsChanged(const QMultiHash &informationChangedHash) override; void instancesRenderImageChanged(const QVector &nodeList) override; void instancesPreviewImageChanged(const QVector &nodeList) override; void instancesChildrenChanged(const QVector &nodeList) override; diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index dc6fb57c669..907b48f81cd 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -413,15 +413,15 @@ void FormEditorView::instancesCompleted(const QVector &completedNodeL currentTool()->instancesCompleted(itemNodeList); } -void FormEditorView::instanceInformationsChange(const QMultiHash &informationChangeHash) +void FormEditorView::instanceInformationsChanged(const QMultiHash &informationChangedHash) { QList itemNodeList; - foreach (const ModelNode &node, informationChangeHash.keys().toSet()) { + foreach (const ModelNode &node, informationChangedHash.keys().toSet()) { QmlItemNode qmlItemNode(node); if (qmlItemNode.isValid() && scene()->hasItemForQmlItemNode(qmlItemNode)) { scene()->synchronizeTransformation(qmlItemNode); - if (qmlItemNode.isRootModelNode() && informationChangeHash.values(node).contains(Size)) { + if (qmlItemNode.isRootModelNode() && informationChangedHash.values(node).contains(Size)) { if (qmlItemNode.instanceBoundingRect().isEmpty() && !(qmlItemNode.propertyAffectedByCurrentState("width") && qmlItemNode.propertyAffectedByCurrentState("height"))) { @@ -523,7 +523,7 @@ QmlItemNode findRecursiveQmlItemNode(const QmlObjectNode &firstQmlObjectNode) return QmlItemNode(); } -void FormEditorView::instancePropertyChange(const QList > &propertyList) +void FormEditorView::instancePropertyChanged(const QList > &propertyList) { typedef QPair NodePropertyPair; foreach (const NodePropertyPair &nodePropertyPair, propertyList) { diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.h b/src/plugins/qmldesigner/components/formeditor/formeditorview.h index e5a6b3aff85..e98cf772c3e 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.h +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.h @@ -98,10 +98,10 @@ public: void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) override; void instancesCompleted(const QVector &completedNodeList) override; - void instanceInformationsChange(const QMultiHash &informationChangeHash) override; + void instanceInformationsChanged(const QMultiHash &informationChangedHash) override; void instancesRenderImageChanged(const QVector &nodeList) override; void instancesChildrenChanged(const QVector &nodeList) override; - void instancePropertyChange(const QList > &propertyList) override; + void instancePropertyChanged(const QList > &propertyList) override; void rewriterBeginTransaction() override; void rewriterEndTransaction() override; diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index 44f96cc82db..136b150a81d 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -254,7 +254,7 @@ void NavigatorView::auxiliaryDataChanged(const ModelNode &modelNode, const Prope } } -void NavigatorView::instanceErrorChange(const QVector &errorNodeList) +void NavigatorView::instanceErrorChanged(const QVector &errorNodeList) { foreach (const ModelNode ¤tModelNode, errorNodeList) m_treeModel->updateItemRow(currentModelNode); diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.h b/src/plugins/qmldesigner/components/navigator/navigatorview.h index 8cdedc78373..78fa3a92e03 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.h +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.h @@ -69,7 +69,7 @@ public: void selectedNodesChanged(const QList &selectedNodeList , const QList &lastSelectedNodeList) override; void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) override; - void instanceErrorChange(const QVector &errorNodeList) override; + void instanceErrorChanged(const QVector &errorNodeList) override; void bindingPropertiesChanged(const QList &propertyList, PropertyChangeFlags) override; diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp index 639a3b8e336..f55c7353b7c 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp @@ -627,13 +627,13 @@ void PropertyEditorView::bindingPropertiesChanged(const QList& } } -void PropertyEditorView::instanceInformationsChange(const QMultiHash &informationChangeHash) +void PropertyEditorView::instanceInformationsChanged(const QMultiHash &informationChangedHash) { if (!m_selectedNode.isValid()) return; m_locked = true; - QList informationNameList = informationChangeHash.values(m_selectedNode); + QList informationNameList = informationChangedHash.values(m_selectedNode); if (informationNameList.contains(Anchor) || informationNameList.contains(HasAnchor)) m_qmlBackEndForCurrentType->backendAnchorBinding().setup(QmlItemNode(m_selectedNode)); @@ -687,7 +687,7 @@ void PropertyEditorView::currentStateChanged(const ModelNode &node) delayedResetView(); } -void PropertyEditorView::instancePropertyChange(const QList > &propertyList) +void PropertyEditorView::instancePropertyChanged(const QList > &propertyList) { if (!m_selectedNode.isValid()) return; diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h index 175abbd13c5..b3158962ec6 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h @@ -71,13 +71,13 @@ public: void variantPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) override; void bindingPropertiesChanged(const QList& propertyList, PropertyChangeFlags propertyChange) override; - void instanceInformationsChange(const QMultiHash &informationChangeHash) override; + void instanceInformationsChanged(const QMultiHash &informationChangedHash) override; void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) override; void resetView(); void currentStateChanged(const ModelNode &node) override; - void instancePropertyChange(const QList > &propertyList) override; + void instancePropertyChanged(const QList > &propertyList) override; void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override; diff --git a/src/plugins/qmldesigner/designercore/include/abstractview.h b/src/plugins/qmldesigner/designercore/include/abstractview.h index 8d4ca2de834..0b4e9563d59 100644 --- a/src/plugins/qmldesigner/designercore/include/abstractview.h +++ b/src/plugins/qmldesigner/designercore/include/abstractview.h @@ -195,10 +195,10 @@ public: virtual void signalHandlerPropertiesChanged(const QVector& propertyList, PropertyChangeFlags propertyChange); virtual void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion); - virtual void instancePropertyChange(const QList > &propertyList); - virtual void instanceErrorChange(const QVector &errorNodeList); + virtual void instancePropertyChanged(const QList > &propertyList); + virtual void instanceErrorChanged(const QVector &errorNodeList); virtual void instancesCompleted(const QVector &completedNodeList); - virtual void instanceInformationsChange(const QMultiHash &informationChangeHash); + virtual void instanceInformationsChanged(const QMultiHash &informationChangeHash); virtual void instancesRenderImageChanged(const QVector &nodeList); virtual void instancesPreviewImageChanged(const QVector &nodeList); virtual void instancesChildrenChanged(const QVector &nodeList); diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp index 4d9c17c2b83..b7140f46e89 100644 --- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp +++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp @@ -188,11 +188,11 @@ void AbstractView::modelAboutToBeDetached(Model *) Empty properties were removed. */ -void AbstractView::instancePropertyChange(const QList > &/*propertyList*/) +void AbstractView::instancePropertyChanged(const QList > &/*propertyList*/) { } -void AbstractView::instanceInformationsChange(const QMultiHash &/*informationChangeHash*/) +void AbstractView::instanceInformationsChanged(const QMultiHash &/*informationChangeHash*/) { } @@ -224,7 +224,7 @@ void AbstractView::rewriterEndTransaction() { } -void AbstractView::instanceErrorChange(const QVector &/*errorNodeList*/) +void AbstractView::instanceErrorChanged(const QVector &/*errorNodeList*/) { } diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp index f93aef2f370..48343b045af 100644 --- a/src/plugins/qmldesigner/designercore/model/model.cpp +++ b/src/plugins/qmldesigner/designercore/model/model.cpp @@ -426,7 +426,7 @@ void ModelPrivate::notifyInstancePropertyChange(const QListinstancePropertyChange(adaptedPropertyList); + view->instancePropertyChanged(adaptedPropertyList); } } @@ -439,7 +439,7 @@ void ModelPrivate::notifyInstanceErrorChange(const QVector &instanceIds) Q_ASSERT(view != 0); foreach (qint32 instanceId, instanceIds) errorNodeList.append(ModelNode(model()->d->nodeForInternalId(instanceId), model(), view)); - view->instanceErrorChange(errorNodeList); + view->instanceErrorChanged(errorNodeList); } } @@ -490,7 +490,7 @@ void ModelPrivate::notifyInstancesInformationsChange(const QMultiHashinstanceInformationsChange(convertModelNodeInformationHash(informationChangeHash, rewriterView())); + rewriterView()->instanceInformationsChanged(convertModelNodeInformationHash(informationChangeHash, rewriterView())); } catch (const RewritingException &e) { description = e.description(); resetModel = true; @@ -498,11 +498,11 @@ void ModelPrivate::notifyInstancesInformationsChange(const QMultiHash &view, m_viewList) { Q_ASSERT(view != 0); - view->instanceInformationsChange(convertModelNodeInformationHash(informationChangeHash, view.data())); + view->instanceInformationsChanged(convertModelNodeInformationHash(informationChangeHash, view.data())); } if (nodeInstanceView()) - nodeInstanceView()->instanceInformationsChange(convertModelNodeInformationHash(informationChangeHash, nodeInstanceView())); + nodeInstanceView()->instanceInformationsChanged(convertModelNodeInformationHash(informationChangeHash, nodeInstanceView())); if (resetModel) resetModelByRewriter(description);