summaryrefslogtreecommitdiffstats
path: root/src/remoteobjects/qremoteobjectreplica_p.h
diff options
context:
space:
mode:
authorBrett Stottlemyer <bstottle@ford.com>2021-07-20 07:44:55 -0400
committerBrett Stottlemyer <bstottle@ford.com>2021-08-04 10:42:18 -0400
commitf43e2918d05df688c19d3164b43418747d4ac2ef (patch)
tree4ea15423c76fc79db30f0c159d465bbd210fabf5 /src/remoteobjects/qremoteobjectreplica_p.h
parent6892ef6d4577410385e315a4366aa3b6e449c435 (diff)
Refactor decodeVariant to pass by rvalue ref/std::move
The decodeVariant calls were weird in how their parameters were pass by reference so they could be changed, but without forcing a copy. It is clearer to pass by rvalue ref, using std::move on the calling side. This rippled up to calls that called the method, including setProperties which is part of the repc generated code. Because of the repc change, this should *not* be picked to Qt5. Pick-to: 6.2 Change-Id: Ieb1b0620569ad8eb9797edc57cc189d0b426510c Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/remoteobjects/qremoteobjectreplica_p.h')
-rw-r--r--src/remoteobjects/qremoteobjectreplica_p.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/remoteobjects/qremoteobjectreplica_p.h b/src/remoteobjects/qremoteobjectreplica_p.h
index dde0317..9234ae5 100644
--- a/src/remoteobjects/qremoteobjectreplica_p.h
+++ b/src/remoteobjects/qremoteobjectreplica_p.h
@@ -73,7 +73,7 @@ class QReplicaImplementationInterface
public:
virtual ~QReplicaImplementationInterface() {}
virtual const QVariant getProperty(int i) const = 0;
- virtual void setProperties(const QVariantList &) = 0;
+ virtual void setProperties(QVariantList &&) = 0;
virtual void setProperty(int i, const QVariant &) = 0;
virtual bool isInitialized() const = 0;
virtual QRemoteObjectReplica::State state() const = 0;
@@ -91,7 +91,7 @@ public:
~QStubReplicaImplementation() override;
const QVariant getProperty(int i) const override;
- void setProperties(const QVariantList &) override;
+ void setProperties(QVariantList &&) override;
void setProperty(int i, const QVariant &) override;
bool isInitialized() const override { return false; }
QRemoteObjectReplica::State state() const override { return QRemoteObjectReplica::State::Uninitialized;}
@@ -112,7 +112,7 @@ public:
bool needsDynamicInitialization() const;
const QVariant getProperty(int i) const override = 0;
- void setProperties(const QVariantList &) override = 0;
+ void setProperties(QVariantList &&) override = 0;
void setProperty(int i, const QVariant &) override = 0;
virtual bool isShortCircuit() const = 0;
bool isInitialized() const override { return true; }
@@ -131,7 +131,7 @@ public:
//Dynamic replica functions
virtual void setDynamicMetaObject(const QMetaObject *meta);
- virtual void setDynamicProperties(const QVariantList &values);
+ virtual void setDynamicProperties(QVariantList &&values);
QString m_objectName;
const QMetaObject *m_metaObject;
@@ -152,13 +152,13 @@ public:
explicit QConnectedReplicaImplementation(const QString &name, const QMetaObject *, QRemoteObjectNode *);
~QConnectedReplicaImplementation() override;
const QVariant getProperty(int i) const override;
- void setProperties(const QVariantList &) override;
+ void setProperties(QVariantList &&) override;
void setProperty(int i, const QVariant &) override;
bool isShortCircuit() const final { return false; }
bool isInitialized() const override;
bool waitForSource(int timeout) override;
QList<int> childIndices() const;
- void initialize(QVariantList &values);
+ void initialize(QVariantList &&values);
void configurePrivate(QRemoteObjectReplica *) override;
void requestRemoteObjectSource();
bool sendCommand();
@@ -172,7 +172,7 @@ public:
QRemoteObjectPendingCall _q_sendWithReply(QMetaObject::Call call, int index, const QVariantList& args) override;
void setDynamicMetaObject(const QMetaObject *meta) override;
- void setDynamicProperties(const QVariantList&) override;
+ void setDynamicProperties(QVariantList &&) override;
QList<QRemoteObjectReplica *> m_parentsNeedingConnect;
QVariantList m_propertyStorage;
QList<int> m_childIndices;
@@ -191,7 +191,7 @@ public:
~QInProcessReplicaImplementation() override;
const QVariant getProperty(int i) const override;
- void setProperties(const QVariantList &) override;
+ void setProperties(QVariantList &&) override;
void setProperty(int i, const QVariant &) override;
bool isShortCircuit() const final { return true; }