QmlPuppet: Refactor ChangeBindingsCommand

Change-Id: Id3020a73f59a1adfd25066a37d083d923e77956b
Reviewed-by: Marco Bubke <marco.bubke@qt.io>

4 files changed, 14 insertions, 42 deletions

diff --git a/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.cpp
index 1846b260b2..7603e4be29 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 b2df9e326c..a23f896712 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.h
@@ -34,23 +34,21 @@ namespace QmlDesigner {
 
 class ChangeBindingsCommand
 {
-    friend QDataStream &operator>>(QDataStream &in, ChangeBindingsCommand &command);
-    friend QDebug operator <<(QDebug debug, const ChangeBindingsCommand &command);
-
 public:
-    ChangeBindingsCommand();
-    explicit ChangeBindingsCommand(const QVector<PropertyBindingContainer> &bindingChangeVector);
-
-    QVector<PropertyBindingContainer> bindingChanges() const;
+    friend QDataStream &operator>>(QDataStream &in, ChangeBindingsCommand &command) {
+        in >> command.bindingChanges;
+        return in;
+    }
 
-private:
-    QVector<PropertyBindingContainer> m_bindingChangeVector;
-};
+    friend QDataStream &operator<<(QDataStream &out, const ChangeBindingsCommand &command) {
+        out << command.bindingChanges;
+        return out;
+    }
 
-QDataStream &operator<<(QDataStream &out, const ChangeBindingsCommand &command);
-QDataStream &operator>>(QDataStream &in, ChangeBindingsCommand &command);
+    friend QDebug operator <<(QDebug debug, const ChangeBindingsCommand &command);
 
-QDebug operator <<(QDebug debug, const ChangeBindingsCommand &command);
+    QVector<PropertyBindingContainer> bindingChanges;
+};
 
 } // namespace QmlDesigner
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
index 1148e0c6d2..6a0f75fe88 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 3e635909ec..067c8c9468 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);
     }