From 44a3c092a04f1112909fd08aad1d6d95248d62a4 Mon Sep 17 00:00:00 2001
From: Michael Winkelmann <michael.winkelmann@qt.io>
Date: Wed, 19 Aug 2020 16:54:09 +0200
Subject: QmlPuppet: Refactor ChangeIdsCommand

Change-Id: I75de863121b66a5050226dd5c8914229cb1af608
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
---
 .../qml/qmlpuppet/commands/changeidscommand.cpp    | 28 +--------------------
 .../qml/qmlpuppet/commands/changeidscommand.h      | 29 +++++++++++-----------
 .../qml2puppet/instances/nodeinstanceserver.cpp    |  2 +-
 .../instances/qt5informationnodeinstanceserver.cpp |  3 +--
 .../instances/qt5testnodeinstanceserver.cpp        |  2 +-
 5 files changed, 18 insertions(+), 46 deletions(-)

(limited to 'share')

diff --git a/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.cpp
index a0a41df654..ff0974b1fd 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.cpp
@@ -29,35 +29,9 @@
 
 namespace QmlDesigner {
 
-ChangeIdsCommand::ChangeIdsCommand() = default;
-
-ChangeIdsCommand::ChangeIdsCommand(const QVector<IdContainer> &idVector)
-    : m_idVector(idVector)
-{
-}
-
-QVector<IdContainer> ChangeIdsCommand::ids() const
-{
-    return m_idVector;
-}
-
-QDataStream &operator<<(QDataStream &out, const ChangeIdsCommand &command)
-{
-    out << command.ids();
-
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, ChangeIdsCommand &command)
-{
-    in >> command.m_idVector;
-
-    return in;
-}
-
 QDebug operator <<(QDebug debug, const ChangeIdsCommand &command)
 {
-    return debug.nospace() << "ChangeIdsCommand(ids: " << command.m_idVector << ")";
+    return debug.nospace() << "ChangeIdsCommand(ids: " << command.ids << ")";
 }
 
 } // namespace QmlDesigner
diff --git a/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h b/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h
index b92fb3b558..cb6ec1a617 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h
@@ -27,7 +27,7 @@
 
 #include <QMetaType>
 #include <QVector>
-
+#include <QDataStream>
 
 #include "idcontainer.h"
 
@@ -35,24 +35,23 @@ namespace QmlDesigner {
 
 class ChangeIdsCommand
 {
-    friend QDataStream &operator>>(QDataStream &in, ChangeIdsCommand &command);
-    friend QDebug operator <<(QDebug debug, const ChangeIdsCommand &command);
-
 public:
-    ChangeIdsCommand();
-    explicit ChangeIdsCommand(const QVector<IdContainer> &idVector);
-
-    QVector<IdContainer> ids() const;
+    friend QDataStream &operator>>(QDataStream &in, ChangeIdsCommand &command)
+    {
+        in >> command.ids;
+        return in;
+    }
+
+    friend QDataStream &operator<<(QDataStream &out, const ChangeIdsCommand &command)
+    {
+        out << command.ids;
+        return out;
+    }
+    friend QDebug operator <<(QDebug debug, const ChangeIdsCommand &command);
 
-private:
-    QVector<IdContainer> m_idVector;
+    QVector<IdContainer> ids;
 };
 
-QDataStream &operator<<(QDataStream &out, const ChangeIdsCommand &command);
-QDataStream &operator>>(QDataStream &in, ChangeIdsCommand &command);
-
-QDebug operator <<(QDebug debug, const ChangeIdsCommand &command);
-
 } // namespace QmlDesigner
 
 Q_DECLARE_METATYPE(QmlDesigner::ChangeIdsCommand)
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
index 2e7ac11f9d..368f99a033 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
@@ -656,7 +656,7 @@ void NodeInstanceServer::changePropertyBindings(const ChangeBindingsCommand &com
 
 void NodeInstanceServer::changeIds(const ChangeIdsCommand &command)
 {
-    foreach (const IdContainer &container, command.ids()) {
+    for (const IdContainer &container : command.ids) {
         if (hasInstanceForId(container.instanceId()))
             instanceForId(container.instanceId()).setId(container.id());
     }
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
index 2a2c7fce8f..6b6cbefa5e 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
@@ -1261,8 +1261,7 @@ void Qt5InformationNodeInstanceServer::changeIds(const ChangeIdsCommand &command
             updateActiveSceneToEditView3D();
     } else {
         qint32 sceneInstanceId = sceneInstance.instanceId();
-        const QVector<IdContainer> ids = command.ids();
-        for (const auto &id : ids) {
+        for (const auto &id : command.ids) {
             if (sceneInstanceId == id.instanceId()) {
                 QMetaObject::invokeMethod(m_editView3DRootItem, "handleActiveSceneIdChange",
                                           Qt::QueuedConnection,
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp
index 5b4e21d468..a6570b4a1e 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp
@@ -125,7 +125,7 @@ void Qt5TestNodeInstanceServer::changeAuxiliaryValues(const ChangeAuxiliaryComma
 
 void Qt5TestNodeInstanceServer::changeIds(const ChangeIdsCommand &command)
 {
-    foreach (const IdContainer &container, command.ids()) {
+    for (const IdContainer &container : command.ids) {
         if (hasInstanceForId(container.instanceId()))
             instanceForId(container.instanceId()).setId(container.id());
     }
-- 
cgit v1.2.3