feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Using passive consistently in AbstractView api

Browse Source 
Using "changed" for all methods of AbstractView.

Change-Id: Idd607d7e6087b83954b081fb49fd39e0bd196c3d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2016-11-28 10:34:39 +01:00
parent 414f49ea19
commit b3119d1994
11 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmldesigner/components/debugview/debugview.cpp
View File

@@ -289,7 +289,7 @@ bool DebugView::hasWidget() const
return false; return false;
} }
void DebugView::instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) void DebugView::instancePropertyChanged(const QList<QPair<ModelNode, PropertyName> > &propertyList)
{ {
if (isDebugViewEnabled()) { if (isDebugViewEnabled()) {
QTextStream message; QTextStream message;
@@ -308,7 +308,7 @@ void DebugView::instancePropertyChange(const QList<QPair<ModelNode, PropertyName
} }
} }
void DebugView::instanceErrorChange(const QVector<ModelNode> &/*errorNodeList*/) void DebugView::instanceErrorChanged(const QVector<ModelNode> &/*errorNodeList*/)
{ {
} }
@@ -330,16 +330,16 @@ void DebugView::instancesCompleted(const QVector<ModelNode> &completedNodeList)
} }
} }
void DebugView::instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) void DebugView::instanceInformationsChanged(const QMultiHash<ModelNode, InformationName> &informationChangedHash)
{ {
if (isDebugViewEnabled()) { if (isDebugViewEnabled()) {
QTextStream message; QTextStream message;
QString string; QString string;
message.setString(&string); message.setString(&string);
foreach (const ModelNode &modelNode, informationChangeHash.keys()) { foreach (const ModelNode &modelNode, informationChangedHash.keys()) {
message << modelNode; message << modelNode;
message << informationChangeHash.value(modelNode); message << informationChangedHash.value(modelNode);
} }
logInstance(tr("Instance completed"), string); logInstance(tr("Instance completed"), string);

6
src/plugins/qmldesigner/components/debugview/debugview.h
View File

@@ -72,10 +72,10 @@ public:
WidgetInfo widgetInfo() override; WidgetInfo widgetInfo() override;
bool hasWidget() const override; bool hasWidget() const override;
void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) override; void instancePropertyChanged(const QList<QPair<ModelNode, PropertyName> > &propertyList) override;
void instanceErrorChange(const QVector<ModelNode> &errorNodeList) override; void instanceErrorChanged(const QVector<ModelNode> &errorNodeList) override;
void instancesCompleted(const QVector<ModelNode> &completedNodeList) override; void instancesCompleted(const QVector<ModelNode> &completedNodeList) override;
void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) override; void instanceInformationsChanged(const QMultiHash<ModelNode, InformationName> &informationChangedHash) override;
void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) override; void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) override; void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesChildrenChanged(const QVector<ModelNode> &nodeList) override; void instancesChildrenChanged(const QVector<ModelNode> &nodeList) override;

8
src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
View File

