From c7b5f6a2688ca8e003f427600badee721da17ca0 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 9 Apr 2025 13:42:42 +0200 Subject: [PATCH] QmlPuppet: Replace QVector with QList and clean up includes QVector is only a type alias, QList the real thing in Qt 6. Change-Id: I61070fa42ce349808717d0c225a4cbe99584dcc8 Reviewed-by: Marco Bubke --- .../commands/captureddatacommand.h | 4 +- .../commands/changeauxiliarycommand.h | 4 +- .../commands/changebindingscommand.h | 4 +- .../commands/changeidscommand.h | 4 +- .../commands/changeselectioncommand.cpp | 4 +- .../commands/changeselectioncommand.h | 10 ++-- .../commands/changestatecommand.h | 4 +- .../commands/changevaluescommand.cpp | 4 +- .../commands/changevaluescommand.h | 8 +-- .../commands/childrenchangedcommand.cpp | 6 +-- .../commands/childrenchangedcommand.h | 13 ++--- .../commands/completecomponentcommand.cpp | 4 +- .../commands/completecomponentcommand.h | 8 +-- .../commands/componentcompletedcommand.cpp | 4 +- .../commands/componentcompletedcommand.h | 9 ++-- .../commands/createinstancescommand.cpp | 4 +- .../commands/createinstancescommand.h | 8 +-- .../commands/createscenecommand.h | 39 +++++++------- .../commands/debugoutputcommand.cpp | 4 +- .../commands/debugoutputcommand.h | 10 ++-- .../commands/informationchangedcommand.cpp | 6 +-- .../commands/informationchangedcommand.h | 8 +-- .../commands/pixmapchangedcommand.cpp | 4 +- .../commands/pixmapchangedcommand.h | 6 +-- .../commands/removeinstancescommand.cpp | 4 +- .../commands/removeinstancescommand.h | 12 ++--- .../commands/removepropertiescommand.cpp | 4 +- .../commands/removepropertiescommand.h | 8 +-- .../commands/removesharedmemorycommand.cpp | 4 +- .../commands/removesharedmemorycommand.h | 8 +-- .../commands/reparentinstancescommand.cpp | 4 +- .../commands/reparentinstancescommand.h | 8 +-- .../statepreviewimagechangedcommand.cpp | 4 +- .../statepreviewimagechangedcommand.h | 6 +-- .../commands/synchronizecommand.h | 2 +- .../commands/tokencommand.cpp | 4 +- .../commands/tokencommand.h | 13 +++-- .../commands/valueschangedcommand.cpp | 12 ++--- .../commands/valueschangedcommand.h | 12 ++--- .../container/idcontainer.h | 3 +- .../instances/nodeinstanceserver.cpp | 52 +++++++++---------- .../qmlpuppet/instances/nodeinstanceserver.h | 29 +++++------ .../qt5capturepreviewnodeinstanceserver.cpp | 4 +- .../qt5informationnodeinstanceserver.cpp | 34 ++++++------ .../qt5informationnodeinstanceserver.h | 16 +++--- .../qt5previewnodeinstanceserver.cpp | 2 +- .../instances/qt5rendernodeinstanceserver.cpp | 10 ++-- .../instances/qt5testnodeinstanceserver.cpp | 2 +- 48 files changed, 213 insertions(+), 223 deletions(-) diff --git a/src/libs/qmlpuppetcommunication/commands/captureddatacommand.h b/src/libs/qmlpuppetcommunication/commands/captureddatacommand.h index 9246317365b..12caf32ebd0 100644 --- a/src/libs/qmlpuppetcommunication/commands/captureddatacommand.h +++ b/src/libs/qmlpuppetcommunication/commands/captureddatacommand.h @@ -131,7 +131,7 @@ public: CapturedDataCommand() = default; - CapturedDataCommand(QVector &&stateData) + CapturedDataCommand(QList &&stateData) : stateData{std::move(stateData)} {} @@ -157,7 +157,7 @@ public: public: QImage image; - QVector stateData; + QList stateData; }; } // namespace QmlDesigner diff --git a/src/libs/qmlpuppetcommunication/commands/changeauxiliarycommand.h b/src/libs/qmlpuppetcommunication/commands/changeauxiliarycommand.h index d36b9e90c23..c74ad7f4eca 100644 --- a/src/libs/qmlpuppetcommunication/commands/changeauxiliarycommand.h +++ b/src/libs/qmlpuppetcommunication/commands/changeauxiliarycommand.h @@ -5,8 +5,8 @@ #include #include +#include #include -#include #include "propertyvaluecontainer.h" @@ -29,7 +29,7 @@ public: friend QDebug operator <<(QDebug debug, const ChangeAuxiliaryCommand &command); - QVector auxiliaryChanges; + QList auxiliaryChanges; }; } // namespace QmlDesigner diff --git a/src/libs/qmlpuppetcommunication/commands/changebindingscommand.h b/src/libs/qmlpuppetcommunication/commands/changebindingscommand.h index 5e9464bbc54..bbab2987c8b 100644 --- a/src/libs/qmlpuppetcommunication/commands/changebindingscommand.h +++ b/src/libs/qmlpuppetcommunication/commands/changebindingscommand.h @@ -3,8 +3,8 @@ #pragma once +#include #include -#include #include "propertybindingcontainer.h" @@ -25,7 +25,7 @@ public: friend QDebug operator <<(QDebug debug, const ChangeBindingsCommand &command); - QVector bindingChanges; + QList bindingChanges; }; } // namespace QmlDesigner diff --git a/src/libs/qmlpuppetcommunication/commands/changeidscommand.h b/src/libs/qmlpuppetcommunication/commands/changeidscommand.h index b0325d96521..6e337012312 100644 --- a/src/libs/qmlpuppetcommunication/commands/changeidscommand.h +++ b/src/libs/qmlpuppetcommunication/commands/changeidscommand.h @@ -4,7 +4,7 @@ #pragma once #include -#include +#include #include #include "idcontainer.h" @@ -27,7 +27,7 @@ public: } friend QDebug operator <<(QDebug debug, const ChangeIdsCommand &command); - QVector ids; + QList ids; }; } // namespace QmlDesigner diff --git a/src/libs/qmlpuppetcommunication/commands/changeselectioncommand.cpp b/src/libs/qmlpuppetcommunication/commands/changeselectioncommand.cpp index e12172da9dc..5ca9c89e4b7 100644 --- a/src/libs/qmlpuppetcommunication/commands/changeselectioncommand.cpp +++ b/src/libs/qmlpuppetcommunication/commands/changeselectioncommand.cpp @@ -10,12 +10,12 @@ namespace QmlDesigner { ChangeSelectionCommand::ChangeSelectionCommand() = default; -ChangeSelectionCommand::ChangeSelectionCommand(const QVector &idVector) +ChangeSelectionCommand::ChangeSelectionCommand(const QList &idVector) : m_instanceIdVector(idVector) { } -QVector ChangeSelectionCommand::instanceIds() const +QList ChangeSelectionCommand::instanceIds() const { return m_instanceIdVector; } diff --git a/src/libs/qmlpuppetcommunication/commands/changeselectioncommand.h b/src/libs/qmlpuppetcommunication/commands/changeselectioncommand.h index 56e2cb38ccd..5b245c6cc6c 100644 --- a/src/libs/qmlpuppetcommunication/commands/changeselectioncommand.h +++ b/src/libs/qmlpuppetcommunication/commands/changeselectioncommand.h @@ -3,12 +3,10 @@ #pragma once +#include #include -#include #include -#include "instancecontainer.h" - namespace QmlDesigner { class ChangeSelectionCommand @@ -20,12 +18,12 @@ class ChangeSelectionCommand public: ChangeSelectionCommand(); - explicit ChangeSelectionCommand(const QVector &idVector); + explicit ChangeSelectionCommand(const QList &idVector); - QVector instanceIds() const; + QList instanceIds() const; private: - QVector m_instanceIdVector; + QList m_instanceIdVector; }; QDataStream &operator<<(QDataStream &out, const ChangeSelectionCommand &command); diff --git a/src/libs/qmlpuppetcommunication/commands/changestatecommand.h b/src/libs/qmlpuppetcommunication/commands/changestatecommand.h index 62cc39afc6d..fc6ce0dcaa2 100644 --- a/src/libs/qmlpuppetcommunication/commands/changestatecommand.h +++ b/src/libs/qmlpuppetcommunication/commands/changestatecommand.h @@ -3,10 +3,8 @@ #pragma once +#include #include -#include - -#include "propertyvaluecontainer.h" namespace QmlDesigner { diff --git a/src/libs/qmlpuppetcommunication/commands/changevaluescommand.cpp b/src/libs/qmlpuppetcommunication/commands/changevaluescommand.cpp index 0fb819d93c1..3a7765031f3 100644 --- a/src/libs/qmlpuppetcommunication/commands/changevaluescommand.cpp +++ b/src/libs/qmlpuppetcommunication/commands/changevaluescommand.cpp @@ -9,12 +9,12 @@ namespace QmlDesigner { ChangeValuesCommand::ChangeValuesCommand() = default; -ChangeValuesCommand::ChangeValuesCommand(const QVector &valueChangeVector) +ChangeValuesCommand::ChangeValuesCommand(const QList &valueChangeVector) : m_valueChangeVector (valueChangeVector) { } -const QVector ChangeValuesCommand::valueChanges() const +const QList ChangeValuesCommand::valueChanges() const { return m_valueChangeVector; } diff --git a/src/libs/qmlpuppetcommunication/commands/changevaluescommand.h b/src/libs/qmlpuppetcommunication/commands/changevaluescommand.h index 6dcea149056..3608dde7ffd 100644 --- a/src/libs/qmlpuppetcommunication/commands/changevaluescommand.h +++ b/src/libs/qmlpuppetcommunication/commands/changevaluescommand.h @@ -3,8 +3,8 @@ #pragma once +#include #include -#include #include "propertyvaluecontainer.h" @@ -17,12 +17,12 @@ class ChangeValuesCommand public: ChangeValuesCommand(); - explicit ChangeValuesCommand(const QVector &valueChangeVector); + explicit ChangeValuesCommand(const QList &valueChangeVector); - const QVector valueChanges() const; + const QList valueChanges() const; private: - QVector m_valueChangeVector; + QList m_valueChangeVector; }; QDataStream &operator<<(QDataStream &out, const ChangeValuesCommand &command); diff --git a/src/libs/qmlpuppetcommunication/commands/childrenchangedcommand.cpp b/src/libs/qmlpuppetcommunication/commands/childrenchangedcommand.cpp index bd805a56aa3..51421d1637a 100644 --- a/src/libs/qmlpuppetcommunication/commands/childrenchangedcommand.cpp +++ b/src/libs/qmlpuppetcommunication/commands/childrenchangedcommand.cpp @@ -14,14 +14,14 @@ ChildrenChangedCommand::ChildrenChangedCommand() { } -ChildrenChangedCommand::ChildrenChangedCommand(qint32 parentInstanceId, const QVector &children, const QVector &informationVector) +ChildrenChangedCommand::ChildrenChangedCommand(qint32 parentInstanceId, const QList &children, const QList &informationVector) : m_parentInstanceId(parentInstanceId), m_childrenVector(children), m_informationVector(informationVector) { } -QVector ChildrenChangedCommand::childrenInstances() const +QList ChildrenChangedCommand::childrenInstances() const { return m_childrenVector; } @@ -31,7 +31,7 @@ qint32 ChildrenChangedCommand::parentInstanceId() const return m_parentInstanceId; } -QVector ChildrenChangedCommand::informations() const +QList ChildrenChangedCommand::informations() const { return m_informationVector; } diff --git a/src/libs/qmlpuppetcommunication/commands/childrenchangedcommand.h b/src/libs/qmlpuppetcommunication/commands/childrenchangedcommand.h index f90383ef385..500593a435c 100644 --- a/src/libs/qmlpuppetcommunication/commands/childrenchangedcommand.h +++ b/src/libs/qmlpuppetcommunication/commands/childrenchangedcommand.h @@ -3,8 +3,9 @@ #pragma once +#include #include -#include + #include "informationcontainer.h" namespace QmlDesigner { @@ -16,18 +17,18 @@ class ChildrenChangedCommand public: ChildrenChangedCommand(); - explicit ChildrenChangedCommand(qint32 parentInstanceId, const QVector &childrenInstancesconst, const QVector &informationVector); + explicit ChildrenChangedCommand(qint32 parentInstanceId, const QList &childrenInstancesconst, const QList &informationVector); - QVector childrenInstances() const; + QList childrenInstances() const; qint32 parentInstanceId() const; - QVector informations() const; + QList informations() const; void sort(); private: qint32 m_parentInstanceId; - QVector m_childrenVector; - QVector m_informationVector; + QList m_childrenVector; + QList m_informationVector; }; QDataStream &operator<<(QDataStream &out, const ChildrenChangedCommand &command); diff --git a/src/libs/qmlpuppetcommunication/commands/completecomponentcommand.cpp b/src/libs/qmlpuppetcommunication/commands/completecomponentcommand.cpp index 9eda245dbfb..b3832866ffc 100644 --- a/src/libs/qmlpuppetcommunication/commands/completecomponentcommand.cpp +++ b/src/libs/qmlpuppetcommunication/commands/completecomponentcommand.cpp @@ -10,12 +10,12 @@ namespace QmlDesigner { CompleteComponentCommand::CompleteComponentCommand() = default; -CompleteComponentCommand::CompleteComponentCommand(const QVector &container) +CompleteComponentCommand::CompleteComponentCommand(const QList &container) : m_instanceVector(container) { } -const QVector CompleteComponentCommand::instances() const +const QList CompleteComponentCommand::instances() const { return m_instanceVector; } diff --git a/src/libs/qmlpuppetcommunication/commands/completecomponentcommand.h b/src/libs/qmlpuppetcommunication/commands/completecomponentcommand.h index 82955e8ca84..aaa5814844e 100644 --- a/src/libs/qmlpuppetcommunication/commands/completecomponentcommand.h +++ b/src/libs/qmlpuppetcommunication/commands/completecomponentcommand.h @@ -3,8 +3,8 @@ #pragma once +#include #include -#include #include namespace QmlDesigner { @@ -16,12 +16,12 @@ class CompleteComponentCommand public: CompleteComponentCommand(); - explicit CompleteComponentCommand(const QVector &container); + explicit CompleteComponentCommand(const QList &container); - const QVector instances() const; + const QList instances() const; private: - QVector m_instanceVector; + QList m_instanceVector; }; QDataStream &operator<<(QDataStream &out, const CompleteComponentCommand &command); diff --git a/src/libs/qmlpuppetcommunication/commands/componentcompletedcommand.cpp b/src/libs/qmlpuppetcommunication/commands/componentcompletedcommand.cpp index 725e6d72f82..313ece9cf4a 100644 --- a/src/libs/qmlpuppetcommunication/commands/componentcompletedcommand.cpp +++ b/src/libs/qmlpuppetcommunication/commands/componentcompletedcommand.cpp @@ -12,12 +12,12 @@ namespace QmlDesigner { ComponentCompletedCommand::ComponentCompletedCommand() = default; -ComponentCompletedCommand::ComponentCompletedCommand(const QVector &container) +ComponentCompletedCommand::ComponentCompletedCommand(const QList &container) : m_instanceVector(container) { } -QVector ComponentCompletedCommand::instances() const +QList ComponentCompletedCommand::instances() const { return m_instanceVector; } diff --git a/src/libs/qmlpuppetcommunication/commands/componentcompletedcommand.h b/src/libs/qmlpuppetcommunication/commands/componentcompletedcommand.h index a0baee93a67..e612e6c2cb3 100644 --- a/src/libs/qmlpuppetcommunication/commands/componentcompletedcommand.h +++ b/src/libs/qmlpuppetcommunication/commands/componentcompletedcommand.h @@ -2,8 +2,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #pragma once + +#include #include -#include #include namespace QmlDesigner { @@ -15,14 +16,14 @@ class ComponentCompletedCommand public: ComponentCompletedCommand(); - explicit ComponentCompletedCommand(const QVector &container); + explicit ComponentCompletedCommand(const QList &container); - QVector instances() const; + QList instances() const; void sort(); private: - QVector m_instanceVector; + QList m_instanceVector; }; QDataStream &operator<<(QDataStream &out, const ComponentCompletedCommand &command); diff --git a/src/libs/qmlpuppetcommunication/commands/createinstancescommand.cpp b/src/libs/qmlpuppetcommunication/commands/createinstancescommand.cpp index af18a2df00f..043b493489d 100644 --- a/src/libs/qmlpuppetcommunication/commands/createinstancescommand.cpp +++ b/src/libs/qmlpuppetcommunication/commands/createinstancescommand.cpp @@ -10,12 +10,12 @@ namespace QmlDesigner { CreateInstancesCommand::CreateInstancesCommand() = default; -CreateInstancesCommand::CreateInstancesCommand(const QVector &container) +CreateInstancesCommand::CreateInstancesCommand(const QList &container) : m_instanceVector(container) { } -QVector CreateInstancesCommand::instances() const +QList CreateInstancesCommand::instances() const { return m_instanceVector; } diff --git a/src/libs/qmlpuppetcommunication/commands/createinstancescommand.h b/src/libs/qmlpuppetcommunication/commands/createinstancescommand.h index de056244452..110bdc9eb28 100644 --- a/src/libs/qmlpuppetcommunication/commands/createinstancescommand.h +++ b/src/libs/qmlpuppetcommunication/commands/createinstancescommand.h @@ -3,8 +3,8 @@ #pragma once +#include #include -#include #include "instancecontainer.h" @@ -16,12 +16,12 @@ class CreateInstancesCommand public: CreateInstancesCommand(); - explicit CreateInstancesCommand(const QVector &container); + explicit CreateInstancesCommand(const QList &container); - QVector instances() const; + QList instances() const; private: - QVector m_instanceVector; + QList m_instanceVector; }; QDataStream &operator<<(QDataStream &out, const CreateInstancesCommand &command); diff --git a/src/libs/qmlpuppetcommunication/commands/createscenecommand.h b/src/libs/qmlpuppetcommunication/commands/createscenecommand.h index 80456169db5..5f6b7836b49 100644 --- a/src/libs/qmlpuppetcommunication/commands/createscenecommand.h +++ b/src/libs/qmlpuppetcommunication/commands/createscenecommand.h @@ -3,12 +3,11 @@ #pragma once +#include +#include +#include #include #include -#include -#include -#include -#include #include "instancecontainer.h" #include "reparentcontainer.h" @@ -24,14 +23,14 @@ class CreateSceneCommand { public: CreateSceneCommand() = default; - explicit CreateSceneCommand(const QVector &instanceContainer, - const QVector &reparentContainer, - const QVector &idVector, - const QVector &valueChangeVector, - const QVector &bindingChangeVector, - const QVector &auxiliaryChangeVector, - const QVector &importVector, - const QVector &mockupTypeVector, + explicit CreateSceneCommand(const QList &instanceContainer, + const QList &reparentContainer, + const QList &idVector, + const QList &valueChangeVector, + const QList &bindingChangeVector, + const QList &auxiliaryChangeVector, + const QList &importVector, + const QList &mockupTypeVector, const QUrl &fileUrl, const QUrl &resourceUrl, const QHash &edit3dToolStates, @@ -91,14 +90,14 @@ public: } public: - QVector instances; - QVector reparentInstances; - QVector ids; - QVector valueChanges; - QVector bindingChanges; - QVector auxiliaryChanges; - QVector imports; - QVector mockupTypes; + QList instances; + QList reparentInstances; + QList ids; + QList valueChanges; + QList bindingChanges; + QList auxiliaryChanges; + QList imports; + QList mockupTypes; QUrl fileUrl; QUrl resourceUrl; QHash edit3dToolStates; diff --git a/src/libs/qmlpuppetcommunication/commands/debugoutputcommand.cpp b/src/libs/qmlpuppetcommunication/commands/debugoutputcommand.cpp index e10bce7cff7..b4124088373 100644 --- a/src/libs/qmlpuppetcommunication/commands/debugoutputcommand.cpp +++ b/src/libs/qmlpuppetcommunication/commands/debugoutputcommand.cpp @@ -9,7 +9,7 @@ namespace QmlDesigner { DebugOutputCommand::DebugOutputCommand() = default; -DebugOutputCommand::DebugOutputCommand(const QString &text, DebugOutputCommand::Type type, const QVector &instanceIds) +DebugOutputCommand::DebugOutputCommand(const QString &text, DebugOutputCommand::Type type, const QList &instanceIds) : m_instanceIds(instanceIds) , m_text(text) , m_type(type) @@ -26,7 +26,7 @@ QString DebugOutputCommand::text() const return m_text; } -QVector DebugOutputCommand::instanceIds() const +QList DebugOutputCommand::instanceIds() const { return m_instanceIds; } diff --git a/src/libs/qmlpuppetcommunication/commands/debugoutputcommand.h b/src/libs/qmlpuppetcommunication/commands/debugoutputcommand.h index 7818ce629be..05e0d240995 100644 --- a/src/libs/qmlpuppetcommunication/commands/debugoutputcommand.h +++ b/src/libs/qmlpuppetcommunication/commands/debugoutputcommand.h @@ -3,10 +3,10 @@ #pragma once +#include +#include #include #include -#include -#include namespace QmlDesigner { @@ -24,14 +24,14 @@ public: }; DebugOutputCommand(); - explicit DebugOutputCommand(const QString &text, Type type, const QVector &instanceIds); + explicit DebugOutputCommand(const QString &text, Type type, const QList &instanceIds); qint32 type() const; QString text() const; - QVector instanceIds() const; + QList instanceIds() const; private: - QVector m_instanceIds; + QList m_instanceIds; QString m_text; quint32 m_type; }; diff --git a/src/libs/qmlpuppetcommunication/commands/informationchangedcommand.cpp b/src/libs/qmlpuppetcommunication/commands/informationchangedcommand.cpp index 80dda76b23b..5cf4f9fc52b 100644 --- a/src/libs/qmlpuppetcommunication/commands/informationchangedcommand.cpp +++ b/src/libs/qmlpuppetcommunication/commands/informationchangedcommand.cpp @@ -6,20 +6,18 @@ #include #include -#include "propertyvaluecontainer.h" - #include namespace QmlDesigner { InformationChangedCommand::InformationChangedCommand() = default; -InformationChangedCommand::InformationChangedCommand(const QVector &informationVector) +InformationChangedCommand::InformationChangedCommand(const QList &informationVector) : m_informationVector(informationVector) { } -QVector InformationChangedCommand::informations() const +QList InformationChangedCommand::informations() const { return m_informationVector; } diff --git a/src/libs/qmlpuppetcommunication/commands/informationchangedcommand.h b/src/libs/qmlpuppetcommunication/commands/informationchangedcommand.h index 3181f185f34..c2dfcaa6381 100644 --- a/src/libs/qmlpuppetcommunication/commands/informationchangedcommand.h +++ b/src/libs/qmlpuppetcommunication/commands/informationchangedcommand.h @@ -3,8 +3,8 @@ #pragma once +#include #include -#include #include "informationcontainer.h" @@ -17,14 +17,14 @@ class InformationChangedCommand public: InformationChangedCommand(); - explicit InformationChangedCommand(const QVector &informationVector); + explicit InformationChangedCommand(const QList &informationVector); - QVector informations() const; + QList informations() const; void sort(); private: - QVector m_informationVector; + QList m_informationVector; }; QDataStream &operator<<(QDataStream &out, const InformationChangedCommand &command); diff --git a/src/libs/qmlpuppetcommunication/commands/pixmapchangedcommand.cpp b/src/libs/qmlpuppetcommunication/commands/pixmapchangedcommand.cpp index 18f35043c11..57073722160 100644 --- a/src/libs/qmlpuppetcommunication/commands/pixmapchangedcommand.cpp +++ b/src/libs/qmlpuppetcommunication/commands/pixmapchangedcommand.cpp @@ -13,12 +13,12 @@ namespace QmlDesigner { PixmapChangedCommand::PixmapChangedCommand() = default; -PixmapChangedCommand::PixmapChangedCommand(const QVector &imageVector) +PixmapChangedCommand::PixmapChangedCommand(const QList &imageVector) : m_imageVector(imageVector) { } -QVector PixmapChangedCommand::images() const +QList PixmapChangedCommand::images() const { return m_imageVector; } diff --git a/src/libs/qmlpuppetcommunication/commands/pixmapchangedcommand.h b/src/libs/qmlpuppetcommunication/commands/pixmapchangedcommand.h index 72247f0c57c..d66289f1394 100644 --- a/src/libs/qmlpuppetcommunication/commands/pixmapchangedcommand.h +++ b/src/libs/qmlpuppetcommunication/commands/pixmapchangedcommand.h @@ -15,14 +15,14 @@ class PixmapChangedCommand public: PixmapChangedCommand(); - explicit PixmapChangedCommand(const QVector &imageVector); + explicit PixmapChangedCommand(const QList &imageVector); - QVector images() const; + QList images() const; void sort(); private: - QVector m_imageVector; + QList m_imageVector; }; QDataStream &operator<<(QDataStream &out, const PixmapChangedCommand &command); diff --git a/src/libs/qmlpuppetcommunication/commands/removeinstancescommand.cpp b/src/libs/qmlpuppetcommunication/commands/removeinstancescommand.cpp index f2289a3b543..7d89261096f 100644 --- a/src/libs/qmlpuppetcommunication/commands/removeinstancescommand.cpp +++ b/src/libs/qmlpuppetcommunication/commands/removeinstancescommand.cpp @@ -10,12 +10,12 @@ namespace QmlDesigner { RemoveInstancesCommand::RemoveInstancesCommand() = default; -RemoveInstancesCommand::RemoveInstancesCommand(const QVector &idVector) +RemoveInstancesCommand::RemoveInstancesCommand(const QList &idVector) : m_instanceIdVector(idVector) { } -const QVector RemoveInstancesCommand::instanceIds() const +const QList RemoveInstancesCommand::instanceIds() const { return m_instanceIdVector; } diff --git a/src/libs/qmlpuppetcommunication/commands/removeinstancescommand.h b/src/libs/qmlpuppetcommunication/commands/removeinstancescommand.h index 7c03a8970df..54766ba8d97 100644 --- a/src/libs/qmlpuppetcommunication/commands/removeinstancescommand.h +++ b/src/libs/qmlpuppetcommunication/commands/removeinstancescommand.h @@ -3,11 +3,9 @@ #pragma once -#include -#include #include - -#include "instancecontainer.h" +#include +#include namespace QmlDesigner { @@ -18,12 +16,12 @@ class RemoveInstancesCommand public: RemoveInstancesCommand(); - explicit RemoveInstancesCommand(const QVector &idVector); + explicit RemoveInstancesCommand(const QList &idVector); - const QVector instanceIds() const; + const QList instanceIds() const; private: - QVector m_instanceIdVector; + QList m_instanceIdVector; }; QDataStream &operator<<(QDataStream &out, const RemoveInstancesCommand &command); diff --git a/src/libs/qmlpuppetcommunication/commands/removepropertiescommand.cpp b/src/libs/qmlpuppetcommunication/commands/removepropertiescommand.cpp index b15e441c298..a19ee12c9f0 100644 --- a/src/libs/qmlpuppetcommunication/commands/removepropertiescommand.cpp +++ b/src/libs/qmlpuppetcommunication/commands/removepropertiescommand.cpp @@ -9,12 +9,12 @@ namespace QmlDesigner { RemovePropertiesCommand::RemovePropertiesCommand() = default; -RemovePropertiesCommand::RemovePropertiesCommand(const QVector &properties) +RemovePropertiesCommand::RemovePropertiesCommand(const QList &properties) : m_properties(properties) { } -const QVector RemovePropertiesCommand::properties() const +const QList RemovePropertiesCommand::properties() const { return m_properties; } diff --git a/src/libs/qmlpuppetcommunication/commands/removepropertiescommand.h b/src/libs/qmlpuppetcommunication/commands/removepropertiescommand.h index c5f32b4a5dd..f25e0947a58 100644 --- a/src/libs/qmlpuppetcommunication/commands/removepropertiescommand.h +++ b/src/libs/qmlpuppetcommunication/commands/removepropertiescommand.h @@ -3,8 +3,8 @@ #pragma once +#include #include -#include #include "propertyabstractcontainer.h" @@ -17,12 +17,12 @@ class RemovePropertiesCommand public: RemovePropertiesCommand(); - explicit RemovePropertiesCommand(const QVector &properties); + explicit RemovePropertiesCommand(const QList &properties); - const QVector properties() const; + const QList properties() const; private: - QVector m_properties; + QList m_properties; }; QDataStream &operator<<(QDataStream &out, const RemovePropertiesCommand &command); diff --git a/src/libs/qmlpuppetcommunication/commands/removesharedmemorycommand.cpp b/src/libs/qmlpuppetcommunication/commands/removesharedmemorycommand.cpp index 65e16b4752f..d7dd1eba26c 100644 --- a/src/libs/qmlpuppetcommunication/commands/removesharedmemorycommand.cpp +++ b/src/libs/qmlpuppetcommunication/commands/removesharedmemorycommand.cpp @@ -10,7 +10,7 @@ namespace QmlDesigner { RemoveSharedMemoryCommand::RemoveSharedMemoryCommand() = default; -RemoveSharedMemoryCommand::RemoveSharedMemoryCommand(const QString &typeName, const QVector &keyNumberVector) +RemoveSharedMemoryCommand::RemoveSharedMemoryCommand(const QString &typeName, const QList &keyNumberVector) : m_typeName(typeName), m_keyNumberVector(keyNumberVector) { @@ -21,7 +21,7 @@ QString RemoveSharedMemoryCommand::typeName() const return m_typeName; } -QVector RemoveSharedMemoryCommand::keyNumbers() const +QList RemoveSharedMemoryCommand::keyNumbers() const { return m_keyNumberVector; } diff --git a/src/libs/qmlpuppetcommunication/commands/removesharedmemorycommand.h b/src/libs/qmlpuppetcommunication/commands/removesharedmemorycommand.h index 60081608b3b..4d601234706 100644 --- a/src/libs/qmlpuppetcommunication/commands/removesharedmemorycommand.h +++ b/src/libs/qmlpuppetcommunication/commands/removesharedmemorycommand.h @@ -3,9 +3,9 @@ #pragma once +#include #include #include -#include namespace QmlDesigner { @@ -16,14 +16,14 @@ class RemoveSharedMemoryCommand public: RemoveSharedMemoryCommand(); - explicit RemoveSharedMemoryCommand(const QString &typeName, const QVector &keyNumberVector); + explicit RemoveSharedMemoryCommand(const QString &typeName, const QList &keyNumberVector); QString typeName() const; - QVector keyNumbers() const; + QList keyNumbers() const; private: QString m_typeName; - QVector m_keyNumberVector; + QList m_keyNumberVector; }; QDataStream &operator<<(QDataStream &out, const RemoveSharedMemoryCommand &command); diff --git a/src/libs/qmlpuppetcommunication/commands/reparentinstancescommand.cpp b/src/libs/qmlpuppetcommunication/commands/reparentinstancescommand.cpp index 3de6b4f90c5..b260cd4e711 100644 --- a/src/libs/qmlpuppetcommunication/commands/reparentinstancescommand.cpp +++ b/src/libs/qmlpuppetcommunication/commands/reparentinstancescommand.cpp @@ -10,12 +10,12 @@ namespace QmlDesigner { ReparentInstancesCommand::ReparentInstancesCommand() = default; -ReparentInstancesCommand::ReparentInstancesCommand(const QVector &container) +ReparentInstancesCommand::ReparentInstancesCommand(const QList &container) : m_reparentInstanceVector(container) { } -const QVector ReparentInstancesCommand::reparentInstances() const +const QList ReparentInstancesCommand::reparentInstances() const { return m_reparentInstanceVector; } diff --git a/src/libs/qmlpuppetcommunication/commands/reparentinstancescommand.h b/src/libs/qmlpuppetcommunication/commands/reparentinstancescommand.h index 4a5e55c4839..46c74e20917 100644 --- a/src/libs/qmlpuppetcommunication/commands/reparentinstancescommand.h +++ b/src/libs/qmlpuppetcommunication/commands/reparentinstancescommand.h @@ -3,8 +3,8 @@ #pragma once +#include #include -#include #include "reparentcontainer.h" @@ -17,12 +17,12 @@ class ReparentInstancesCommand public: ReparentInstancesCommand(); - explicit ReparentInstancesCommand(const QVector &container); + explicit ReparentInstancesCommand(const QList &container); - const QVector reparentInstances() const; + const QList reparentInstances() const; private: - QVector m_reparentInstanceVector; + QList m_reparentInstanceVector; }; QDataStream &operator<<(QDataStream &out, const ReparentInstancesCommand &command); diff --git a/src/libs/qmlpuppetcommunication/commands/statepreviewimagechangedcommand.cpp b/src/libs/qmlpuppetcommunication/commands/statepreviewimagechangedcommand.cpp index 5d7f6e85663..75ce5c00b7a 100644 --- a/src/libs/qmlpuppetcommunication/commands/statepreviewimagechangedcommand.cpp +++ b/src/libs/qmlpuppetcommunication/commands/statepreviewimagechangedcommand.cpp @@ -11,12 +11,12 @@ namespace QmlDesigner { StatePreviewImageChangedCommand::StatePreviewImageChangedCommand() = default; -StatePreviewImageChangedCommand::StatePreviewImageChangedCommand(const QVector &imageVector) +StatePreviewImageChangedCommand::StatePreviewImageChangedCommand(const QList &imageVector) : m_previewVector(imageVector) { } -QVector StatePreviewImageChangedCommand::previews()const +QList StatePreviewImageChangedCommand::previews() const { return m_previewVector; } diff --git a/src/libs/qmlpuppetcommunication/commands/statepreviewimagechangedcommand.h b/src/libs/qmlpuppetcommunication/commands/statepreviewimagechangedcommand.h index 81c55890110..3ffb0771840 100644 --- a/src/libs/qmlpuppetcommunication/commands/statepreviewimagechangedcommand.h +++ b/src/libs/qmlpuppetcommunication/commands/statepreviewimagechangedcommand.h @@ -16,14 +16,14 @@ class StatePreviewImageChangedCommand public: StatePreviewImageChangedCommand(); - explicit StatePreviewImageChangedCommand(const QVector &imageVector); + explicit StatePreviewImageChangedCommand(const QList &imageVector); - QVector previews() const; + QList previews() const; void sort(); private: - QVector m_previewVector; + QList m_previewVector; }; QDataStream &operator<<(QDataStream &out, const StatePreviewImageChangedCommand &command); diff --git a/src/libs/qmlpuppetcommunication/commands/synchronizecommand.h b/src/libs/qmlpuppetcommunication/commands/synchronizecommand.h index e0c2c3a0397..da9f1ed6408 100644 --- a/src/libs/qmlpuppetcommunication/commands/synchronizecommand.h +++ b/src/libs/qmlpuppetcommunication/commands/synchronizecommand.h @@ -4,8 +4,8 @@ #pragma once #include +#include #include -#include namespace QmlDesigner { diff --git a/src/libs/qmlpuppetcommunication/commands/tokencommand.cpp b/src/libs/qmlpuppetcommunication/commands/tokencommand.cpp index 7d9aa45ad03..23892105ae0 100644 --- a/src/libs/qmlpuppetcommunication/commands/tokencommand.cpp +++ b/src/libs/qmlpuppetcommunication/commands/tokencommand.cpp @@ -15,7 +15,7 @@ TokenCommand::TokenCommand() { } -TokenCommand::TokenCommand(const QString &tokenName, qint32 tokenNumber, const QVector &instanceIdVector) +TokenCommand::TokenCommand(const QString &tokenName, qint32 tokenNumber, const QList &instanceIdVector) : m_tokenName(tokenName), m_tokenNumber(tokenNumber), m_instanceIdVector(instanceIdVector) @@ -32,7 +32,7 @@ qint32 TokenCommand::tokenNumber() const return m_tokenNumber; } -QVector TokenCommand::instances() const +QList TokenCommand::instances() const { return m_instanceIdVector; } diff --git a/src/libs/qmlpuppetcommunication/commands/tokencommand.h b/src/libs/qmlpuppetcommunication/commands/tokencommand.h index 1d249c20e9d..690c630fcb1 100644 --- a/src/libs/qmlpuppetcommunication/commands/tokencommand.h +++ b/src/libs/qmlpuppetcommunication/commands/tokencommand.h @@ -3,11 +3,10 @@ #pragma once - -#include -#include -#include #include +#include +#include +#include namespace QmlDesigner { @@ -18,18 +17,18 @@ class TokenCommand public: TokenCommand(); - explicit TokenCommand(const QString &tokenName, qint32 tokenNumber, const QVector &instances); + explicit TokenCommand(const QString &tokenName, qint32 tokenNumber, const QList &instances); QString tokenName() const; qint32 tokenNumber() const; - QVector instances() const; + QList instances() const; void sort(); private: QString m_tokenName; qint32 m_tokenNumber; - QVector m_instanceIdVector; + QList m_instanceIdVector; }; QDataStream &operator<<(QDataStream &out, const TokenCommand &command); diff --git a/src/libs/qmlpuppetcommunication/commands/valueschangedcommand.cpp b/src/libs/qmlpuppetcommunication/commands/valueschangedcommand.cpp index e36b7bb3519..e702efe6041 100644 --- a/src/libs/qmlpuppetcommunication/commands/valueschangedcommand.cpp +++ b/src/libs/qmlpuppetcommunication/commands/valueschangedcommand.cpp @@ -24,13 +24,13 @@ ValuesChangedCommand::ValuesChangedCommand() { } -ValuesChangedCommand::ValuesChangedCommand(const QVector &valueChangeVector) +ValuesChangedCommand::ValuesChangedCommand(const QList &valueChangeVector) : m_valueChangeVector (valueChangeVector), m_keyNumber(0) { } -const QVector ValuesChangedCommand::valueChanges() const +const QList ValuesChangedCommand::valueChanges() const { return m_valueChangeVector; } @@ -40,7 +40,7 @@ quint32 ValuesChangedCommand::keyNumber() const return m_keyNumber; } -void ValuesChangedCommand::removeSharedMemorys(const QVector &keyNumberVector) +void ValuesChangedCommand::removeSharedMemorys(const QList &keyNumberVector) { for (qint32 keyNumber : keyNumberVector) { SharedMemory *sharedMemory = globalSharedMemoryContainer()->take(keyNumber); @@ -75,7 +75,7 @@ QDataStream &operator<<(QDataStream &out, const ValuesChangedCommand &command) { static const bool dontUseSharedMemory = qEnvironmentVariableIsSet("DESIGNER_DONT_USE_SHARED_MEMORY"); - QVector propertyValueContainer = command.valueChanges(); + QList propertyValueContainer = command.valueChanges(); if (command.transactionOption != ValuesChangedCommand::TransactionOption::None) { PropertyValueContainer optionContainer(command.transactionOption); @@ -114,7 +114,7 @@ QDataStream &operator<<(QDataStream &out, const ValuesChangedCommand &command) return out; } -void readSharedMemory(qint32 key, QVector *valueChangeVector) +void readSharedMemory(qint32 key, QList *valueChangeVector) { SharedMemory sharedMemory(QString(valueKeyTemplateString).arg(key)); bool canAttach = sharedMemory.attach(QSharedMemory::ReadOnly); @@ -135,7 +135,7 @@ QDataStream &operator>>(QDataStream &in, ValuesChangedCommand &command) { in >> command.m_keyNumber; - QVector valueChangeVector; + QList valueChangeVector; if (command.keyNumber() > 0) readSharedMemory(command.keyNumber(), &valueChangeVector); diff --git a/src/libs/qmlpuppetcommunication/commands/valueschangedcommand.h b/src/libs/qmlpuppetcommunication/commands/valueschangedcommand.h index 43ce0b7d59c..17e3e3be56c 100644 --- a/src/libs/qmlpuppetcommunication/commands/valueschangedcommand.h +++ b/src/libs/qmlpuppetcommunication/commands/valueschangedcommand.h @@ -3,8 +3,8 @@ #pragma once +#include #include -#include #include "propertyvaluecontainer.h" @@ -19,18 +19,18 @@ class ValuesChangedCommand public: enum TransactionOption { Start = 1, End = 2, None = 0 }; ValuesChangedCommand(); - explicit ValuesChangedCommand(const QVector &valueChangeVector); + explicit ValuesChangedCommand(const QList &valueChangeVector); - const QVector valueChanges() const; + const QList valueChanges() const; quint32 keyNumber() const; - static void removeSharedMemorys(const QVector &keyNumberVector); + static void removeSharedMemorys(const QList &keyNumberVector); void sort(); TransactionOption transactionOption = TransactionOption::None; private: - QVector m_valueChangeVector; + QList m_valueChangeVector; mutable quint32 m_keyNumber; }; @@ -51,7 +51,7 @@ class ValuesModifiedCommand : public ValuesChangedCommand public: ValuesModifiedCommand() = default; - explicit ValuesModifiedCommand(const QVector &valueChangeVector) + explicit ValuesModifiedCommand(const QList &valueChangeVector) : ValuesChangedCommand(valueChangeVector) {} }; diff --git a/src/libs/qmlpuppetcommunication/container/idcontainer.h b/src/libs/qmlpuppetcommunication/container/idcontainer.h index 7e6c8260526..025e76fa05a 100644 --- a/src/libs/qmlpuppetcommunication/container/idcontainer.h +++ b/src/libs/qmlpuppetcommunication/container/idcontainer.h @@ -4,10 +4,9 @@ #pragma once #include -#include +#include #include - namespace QmlDesigner { class IdContainer diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.cpp b/src/tools/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.cpp index 9d8e6e65f8e..eb8d2083e2e 100644 --- a/src/tools/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.cpp +++ b/src/tools/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.cpp @@ -182,7 +182,7 @@ NodeInstanceServer::~NodeInstanceServer() m_objectInstanceHash.clear(); } -QList NodeInstanceServer::createInstances(const QVector &containerVector) +QList NodeInstanceServer::createInstances(const QList &containerVector) { Q_ASSERT(declarativeView() || quickWindow()); QList instanceList; @@ -349,7 +349,7 @@ void NodeInstanceServer::removeInstances(const RemoveInstancesCommand &command) if (activeStateInstance().isValid()) activeStateInstance().deactivateState(); - const QVector instanceIds = command.instanceIds(); + const QList instanceIds = command.instanceIds(); for (qint32 instanceId : instanceIds) removeInstanceRelationsip(instanceId); @@ -363,7 +363,7 @@ void NodeInstanceServer::removeInstances(const RemoveInstancesCommand &command) void NodeInstanceServer::removeProperties(const RemovePropertiesCommand &command) { bool hasDynamicProperties = false; - const QVector props = command.properties(); + const QList props = command.properties(); for (const PropertyAbstractContainer &container : props) { hasDynamicProperties |= container.isDynamic(); resetInstanceProperty(container); @@ -375,7 +375,7 @@ void NodeInstanceServer::removeProperties(const RemovePropertiesCommand &command startRenderTimer(); } -void NodeInstanceServer::reparentInstances(const QVector &containerVector) +void NodeInstanceServer::reparentInstances(const QList &containerVector) { for (const ReparentContainer &container : containerVector) { if (hasInstanceForId(container.instanceId())) { @@ -418,7 +418,7 @@ void NodeInstanceServer::completeComponent(const CompleteComponentCommand &comma { QList instanceList; - const QVector instanceIds = command.instances(); + const QList instanceIds = command.instances(); for (qint32 instanceId : instanceIds) { if (hasInstanceForId(instanceId)) { ServerNodeInstance instance = instanceForId(instanceId); @@ -449,7 +449,7 @@ void NodeInstanceServer::removeSharedMemory(const RemoveSharedMemoryCommand &/*c { } -void NodeInstanceServer::setupImports(const QVector &containerVector) +void NodeInstanceServer::setupImports(const QList &containerVector) { Q_ASSERT(quickWindow()); QSet importStatementSet; @@ -622,7 +622,7 @@ void NodeInstanceServer::changeFileUrl(const ChangeFileUrlCommand &command) void NodeInstanceServer::changePropertyValues(const ChangeValuesCommand &command) { bool hasDynamicProperties = false; - const QVector valueChanges = command.valueChanges(); + const QList valueChanges = command.valueChanges(); for (const PropertyValueContainer &container : valueChanges) { hasDynamicProperties |= container.isDynamic(); setInstancePropertyVariant(container); @@ -636,7 +636,7 @@ void NodeInstanceServer::changePropertyValues(const ChangeValuesCommand &command void NodeInstanceServer::changeAuxiliaryValues(const ChangeAuxiliaryCommand &command) { - const QVector auxiliaryChanges = command.auxiliaryChanges; + const QList auxiliaryChanges = command.auxiliaryChanges; for (const PropertyValueContainer &container : auxiliaryChanges) setInstanceAuxiliaryData(container); @@ -646,7 +646,7 @@ void NodeInstanceServer::changeAuxiliaryValues(const ChangeAuxiliaryCommand &com void NodeInstanceServer::changePropertyBindings(const ChangeBindingsCommand &command) { bool hasDynamicProperties = false; - const QVector bindingChanges = command.bindingChanges; + const QList bindingChanges = command.bindingChanges; for (const PropertyBindingContainer &container : bindingChanges) { hasDynamicProperties |= container.isDynamic(); setInstancePropertyBinding(container); @@ -688,7 +688,7 @@ QQmlContext *NodeInstanceServer::rootContext() const return engine()->rootContext(); } -const QVector NodeInstanceServer::changedPropertyList() const +const QList NodeInstanceServer::changedPropertyList() const { return m_changedPropertyList; } @@ -724,7 +724,7 @@ static bool isTypeAvailable(const MockupTypeContainer &mockupType, QQmlEngine *e return !component.isError(); } -void NodeInstanceServer::setupMockupTypes(const QVector &container) +void NodeInstanceServer::setupMockupTypes(const QList &container) { for (const MockupTypeContainer &mockupType : container) { if (!isTypeAvailable(mockupType, engine())) { @@ -1082,9 +1082,9 @@ NodeInstanceClientInterface *NodeInstanceServer::nodeInstanceClient() const return m_nodeInstanceClient; } -static QVector createInformationVector(const QList &instanceList, bool initial) +static QList createInformationVector(const QList &instanceList, bool initial) { - QVector informationVector; + QList informationVector; for (const ServerNodeInstance &instance : instanceList) { if (instance.isValid()) { @@ -1166,7 +1166,7 @@ static QVector createInformationVector(const QList &instanceList) const { - QVector instanceVector; + QList instanceVector; for (const ServerNodeInstance &instance : instanceList) instanceVector.append(instance.instanceId()); @@ -1190,7 +1190,7 @@ static bool supportedVariantType(int type) ValuesChangedCommand NodeInstanceServer::createValuesChangedCommand(const QList &instanceList) const { - QVector valueVector; + QList valueVector; for (const ServerNodeInstance &instance : instanceList) { const QList propertyNames = instance.propertyNames(); @@ -1208,7 +1208,7 @@ ValuesChangedCommand NodeInstanceServer::createValuesChangedCommand(const QList< ComponentCompletedCommand NodeInstanceServer::createComponentCompletedCommand(const QList &instanceList) { - QVector idVector; + QList idVector; for (const ServerNodeInstance &instance : instanceList) { if (instance.instanceId() >= 0) idVector.append(instance.instanceId()); @@ -1219,7 +1219,7 @@ ComponentCompletedCommand NodeInstanceServer::createComponentCompletedCommand(co ChangeSelectionCommand NodeInstanceServer::createChangeSelectionCommand(const QList &instanceList) { - QVector idVector; + QList idVector; for (const ServerNodeInstance &instance : instanceList) { if (instance.instanceId() >= 0) idVector.append(instance.instanceId()); @@ -1228,9 +1228,9 @@ ChangeSelectionCommand NodeInstanceServer::createChangeSelectionCommand(const QL return ChangeSelectionCommand(idVector); } -ValuesChangedCommand NodeInstanceServer::createValuesChangedCommand(const QVector &propertyList) const +ValuesChangedCommand NodeInstanceServer::createValuesChangedCommand(const QList &propertyList) const { - QVector valueVector; + QList valueVector; for (const InstancePropertyPair &property : propertyList) { const PropertyName propertyName = property.second; @@ -1257,9 +1257,9 @@ ValuesChangedCommand NodeInstanceServer::createValuesChangedCommand(const QVecto } ValuesModifiedCommand NodeInstanceServer::createValuesModifiedCommand( - const QVector &propertyList) const + const QList &propertyList) const { - QVector valueVector; + QList valueVector; for (const InstancePropertyValueTriple &property : propertyList) { const PropertyName propertyName = property.propertyName; @@ -1322,7 +1322,7 @@ PixmapChangedCommand NodeInstanceServer::createPixmapChangedCommand(const QList< { NANOTRACE_SCOPE("Update", "createPixmapChangedCommand"); - QVector imageVector; + QList imageVector; for (const ServerNodeInstance &instance : instanceList) { if (!instance.isValid()) @@ -1440,13 +1440,13 @@ void NodeInstanceServer::loadDummyDataContext(const QString &directory) void NodeInstanceServer::sendDebugOutput(DebugOutputCommand::Type type, const QString &message, qint32 instanceId) { - QVector ids; + QList ids; ids.append(instanceId); sendDebugOutput(type, message, ids); } void NodeInstanceServer::sendDebugOutput(DebugOutputCommand::Type type, const QString &message, - const QVector &instanceIds) + const QList &instanceIds) { DebugOutputCommand command(message, type, instanceIds); nodeInstanceClient()->debugOutput(command); @@ -1532,7 +1532,7 @@ void NodeInstanceServer::sheduleRootItemRender() if (result) { connect(result.data(), &QQuickItemGrabResult::ready, [this, result, instanceId] { - QVector imageVector; + QList imageVector; ImageContainer container(instanceId, result->image(), instanceId); imageVector.append(container); nodeInstanceClient()->pixmapChanged(PixmapChangedCommand(imageVector)); @@ -1618,7 +1618,7 @@ void NodeInstanceServer::addAnimation(QQuickAbstractAnimation *animation) } } -QVector NodeInstanceServer::animations() const +QList NodeInstanceServer::animations() const { return m_animations; } diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.h b/src/tools/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.h index e7070a63bde..ac081cd7379 100644 --- a/src/tools/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.h +++ b/src/tools/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.h @@ -5,7 +5,6 @@ #include #include -#include #include #include #include @@ -153,7 +152,7 @@ public: ServerNodeInstance instanceForObject(QObject *object) const; bool hasInstanceForObject(QObject *object) const; - const QVector &nodeInstances() const { return m_idInstances; } + const QList &nodeInstances() const { return m_idInstances; } virtual QQmlEngine *engine() const = 0; QQmlContext *context() const; @@ -190,7 +189,7 @@ public: virtual void setRootItem(QQuickItem *item) = 0; void sendDebugOutput(DebugOutputCommand::Type type, const QString &message, qint32 instanceId = 0); - void sendDebugOutput(DebugOutputCommand::Type type, const QString &message, const QVector &instanceIds); + void sendDebugOutput(DebugOutputCommand::Type type, const QString &message, const QList &instanceIds); void removeInstanceRelationsipForDeletedObject(QObject *object, qint32 instanceId); @@ -213,7 +212,7 @@ public: virtual bool isInformationServer() const; virtual bool isPreviewServer() const; void addAnimation(QQuickAbstractAnimation *animation); - QVector animations() const; + QList animations() const; QVariant animationDefaultValue(int index) const; public slots: @@ -222,8 +221,8 @@ public slots: void emitParentChanged(QObject *child); protected: - virtual QList createInstances(const QVector &container); - void reparentInstances(const QVector &containerVector); + virtual QList createInstances(const QList &container); + void reparentInstances(const QList &containerVector); Internal::ChildrenChangeEventFilter *childrenChangeEventFilter(); void resetInstanceProperty(const PropertyAbstractContainer &propertyContainer); @@ -240,8 +239,8 @@ protected: void timerEvent(QTimerEvent *) override; ValuesChangedCommand createValuesChangedCommand(const QList &instanceList) const; - ValuesChangedCommand createValuesChangedCommand(const QVector &propertyList) const; - ValuesModifiedCommand createValuesModifiedCommand(const QVector &propertyList) const; + ValuesChangedCommand createValuesChangedCommand(const QList &propertyList) const; + ValuesModifiedCommand createValuesModifiedCommand(const QList &propertyList) const; PixmapChangedCommand createPixmapChangedCommand(const QList &instanceList) const; InformationChangedCommand createAllInformationChangedCommand(const QList &instanceList, bool initial = false) const; ChildrenChangedCommand createChildrenChangedCommand(const ServerNodeInstance &parentInstance, const QList &instanceList) const; @@ -276,16 +275,16 @@ protected: QQmlContext *rootContext() const; - const QVector changedPropertyList() const; + const QList changedPropertyList() const; void clearChangedPropertyList(); virtual void refreshBindings() = 0; void setupDummysForContext(QQmlContext *context); - void setupMockupTypes(const QVector &container); + void setupMockupTypes(const QList &container); void setupFileUrl(const QUrl &fileUrl); - void setupImports(const QVector &container); + void setupImports(const QList &container); void setupDummyData(const QUrl &fileUrl); void setupDefaultDummyData(); QList setupInstances(const CreateSceneCommand &command); @@ -301,7 +300,7 @@ private: void setupOnlyWorkingImports(const QStringList &workingImportStatementList); ServerNodeInstance m_rootNodeInstance; ServerNodeInstance m_activeStateInstance; - QVector m_idInstances; + QList m_idInstances; QHash m_objectInstanceHash; QMultiHash m_fileSystemWatcherHash; QList > > m_dummyObjectList; @@ -314,7 +313,7 @@ private: int m_renderTimerInterval = 16; TimerMode m_timerMode = TimerMode::NormalTimer; int m_timerModeInterval = 200; - QVector m_changedPropertyList; + QList m_changedPropertyList; QByteArray m_importCode; QPointer m_dummyContextObject; QPointer m_importComponent; @@ -322,8 +321,8 @@ private: std::unique_ptr multilanguageLink; int m_needsExtraRenderCount = 0; int m_extraRenderCurrentPass = 0; - QVector m_animations; - QVector m_defaultValues; + QList m_animations; + QList m_defaultValues; }; } diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/qt5capturepreviewnodeinstanceserver.cpp b/src/tools/qmlpuppet/qmlpuppet/instances/qt5capturepreviewnodeinstanceserver.cpp index 22e0d92084f..f9d530ddd54 100644 --- a/src/tools/qmlpuppet/qmlpuppet/instances/qt5capturepreviewnodeinstanceserver.cpp +++ b/src/tools/qmlpuppet/qmlpuppet/instances/qt5capturepreviewnodeinstanceserver.cpp @@ -29,7 +29,7 @@ QImage renderPreviewImage(ServerNodeInstance rootNodeInstance) } CapturedDataCommand::StateData collectStateData(ServerNodeInstance rootNodeInstance, - const QVector &nodeInstances, + const QList &nodeInstances, qint32 stateInstanceId) { CapturedDataCommand::StateData stateData; @@ -74,7 +74,7 @@ void Qt5CapturePreviewNodeInstanceServer::collectItemChangesAndSendChangeCommand QQuickDesignerSupport::polishItems(quickWindow()); - QVector stateDatas; + QList stateDatas; stateDatas.push_back(collectStateData(rootNodeInstance(), nodeInstances(), 0)); for (ServerNodeInstance stateInstance : rootNodeInstance().stateInstances()) { diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/qt5informationnodeinstanceserver.cpp b/src/tools/qmlpuppet/qmlpuppet/instances/qt5informationnodeinstanceserver.cpp index a85a8770dd9..2eb4d7f1cc7 100644 --- a/src/tools/qmlpuppet/qmlpuppet/instances/qt5informationnodeinstanceserver.cpp +++ b/src/tools/qmlpuppet/qmlpuppet/instances/qt5informationnodeinstanceserver.cpp @@ -327,7 +327,7 @@ void Qt5InformationNodeInstanceServer::updateActiveScenePreferredCamera() } void Qt5InformationNodeInstanceServer::updateMaterialPreviewData( - const QVector &valueChanges) + const QList &valueChanges) { for (const auto &container : valueChanges) { if (container.instanceId() == 0) { @@ -342,7 +342,7 @@ void Qt5InformationNodeInstanceServer::updateMaterialPreviewData( } void Qt5InformationNodeInstanceServer::updateRotationBlocks( - [[maybe_unused]] const QVector &valueChanges) + [[maybe_unused]] const QList &valueChanges) { #ifdef QUICK3D_MODULE auto helper = qobject_cast(m_3dHelper); @@ -372,7 +372,7 @@ void Qt5InformationNodeInstanceServer::updateRotationBlocks( } void Qt5InformationNodeInstanceServer::updateSnapAndCameraSettings( - [[maybe_unused]] const QVector &valueChanges) + [[maybe_unused]] const QList &valueChanges) { #ifdef QUICK3D_MODULE auto helper = qobject_cast(m_3dHelper); @@ -411,7 +411,7 @@ void Qt5InformationNodeInstanceServer::updateSnapAndCameraSettings( } void Qt5InformationNodeInstanceServer::updateColorSettings( - [[maybe_unused]] const QVector &valueChanges) + [[maybe_unused]] const QList &valueChanges) { #ifdef QUICK3D_MODULE if (m_editView3DData.rootItem) { @@ -430,7 +430,7 @@ void Qt5InformationNodeInstanceServer::updateColorSettings( } void Qt5InformationNodeInstanceServer::removeRotationBlocks( - [[maybe_unused]] const QVector &instanceIds) + [[maybe_unused]] const QList &instanceIds) { #ifdef QUICK3D_MODULE auto helper = qobject_cast(m_3dHelper); @@ -642,7 +642,7 @@ void Qt5InformationNodeInstanceServer::handleParticleSystemSelected(QQuick3DPart || ServerNodeInstance::isSubclassOf(o, "QQuickSequentialAnimation"); }; - const QVector anims = animations(); + const QList anims = animations(); QSet containers; for (auto a : anims) { // Stop all animations by default. We only want to run animations related to currently @@ -802,13 +802,13 @@ void Qt5InformationNodeInstanceServer::handleSelectionChanged(const QVariant &ob m_selectionChangeTimer.start(500); } -QVector +QList Qt5InformationNodeInstanceServer::propertyToPropertyValueTriples( const ServerNodeInstance &instance, const PropertyName &propertyName, const QVariant &variant) { - QVector result; + QList result; InstancePropertyValueTriple propTriple; if (variant.typeId() == QMetaType::QVector3D) { @@ -854,7 +854,7 @@ void Qt5InformationNodeInstanceServer::modifyVariantValue(const QObjectList &obj } if (!objects.isEmpty()) { - QVector valueVector; + QList valueVector; for (const auto listObj : objects) { ServerNodeInstance instance = instanceForObject(listObj); if (instance.isValid()) { @@ -865,7 +865,7 @@ void Qt5InformationNodeInstanceServer::modifyVariantValue(const QObjectList &obj instance.setModifiedFlag(false); for (const auto &propNamePair : propNamePairs) { // We do have to split vector3d props into foobar.x, foobar.y, foobar.z - const QVector triple + const QList triple = propertyToPropertyValueTriples(instance, propNamePair.targetPropName, listObj->property(propNamePair.origPropName)); for (const auto &property : triple) { @@ -1631,13 +1631,13 @@ void Qt5InformationNodeInstanceServer::selectInstances(const QList &properties) + const QList &properties) { nodeInstanceClient()->valuesModified(createValuesModifiedCommand(properties)); } QList Qt5InformationNodeInstanceServer::createInstances( - const QVector &container) + const QList &container) { const auto createdInstances = NodeInstanceServer::createInstances(container); @@ -2054,7 +2054,7 @@ void Qt5InformationNodeInstanceServer::collectItemChangesAndSendChangeCommands() QQuickDesignerSupport::polishItems(quickWindow()); QSet informationChangedInstanceSet; - QVector propertyChangedList; + QList propertyChangedList; if (quickWindow()) { for (QQuickItem *item : allItems()) { @@ -2221,7 +2221,7 @@ void Qt5InformationNodeInstanceServer::completeComponent(const CompleteComponent Qt5NodeInstanceServer::completeComponent(command); QList instanceList; - const QVector instances = command.instances(); + const QList instances = command.instances(); for (qint32 instanceId : instances) { if (hasInstanceForId(instanceId)) { ServerNodeInstance instance = instanceForId(instanceId); @@ -2258,7 +2258,7 @@ void Qt5InformationNodeInstanceServer::changeSelection(const ChangeSelectionComm } // Find a scene root of the selection to update active scene shown - const QVector instanceIds = command.instanceIds(); + const QList instanceIds = command.instanceIds(); QVariantList selectedObjs; QObject *firstSceneRoot = nullptr; ServerNodeInstance firstInstance; @@ -2473,7 +2473,7 @@ bool Qt5InformationNodeInstanceServer::isSceneEnvironmentBgProperty(const Proper void Qt5InformationNodeInstanceServer::changePropertyValues(const ChangeValuesCommand &command) { bool hasDynamicProperties = false; - const QVector values = command.valueChanges(); + const QList values = command.valueChanges(); QSet sceneEnvs; for (const PropertyValueContainer &container : values) { if (!container.isReflected()) { @@ -2757,7 +2757,7 @@ void Qt5InformationNodeInstanceServer::changeState(const ChangeStateCommand &com void Qt5InformationNodeInstanceServer::removeProperties(const RemovePropertiesCommand &command) { - const QVector props = command.properties(); + const QList props = command.properties(); QSet sceneEnvs; for (const PropertyAbstractContainer &container : props) { diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/qt5informationnodeinstanceserver.h b/src/tools/qmlpuppet/qmlpuppet/instances/qt5informationnodeinstanceserver.h index f0d796f9003..4bd3c157533 100644 --- a/src/tools/qmlpuppet/qmlpuppet/instances/qt5informationnodeinstanceserver.h +++ b/src/tools/qmlpuppet/qmlpuppet/instances/qt5informationnodeinstanceserver.h @@ -80,8 +80,8 @@ protected: bool isDirtyRecursiveForNonInstanceItems(QQuickItem *item) const; bool isDirtyRecursiveForParentInstances(QQuickItem *item) const; void selectInstances(const QList &instanceList); - void modifyProperties(const QVector &properties); - QList createInstances(const QVector &container) override; + void modifyProperties(const QList &properties); + QList createInstances(const QList &container) override; void initializeAuxiliaryViews() override; private: @@ -98,7 +98,7 @@ private: QObject *findView3DForSceneRoot(QObject *sceneRoot) const; QObject *find3DSceneRoot(const ServerNodeInstance &instance) const; QObject *find3DSceneRoot(QObject *obj) const; - QVector propertyToPropertyValueTriples( + QList propertyToPropertyValueTriples( const ServerNodeInstance &instance, const PropertyName &propertyName, const QVariant &variant); @@ -122,11 +122,11 @@ private: void handleInputEvents(); void resolveImportSupport(); void updateActiveScenePreferredCamera(); - void updateMaterialPreviewData(const QVector &valueChanges); - void updateRotationBlocks(const QVector &valueChanges); - void updateSnapAndCameraSettings(const QVector &valueChanges); - void updateColorSettings(const QVector &valueChanges); - void removeRotationBlocks(const QVector &instanceIds); + void updateMaterialPreviewData(const QList &valueChanges); + void updateRotationBlocks(const QList &valueChanges); + void updateSnapAndCameraSettings(const QList &valueChanges); + void updateColorSettings(const QList &valueChanges); + void removeRotationBlocks(const QList &instanceIds); void getNodeAtPos(const QPointF &pos); void getNodeAtMainScenePos(const QPointF &pos, qint32 viewId); diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/qt5previewnodeinstanceserver.cpp b/src/tools/qmlpuppet/qmlpuppet/instances/qt5previewnodeinstanceserver.cpp index d20d0534b02..5a67de15676 100644 --- a/src/tools/qmlpuppet/qmlpuppet/instances/qt5previewnodeinstanceserver.cpp +++ b/src/tools/qmlpuppet/qmlpuppet/instances/qt5previewnodeinstanceserver.cpp @@ -52,7 +52,7 @@ void Qt5PreviewNodeInstanceServer::collectItemChangesAndSendChangeCommands() QQuickDesignerSupport::polishItems(quickWindow()); - QVector imageContainerVector; + QList imageContainerVector; // Base state needs to be rendered twice to properly render shared resources, // if there is more than one View3D and at least one of them is dirty. diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/qt5rendernodeinstanceserver.cpp b/src/tools/qmlpuppet/qmlpuppet/instances/qt5rendernodeinstanceserver.cpp index 37b1e3faaec..b055b70cbc7 100644 --- a/src/tools/qmlpuppet/qmlpuppet/instances/qt5rendernodeinstanceserver.cpp +++ b/src/tools/qmlpuppet/qmlpuppet/instances/qt5rendernodeinstanceserver.cpp @@ -207,7 +207,7 @@ void Qt5RenderNodeInstanceServer::completeComponent(const CompleteComponentComma { Qt5NodeInstanceServer::completeComponent(command); - const QVector ids = command.instances(); + const QList ids = command.instances(); for (qint32 instanceId : ids) { if (hasInstanceForId(instanceId)) { ServerNodeInstance instance = instanceForId(instanceId); @@ -227,7 +227,7 @@ void Qt5RenderNodeInstanceServer::changePropertyValues(const ChangeValuesCommand { Qt5NodeInstanceServer::changePropertyValues(command); - const QVector values = command.valueChanges(); + const QList values = command.valueChanges(); for (const PropertyValueContainer &container : values) { // In case an effect item visibility changed to false, make sure all children are rendered // again as they might not have valid pixmaps yet @@ -255,7 +255,7 @@ void Qt5RenderNodeInstanceServer::changePropertyBindings(const ChangeBindingsCom { Qt5NodeInstanceServer::changePropertyBindings(command); - const QVector changes = command.bindingChanges; + const QList changes = command.bindingChanges; for (const PropertyBindingContainer &container : changes) { if (container.isDynamic() && hasInstanceForId(container.instanceId())) { // Changes to dynamic properties are not always noticed by normal signal spy mechanism @@ -269,7 +269,7 @@ void Qt5RenderNodeInstanceServer::reparentInstances(const ReparentInstancesComma { ServerNodeInstance effectNode; ServerNodeInstance oldParent; - const QVector containers = command.reparentInstances(); + const QList containers = command.reparentInstances(); for (const ReparentContainer &container : containers) { if (hasInstanceForId(container.instanceId())) { ServerNodeInstance instance = instanceForId(container.instanceId()); @@ -304,7 +304,7 @@ void Qt5RenderNodeInstanceServer::reparentInstances(const ReparentInstancesComma void Qt5RenderNodeInstanceServer::removeInstances(const RemoveInstancesCommand &command) { ServerNodeInstance oldParent; - const QVector ids = command.instanceIds(); + const QList ids = command.instanceIds(); for (qint32 id : ids) { if (hasInstanceForId(id)) { ServerNodeInstance instance = instanceForId(id); diff --git a/src/tools/qmlpuppet/qmlpuppet/instances/qt5testnodeinstanceserver.cpp b/src/tools/qmlpuppet/qmlpuppet/instances/qt5testnodeinstanceserver.cpp index ca501b5eb32..6176d108db3 100644 --- a/src/tools/qmlpuppet/qmlpuppet/instances/qt5testnodeinstanceserver.cpp +++ b/src/tools/qmlpuppet/qmlpuppet/instances/qt5testnodeinstanceserver.cpp @@ -238,7 +238,7 @@ void QmlDesigner::Qt5TestNodeInstanceServer::collectItemChangesAndSendChangeComm QQuickDesignerSupport::polishItems(quickWindow()); QSet informationChangedInstanceSet; - QVector propertyChangedList; + QList propertyChangedList; QSet parentChangedSet; if (quickWindow()) {