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

QmlPuppet: Refactor ChangeIdsCommand

Browse Source 
Change-Id: I75de863121b66a5050226dd5c8914229cb1af608
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Michael Winkelmann
2020-08-19 16:54:09 +02:00
parent d39a6f656f
commit 44a3c092a0
6 changed files with 20 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
share/qtcreator/qml/qmlpuppet/commands/changeidscommand.cpp
View File

@@ -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

29
share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h
View File

@@ -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);
public:
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);
public:
ChangeIdsCommand();
explicit ChangeIdsCommand(const QVector<IdContainer> &idVector);
QVector<IdContainer> ids() const;
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)

2
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
View File

@@ -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());
}

3
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
View File

@@ -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,

2
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp
View File

@@ -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());
}

4
src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
View File

@@ -1146,7 +1146,7 @@ ChangeBindingsCommand NodeInstanceView::createChangeBindingCommand(const QList<B
ChangeIdsCommand NodeInstanceView::createChangeIdsCommand(const QList<NodeInstance> &instanceList) const
{
QVector<IdContainer> containerList;
foreach (const NodeInstance &instance, instanceList) {
for (const NodeInstance &instance : instanceList) {
QString id = instance.modelNode().id();
if (!id.isEmpty()) {
IdContainer container(instance.instanceId(), id);
@@ -1154,7 +1154,7 @@ ChangeIdsCommand NodeInstanceView::createChangeIdsCommand(const QList<NodeInstan
}
}
return ChangeIdsCommand(containerList);
return {containerList};
}