diff options
| author | Kevin Funk <kevin.funk.ford@kdab.com> | 2015-11-30 15:49:51 +0100 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2015-11-30 15:50:44 +0000 |
| commit | c482cfcf337d55a95f93058bf6b48eac9c011a1c (patch) | |
| tree | 28f6d65a87dfd270d9a04724ad21d55df5e884cd /src | |
| parent | 442c5dd731fdbb99c244375e8733a6e36a188ab5 (diff) | |
Less pointer-handling
Make serializeInvokePacket take const-ref instead of a const pointer for
'args'
Change-Id: I8f01a0f96a6593a72b9e51696a5e6a80317b3e7b
Reviewed-by: Continuous Integration (KDAB) <build@kdab.com>
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/remoteobjects/qremoteobjectpacket.cpp | 4 | ||||
| -rw-r--r-- | src/remoteobjects/qremoteobjectpacket_p.h | 2 | ||||
| -rw-r--r-- | src/remoteobjects/qremoteobjectreplica.cpp | 6 | ||||
| -rw-r--r-- | src/remoteobjects/qremoteobjectsource.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/remoteobjects/qremoteobjectpacket.cpp b/src/remoteobjects/qremoteobjectpacket.cpp index 4e4b4cd..cf59dc8 100644 --- a/src/remoteobjects/qremoteobjectpacket.cpp +++ b/src/remoteobjects/qremoteobjectpacket.cpp @@ -272,13 +272,13 @@ void serializeRemoveObjectPacket(DataStreamPacket &ds, const QString &name) } //There is no deserializeRemoveObjectPacket - no parameters other than id and name -void serializeInvokePacket(DataStreamPacket &ds, const QString &name, int call, int index, const QVariantList *args, int serialId) +void serializeInvokePacket(DataStreamPacket &ds, const QString &name, int call, int index, const QVariantList &args, int serialId) { ds.setId(InvokePacket); ds << name; ds << call; ds << index; - ds << *args; + ds << args; ds << serialId; ds.finishPacket(); } diff --git a/src/remoteobjects/qremoteobjectpacket_p.h b/src/remoteobjects/qremoteobjectpacket_p.h index 437dc72..c025036 100644 --- a/src/remoteobjects/qremoteobjectpacket_p.h +++ b/src/remoteobjects/qremoteobjectpacket_p.h @@ -152,7 +152,7 @@ void deserializeAddObjectPacket(QDataStream &ds, bool &isDynamic); void serializeRemoveObjectPacket(DataStreamPacket&, const QString &name); //There is no deserializeRemoveObjectPacket - no parameters other than id and name -void serializeInvokePacket(DataStreamPacket&, const QString &name, int call, int index, const QVariantList *args, int serialId = -1); +void serializeInvokePacket(DataStreamPacket&, const QString &name, int call, int index, const QVariantList &args, int serialId = -1); void deserializeInvokePacket(QDataStream& in, int &call, int &index, QVariantList &args, int &serialId); void serializeInvokeReplyPacket(DataStreamPacket&, const QString &name, int ackedSerialId, const QVariant &value); diff --git a/src/remoteobjects/qremoteobjectreplica.cpp b/src/remoteobjects/qremoteobjectreplica.cpp index c143d60..50d5bd8 100644 --- a/src/remoteobjects/qremoteobjectreplica.cpp +++ b/src/remoteobjects/qremoteobjectreplica.cpp @@ -260,7 +260,7 @@ void QConnectedReplicaPrivate::_q_send(QMetaObject::Call call, int index, const if (index < m_methodOffset) //index - m_methodOffset < 0 is invalid, and can't be resolved on the Source side qCWarning(QT_REMOTEOBJECT) << "Skipping invalid method invocation. Index not found:" << index << "( offset =" << m_methodOffset << ") object:" << m_objectName << this->m_metaObject->method(index).name(); else { - serializeInvokePacket(m_packet, m_objectName, call, index - m_methodOffset, &args); + serializeInvokePacket(m_packet, m_objectName, call, index - m_methodOffset, args); sendCommand(); } } else { @@ -268,7 +268,7 @@ void QConnectedReplicaPrivate::_q_send(QMetaObject::Call call, int index, const if (index < m_propertyOffset) //index - m_propertyOffset < 0 is invalid, and can't be resolved on the Source side qCWarning(QT_REMOTEOBJECT) << "Skipping invalid property invocation. Index not found:" << index << "( offset =" << m_propertyOffset << ") object:" << m_objectName << this->m_metaObject->property(index).name(); else { - serializeInvokePacket(m_packet, m_objectName, call, index - m_propertyOffset, &args); + serializeInvokePacket(m_packet, m_objectName, call, index - m_propertyOffset, args); sendCommand(); } } @@ -280,7 +280,7 @@ QRemoteObjectPendingCall QConnectedReplicaPrivate::_q_sendWithReply(QMetaObject: qCDebug(QT_REMOTEOBJECT) << "Send" << call << this->m_metaObject->method(index).name() << index << args << connectionToSource; int serialId = (m_curSerialId == std::numeric_limits<int>::max() ? 0 : m_curSerialId++); - serializeInvokePacket(m_packet, m_objectName, call, index - m_methodOffset, &args, serialId); + serializeInvokePacket(m_packet, m_objectName, call, index - m_methodOffset, args, serialId); return sendCommandWithReply(serialId); } diff --git a/src/remoteobjects/qremoteobjectsource.cpp b/src/remoteobjects/qremoteobjectsource.cpp index 8f86ece..9d43271 100644 --- a/src/remoteobjects/qremoteobjectsource.cpp +++ b/src/remoteobjects/qremoteobjectsource.cpp @@ -197,7 +197,7 @@ void QRemoteObjectSource::handleMetaCall(int index, QMetaObject::Call call, void qCDebug(QT_REMOTEOBJECT) << "# Listeners" << listeners.length(); qCDebug(QT_REMOTEOBJECT) << "Invoke args:" << m_object << call << index << marshalArgs(index, a); - serializeInvokePacket(m_packet, m_api->name(), call, index, marshalArgs(index, a)); + serializeInvokePacket(m_packet, m_api->name(), call, index, *marshalArgs(index, a)); m_packet.baseAddress = 0; Q_FOREACH (ServerIoDevice *io, listeners) |