From 95aa7f42dee37ec50150c10863864660885a1574 Mon Sep 17 00:00:00 2001
From: Michael Winkelmann <michael.winkelmann@qt.io>
Date: Wed, 19 Aug 2020 14:07:10 +0200
Subject: [PATCH] QmlPuppet: Refactor ChangeBindingsCommand

Change-Id: Id3020a73f59a1adfd25066a37d083d923e77956b
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
---
 .../commands/changebindingscommand.cpp        | 28 +------------------
 .../commands/changebindingscommand.h          | 26 ++++++++---------
 .../instances/nodeinstanceserver.cpp          |  2 +-
 .../instances/qt5testnodeinstanceserver.cpp   |  2 +-
 .../instances/nodeinstanceview.cpp            |  9 +++---
 5 files changed, 19 insertions(+), 48 deletions(-)

diff --git a/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.cpp
index 1846b260b29..7603e4be29b 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.cpp
@@ -29,35 +29,9 @@
 
 namespace QmlDesigner {
 
-ChangeBindingsCommand::ChangeBindingsCommand() = default;
-
-ChangeBindingsCommand::ChangeBindingsCommand(const QVector<PropertyBindingContainer> &bindingChangeVector)
-    : m_bindingChangeVector (bindingChangeVector)
-{
-}
-
-QVector<PropertyBindingContainer> ChangeBindingsCommand::bindingChanges() const
-{
-    return m_bindingChangeVector;
-}
-
-QDataStream &operator<<(QDataStream &out, const ChangeBindingsCommand &command)
-{
-    out << command.bindingChanges();
-
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, ChangeBindingsCommand &command)
-{
-    in >> command.m_bindingChangeVector;
-
-    return in;
-}
-
 QDebug operator <<(QDebug debug, const ChangeBindingsCommand &command)
 {
-    return debug.nospace() << "PropertyValueContainer(bindingChanges: " << command.m_bindingChangeVector << ")";
+    return debug.nospace() << "PropertyValueContainer(bindingChanges: " << command.bindingChanges << ")";
 }
 
 } // namespace QmlDesigner
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.h b/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.h
index b2df9e326c3..a23f8967129 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.h
@@ -34,24 +34,22 @@ namespace QmlDesigner {
 
 class ChangeBindingsCommand
 {
-    friend QDataStream &operator>>(QDataStream &in, ChangeBindingsCommand &command);
+public:
+    friend QDataStream &operator>>(QDataStream &in, ChangeBindingsCommand &command) {
+        in >> command.bindingChanges;
+        return in;
+    }
+
+    friend QDataStream &operator<<(QDataStream &out, const ChangeBindingsCommand &command) {
+        out << command.bindingChanges;
+        return out;
+    }
+
     friend QDebug operator <<(QDebug debug, const ChangeBindingsCommand &command);
 
-public:
-    ChangeBindingsCommand();
-    explicit ChangeBindingsCommand(const QVector<PropertyBindingContainer> &bindingChangeVector);
-
-    QVector<PropertyBindingContainer> bindingChanges() const;
-
-private:
-    QVector<PropertyBindingContainer> m_bindingChangeVector;
+    QVector<PropertyBindingContainer> bindingChanges;
 };
 
-QDataStream &operator<<(QDataStream &out, const ChangeBindingsCommand &command);
-QDataStream &operator>>(QDataStream &in, ChangeBindingsCommand &command);
-
-QDebug operator <<(QDebug debug, const ChangeBindingsCommand &command);
-
 } // namespace QmlDesigner
 
 Q_DECLARE_METATYPE(QmlDesigner::ChangeBindingsCommand)
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
index 1148e0c6d2d..6a0f75fe885 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
@@ -643,7 +643,7 @@ void NodeInstanceServer::changeAuxiliaryValues(const ChangeAuxiliaryCommand &com
 void NodeInstanceServer::changePropertyBindings(const ChangeBindingsCommand &command)
 {
     bool hasDynamicProperties = false;
-    foreach (const PropertyBindingContainer &container, command.bindingChanges()) {
+    for (const PropertyBindingContainer &container : command.bindingChanges) {
         hasDynamicProperties |= container.isDynamic();
         setInstancePropertyBinding(container);
     }
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp
index 3e635909ec9..067c8c94684 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp
@@ -103,7 +103,7 @@ void Qt5TestNodeInstanceServer::changePropertyValues(const ChangeValuesCommand &
 void Qt5TestNodeInstanceServer::changePropertyBindings(const ChangeBindingsCommand &command)
 {
     bool hasDynamicProperties = false;
-    foreach (const PropertyBindingContainer &container, command.bindingChanges()) {
+    for (const PropertyBindingContainer &container : command.bindingChanges) {
         hasDynamicProperties |= container.isDynamic();
         setInstancePropertyBinding(container);
     }
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
index 4681d32fe3d..102c87b0b97 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
@@ -543,9 +543,8 @@ void NodeInstanceView::auxiliaryDataChanged(const ModelNode &node,
                     ChangeValuesCommand changeValueCommand({container});
                     m_nodeInstanceServer->changePropertyValues(changeValueCommand);
                 } else if (node.hasBindingProperty(name)) {
-                    PropertyBindingContainer container(instance.instanceId(), name, node.bindingProperty(name).expression(), TypeName());
-                    ChangeBindingsCommand changeValueCommand({container});
-                    m_nodeInstanceServer->changePropertyBindings(changeValueCommand);
+                    PropertyBindingContainer container{instance.instanceId(), name, node.bindingProperty(name).expression(), TypeName()};
+                    m_nodeInstanceServer->changePropertyBindings({{container}});
                 }
             }
         }
@@ -1131,7 +1130,7 @@ ChangeBindingsCommand NodeInstanceView::createChangeBindingCommand(const QList<B
 {
     QVector<PropertyBindingContainer> containerList;
 
-    foreach (const BindingProperty &property, propertyList) {
+    for (const BindingProperty &property : propertyList) {
         ModelNode node = property.parentModelNode();
         if (node.isValid() && hasInstanceForModelNode(node)) {
             NodeInstance instance = instanceForModelNode(node);
@@ -1141,7 +1140,7 @@ ChangeBindingsCommand NodeInstanceView::createChangeBindingCommand(const QList<B
 
     }
 
-    return ChangeBindingsCommand(containerList);
+    return {containerList};
 }
 
 ChangeIdsCommand NodeInstanceView::createChangeIdsCommand(const QList<NodeInstance> &instanceList) const