@@ -413,15 +413,15 @@ void FormEditorView::instancesCompleted(const QVector<ModelNode> &completedNodeL
currentTool()->instancesCompleted(itemNodeList); currentTool()->instancesCompleted(itemNodeList);
} }
void FormEditorView::instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) void FormEditorView::instanceInformationsChanged(const QMultiHash<ModelNode, InformationName> &informationChangedHash)
{ {
QList<FormEditorItem*> itemNodeList; QList<FormEditorItem*> itemNodeList;
foreach (const ModelNode &node, informationChangeHash.keys().toSet()) { foreach (const ModelNode &node, informationChangedHash.keys().toSet()) {
QmlItemNode qmlItemNode(node); QmlItemNode qmlItemNode(node);
if (qmlItemNode.isValid() && scene()->hasItemForQmlItemNode(qmlItemNode)) { if (qmlItemNode.isValid() && scene()->hasItemForQmlItemNode(qmlItemNode)) {
scene()->synchronizeTransformation(qmlItemNode); scene()->synchronizeTransformation(qmlItemNode);
if (qmlItemNode.isRootModelNode() && informationChangeHash.values(node).contains(Size)) { if (qmlItemNode.isRootModelNode() && informationChangedHash.values(node).contains(Size)) {
if (qmlItemNode.instanceBoundingRect().isEmpty() && if (qmlItemNode.instanceBoundingRect().isEmpty() &&
!(qmlItemNode.propertyAffectedByCurrentState("width") !(qmlItemNode.propertyAffectedByCurrentState("width")
&& qmlItemNode.propertyAffectedByCurrentState("height"))) { && qmlItemNode.propertyAffectedByCurrentState("height"))) {
@@ -523,7 +523,7 @@ QmlItemNode findRecursiveQmlItemNode(const QmlObjectNode &firstQmlObjectNode)
return QmlItemNode(); return QmlItemNode();
} }
void FormEditorView::instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) void FormEditorView::instancePropertyChanged(const QList<QPair<ModelNode, PropertyName> > &propertyList)
{ {
typedef QPair<ModelNode, PropertyName> NodePropertyPair; typedef QPair<ModelNode, PropertyName> NodePropertyPair;
foreach (const NodePropertyPair &nodePropertyPair, propertyList) { foreach (const NodePropertyPair &nodePropertyPair, propertyList) {

4
src/plugins/qmldesigner/components/formeditor/formeditorview.h
View File

@@ -98,10 +98,10 @@ public:
void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) override; void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) override;
void instancesCompleted(const QVector<ModelNode> &completedNodeList) override; void instancesCompleted(const QVector<ModelNode> &completedNodeList) override;
void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) override; void instanceInformationsChanged(const QMultiHash<ModelNode, InformationName> &informationChangedHash) override;
void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) override; void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) override;
void instancesChildrenChanged(const QVector<ModelNode> &nodeList) override; void instancesChildrenChanged(const QVector<ModelNode> &nodeList) override;
void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) override; void instancePropertyChanged(const QList<QPair<ModelNode, PropertyName> > &propertyList) override;
void rewriterBeginTransaction() override; void rewriterBeginTransaction() override;
void rewriterEndTransaction() override; void rewriterEndTransaction() override;

2
src/plugins/qmldesigner/components/navigator/navigatorview.cpp
View File

@@ -254,7 +254,7 @@ void NavigatorView::auxiliaryDataChanged(const ModelNode &modelNode, const Prope
} }
} }
void NavigatorView::instanceErrorChange(const QVector<ModelNode> &errorNodeList) void NavigatorView::instanceErrorChanged(const QVector<ModelNode> &errorNodeList)
{ {
foreach (const ModelNode &currentModelNode, errorNodeList) foreach (const ModelNode &currentModelNode, errorNodeList)
m_treeModel->updateItemRow(currentModelNode); m_treeModel->updateItemRow(currentModelNode);

2
src/plugins/qmldesigner/components/navigator/navigatorview.h
View File

@@ -69,7 +69,7 @@ public:
void selectedNodesChanged(const QList<ModelNode> &selectedNodeList , void selectedNodesChanged(const QList<ModelNode> &selectedNodeList ,
const QList<ModelNode> &lastSelectedNodeList) override; const QList<ModelNode> &lastSelectedNodeList) override;
void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) override; void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) override;
void instanceErrorChange(const QVector<ModelNode> &errorNodeList) override; void instanceErrorChanged(const QVector<ModelNode> &errorNodeList) override;
void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags) override; void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags) override;

6
src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
View File

@@ -627,13 +627,13 @@ void PropertyEditorView::bindingPropertiesChanged(const QList<BindingProperty>&
} }
} }
void PropertyEditorView::instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) void PropertyEditorView::instanceInformationsChanged(const QMultiHash<ModelNode, InformationName> &informationChangedHash)
{ {
if (!m_selectedNode.isValid()) if (!m_selectedNode.isValid())
return; return;
m_locked = true; m_locked = true;
QList<InformationName> informationNameList = informationChangeHash.values(m_selectedNode); QList<InformationName> informationNameList = informationChangedHash.values(m_selectedNode);
if (informationNameList.contains(Anchor) if (informationNameList.contains(Anchor)
|| informationNameList.contains(HasAnchor)) || informationNameList.contains(HasAnchor))
m_qmlBackEndForCurrentType->backendAnchorBinding().setup(QmlItemNode(m_selectedNode)); m_qmlBackEndForCurrentType->backendAnchorBinding().setup(QmlItemNode(m_selectedNode));
@@ -687,7 +687,7 @@ void PropertyEditorView::currentStateChanged(const ModelNode &node)
delayedResetView(); delayedResetView();
} }
void PropertyEditorView::instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) void PropertyEditorView::instancePropertyChanged(const QList<QPair<ModelNode, PropertyName> > &propertyList)
{ {
if (!m_selectedNode.isValid()) if (!m_selectedNode.isValid())
return; return;

4
src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h
View File

@@ -71,13 +71,13 @@ public:
void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) override; void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) override;
void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) override; void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) override;
void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) override; void instanceInformationsChanged(const QMultiHash<ModelNode, InformationName> &informationChangedHash) override;
void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) override; void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) override;
void resetView(); void resetView();
void currentStateChanged(const ModelNode &node) override; void currentStateChanged(const ModelNode &node) override;
void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) override; void instancePropertyChanged(const QList<QPair<ModelNode, PropertyName> > &propertyList) override;
void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override; void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override;

