summaryrefslogtreecommitdiffstats
path: root/src/remoteobjects/qremoteobjectreplica_p.h
diff options
context:
space:
mode:
authorBrett Stottlemyer <bstottle@ford.com>2018-07-15 20:43:18 -0400
committerBrett Stottlemyer <bstottle@ford.com>2018-08-15 18:54:13 +0000
commite170cbe42b8f654894e4035c8ddfd6759a034be8 (patch)
treea0bf0b811aed03836f85df6acfa2414a552f0153 /src/remoteobjects/qremoteobjectreplica_p.h
parent8761c1a282f596a64e0fc624c87added43fb47d8 (diff)
Support externally generated QIODevices
This adds the APIs that will be necessary to create SSL sockets flexibly (and outside of QtRO) and pass them in. The integration tests are extended to show everything works if the tcp/ip connection is created outside QtRO. The Registry is supported by allowing an "external schema" to be set as the HostNode's url, which is then used by the registry as the address for any remoted() source objects. The client Node calls registerExternalSchema() with a std::function callback that can create the client-side QIODevice given the registry provided url. Change-Id: I0f2d0ea270771e096a787134ef87d537769045f6 Reviewed-by: Michael Brasser <michael.brasser@live.com>
Diffstat (limited to 'src/remoteobjects/qremoteobjectreplica_p.h')
-rw-r--r--src/remoteobjects/qremoteobjectreplica_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/remoteobjects/qremoteobjectreplica_p.h b/src/remoteobjects/qremoteobjectreplica_p.h
index 6b64b67..471964c 100644
--- a/src/remoteobjects/qremoteobjectreplica_p.h
+++ b/src/remoteobjects/qremoteobjectreplica_p.h
@@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE
class QRemoteObjectReplica;
class QRemoteObjectSource;
-class ClientIoDevice;
+class IoDeviceBase;
class QReplicaImplementationInterface
{
@@ -165,7 +165,7 @@ public:
QRemoteObjectPendingCall sendCommandWithReply(int serialId);
bool waitForFinished(const QRemoteObjectPendingCall &call, int timeout) override;
void notifyAboutReply(int ackedSerialId, const QVariant &value) override;
- void setConnection(ClientIoDevice *conn);
+ void setConnection(IoDeviceBase *conn);
void setDisconnected();
void _q_send(QMetaObject::Call call, int index, const QVariantList &args) override;
@@ -176,7 +176,7 @@ public:
QVector<QRemoteObjectReplica *> m_parentsNeedingConnect;
QVariantList m_propertyStorage;
QVector<int> m_childIndices;
- QPointer<ClientIoDevice> connectionToSource;
+ QPointer<IoDeviceBase> connectionToSource;
// pending call data
int m_curSerialId = 1; // 0 is reserved for heartbeat signals