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

QmlPuppet: Refactor ChangeAuxiliaryCommand

Browse Source 
Change-Id: I32eb04db96322883aa908e22724756f5e25ded09
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Michael Winkelmann
2020-08-18 13:13:19 +02:00
parent f830a21bf8
commit 888cbe7f8a
5 changed files with 23 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.cpp
View File

@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
@@ -29,35 +29,9 @@
namespace QmlDesigner {
ChangeAuxiliaryCommand::ChangeAuxiliaryCommand() = default;
ChangeAuxiliaryCommand::ChangeAuxiliaryCommand(const QVector<PropertyValueContainer> &auxiliaryChangeVector)
: m_auxiliaryChangeVector (auxiliaryChangeVector)
{
}
QVector<PropertyValueContainer> ChangeAuxiliaryCommand::auxiliaryChanges() const
{
return m_auxiliaryChangeVector;
}
QDataStream &operator<<(QDataStream &out, const ChangeAuxiliaryCommand &command)
{
out << command.auxiliaryChanges();
return out;
}
QDataStream &operator>>(QDataStream &in, ChangeAuxiliaryCommand &command)
{
in >> command.m_auxiliaryChangeVector;
return in;
}
QDebug operator <<(QDebug debug, const ChangeAuxiliaryCommand &command)
{
return debug.nospace() << "ChangeAuxiliaryCommand(auxiliaryChanges: " << command.m_auxiliaryChangeVector << ")";
return debug.nospace() << "ChangeAuxiliaryCommand(auxiliaryChanges: " << command.auxiliaryChanges << ")";
}
} // namespace QmlDesigner

32
share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.h
View File

@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
@@ -25,6 +25,8 @@
#pragma once
#include <QDataStream>
#include <QDebug>
#include <QMetaType>
#include <QVector>
@@ -34,24 +36,24 @@ namespace QmlDesigner {
class ChangeAuxiliaryCommand
{
friend QDataStream &operator>>(QDataStream &in, ChangeAuxiliaryCommand &command);
public:
friend QDataStream &operator>>(QDataStream &in, ChangeAuxiliaryCommand &command)
{
in >> command.auxiliaryChanges;
return in;
}
friend QDataStream &operator<<(QDataStream &out, const ChangeAuxiliaryCommand &command)
{
out << command.auxiliaryChanges;
return out;
}
friend QDebug operator <<(QDebug debug, const ChangeAuxiliaryCommand &command);
public:
ChangeAuxiliaryCommand();
explicit ChangeAuxiliaryCommand(const QVector<PropertyValueContainer> &auxiliaryChangeVector);
QVector<PropertyValueContainer> auxiliaryChanges() const;
private:
QVector<PropertyValueContainer> m_auxiliaryChangeVector;
QVector<PropertyValueContainer> auxiliaryChanges;
};
QDataStream &operator<<(QDataStream &out, const ChangeAuxiliaryCommand &command);
QDataStream &operator>>(QDataStream &in, ChangeAuxiliaryCommand &command);
QDebug operator <<(QDebug debug, const ChangeAuxiliaryCommand &command);
} // namespace QmlDesigner
Q_DECLARE_METATYPE(QmlDesigner::ChangeAuxiliaryCommand)

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

@@ -633,7 +633,7 @@ void NodeInstanceServer::changePropertyValues(const ChangeValuesCommand &command
void NodeInstanceServer::changeAuxiliaryValues(const ChangeAuxiliaryCommand &command)
{
foreach (const PropertyValueContainer &container, command.auxiliaryChanges()) {
for (const PropertyValueContainer &container : command.auxiliaryChanges) {
setInstanceAuxiliaryData(container);
}

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

@@ -116,7 +116,7 @@ void Qt5TestNodeInstanceServer::changePropertyBindings(const ChangeBindingsComma
void Qt5TestNodeInstanceServer::changeAuxiliaryValues(const ChangeAuxiliaryCommand &command)
{
foreach (const PropertyValueContainer &container, command.auxiliaryChanges()) {
for (const PropertyValueContainer &container : command.auxiliaryChanges) {
setInstanceAuxiliaryData(container);
}

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

@@ -535,9 +535,8 @@ void NodeInstanceView::auxiliaryDataChanged(const ModelNode &node,
if (hasInstanceForModelNode(node)) {
NodeInstance instance = instanceForModelNode(node);
if (value.isValid() || name == "invisible") {
PropertyValueContainer container(instance.instanceId(), name, value, TypeName());
ChangeAuxiliaryCommand changeAuxiliaryCommand({container});
m_nodeInstanceServer->changeAuxiliaryValues(changeAuxiliaryCommand);
PropertyValueContainer container { instance.instanceId(), name, value, TypeName() };
m_nodeInstanceServer->changeAuxiliaryValues({ { container } });
} else {
if (node.hasVariantProperty(name)) {
PropertyValueContainer container(instance.instanceId(), name, node.variantProperty(name).value(), TypeName());