6
src/plugins/qmldesigner/designercore/include/abstractview.h
View File

@@ -195,10 +195,10 @@ public:
virtual void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange); virtual void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange);
virtual void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion); virtual void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion);
virtual void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList); virtual void instancePropertyChanged(const QList<QPair<ModelNode, PropertyName> > &propertyList);
virtual void instanceErrorChange(const QVector<ModelNode> &errorNodeList); virtual void instanceErrorChanged(const QVector<ModelNode> &errorNodeList);
virtual void instancesCompleted(const QVector<ModelNode> &completedNodeList); virtual void instancesCompleted(const QVector<ModelNode> &completedNodeList);
virtual void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash); virtual void instanceInformationsChanged(const QMultiHash<ModelNode, InformationName> &informationChangeHash);
virtual void instancesRenderImageChanged(const QVector<ModelNode> &nodeList); virtual void instancesRenderImageChanged(const QVector<ModelNode> &nodeList);
virtual void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList); virtual void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList);
virtual void instancesChildrenChanged(const QVector<ModelNode> &nodeList); virtual void instancesChildrenChanged(const QVector<ModelNode> &nodeList);

6
src/plugins/qmldesigner/designercore/model/abstractview.cpp
View File

@@ -188,11 +188,11 @@ void AbstractView::modelAboutToBeDetached(Model *)
Empty properties were removed. Empty properties were removed.
*/ */
void AbstractView::instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &/*propertyList*/) void AbstractView::instancePropertyChanged(const QList<QPair<ModelNode, PropertyName> > &/*propertyList*/)
{ {
} }
void AbstractView::instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &/*informationChangeHash*/) void AbstractView::instanceInformationsChanged(const QMultiHash<ModelNode, InformationName> &/*informationChangeHash*/)
{ {
} }
@@ -224,7 +224,7 @@ void AbstractView::rewriterEndTransaction()
{ {
} }
void AbstractView::instanceErrorChange(const QVector<ModelNode> &/*errorNodeList*/) void AbstractView::instanceErrorChanged(const QVector<ModelNode> &/*errorNodeList*/)
{ {
} }

10
src/plugins/qmldesigner/designercore/model/model.cpp
View File

@@ -426,7 +426,7 @@ void ModelPrivate::notifyInstancePropertyChange(const QList<QPair<ModelNode, Pro
adaptedPropertyList.append(newPair); adaptedPropertyList.append(newPair);
} }
view->instancePropertyChange(adaptedPropertyList); view->instancePropertyChanged(adaptedPropertyList);
} }
} }
@@ -439,7 +439,7 @@ void ModelPrivate::notifyInstanceErrorChange(const QVector<qint32> &instanceIds)
Q_ASSERT(view != 0); Q_ASSERT(view != 0);
foreach (qint32 instanceId, instanceIds) foreach (qint32 instanceId, instanceIds)
errorNodeList.append(ModelNode(model()->d->nodeForInternalId(instanceId), model(), view)); errorNodeList.append(ModelNode(model()->d->nodeForInternalId(instanceId), model(), view));
view->instanceErrorChange(errorNodeList); view->instanceErrorChanged(errorNodeList);
} }
} }
@@ -490,7 +490,7 @@ void ModelPrivate::notifyInstancesInformationsChange(const QMultiHash<ModelNode,
try { try {
if (rewriterView()) if (rewriterView())
rewriterView()->instanceInformationsChange(convertModelNodeInformationHash(informationChangeHash, rewriterView())); rewriterView()->instanceInformationsChanged(convertModelNodeInformationHash(informationChangeHash, rewriterView()));
} catch (const RewritingException &e) { } catch (const RewritingException &e) {
description = e.description(); description = e.description();
resetModel = true; resetModel = true;
@@ -498,11 +498,11 @@ void ModelPrivate::notifyInstancesInformationsChange(const QMultiHash<ModelNode,
foreach (const QPointer<AbstractView> &view, m_viewList) { foreach (const QPointer<AbstractView> &view, m_viewList) {
Q_ASSERT(view != 0); Q_ASSERT(view != 0);
view->instanceInformationsChange(convertModelNodeInformationHash(informationChangeHash, view.data())); view->instanceInformationsChanged(convertModelNodeInformationHash(informationChangeHash, view.data()));
} }
if (nodeInstanceView()) if (nodeInstanceView())
nodeInstanceView()->instanceInformationsChange(convertModelNodeInformationHash(informationChangeHash, nodeInstanceView())); nodeInstanceView()->instanceInformationsChanged(convertModelNodeInformationHash(informationChangeHash, nodeInstanceView()));
if (resetModel) if (resetModel)
resetModelByRewriter(description); resetModelByRewriter(description);