summaryrefslogtreecommitdiffstats
path: root/src/remoteobjects/qremoteobjectnode_p.h
diff options
context:
space:
mode:
authorKevin Funk <kevin.funk.ford@kdab.com>2017-10-06 14:46:48 +0200
committerKevin Funk <kevin.funk@kdab.com>2017-10-06 16:42:06 +0000
commitccf29e3c8045ef40584d3543fcd028b03e557588 (patch)
tree67fc8270385f8e5875a051676945a930e56a9105 /src/remoteobjects/qremoteobjectnode_p.h
parented2544b8fc624358b6c7d9239dd5fcddd9afbf51 (diff)
Rename ReplicaPrivate -> ReplicaImplementation
All those implementations for the QtROReplica ('InProcess', 'Connected', 'RemoteObject') aren't technically d-pointers. Mark them as such by naming them differently. This also has the nice benefit that one does not override QObject's 'd_ptr' variable accidentally with these implementation instances. Needed in order to pimpl QRemoteObjectRegistry properly Change-Id: I88322e37d2ff7e5044980e8fdf9f713d6be80c38 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Diffstat (limited to 'src/remoteobjects/qremoteobjectnode_p.h')
-rw-r--r--src/remoteobjects/qremoteobjectnode_p.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/remoteobjects/qremoteobjectnode_p.h b/src/remoteobjects/qremoteobjectnode_p.h
index 727d2e1..27e84ec 100644
--- a/src/remoteobjects/qremoteobjectnode_p.h
+++ b/src/remoteobjects/qremoteobjectnode_p.h
@@ -90,7 +90,7 @@ public:
virtual QRemoteObjectSourceLocations remoteObjectAddresses() const;
- void setReplicaPrivate(const QMetaObject *, QRemoteObjectReplica *, const QString &);
+ void setReplicaImplementation(const QMetaObject *, QRemoteObjectReplica *, const QString &);
void setLastError(QRemoteObjectNode::ErrorCode errorCode);
@@ -107,7 +107,7 @@ public:
void onRegistryInitialized();
void onShouldReconnect(ClientIoDevice *ioDevice);
- virtual QReplicaPrivateInterface *handleNewAcquire(const QMetaObject *meta, QRemoteObjectReplica *instance, const QString &name);
+ virtual QReplicaImplementationInterface *handleNewAcquire(const QMetaObject *meta, QRemoteObjectReplica *instance, const QString &name);
void initialize();
private:
bool checkSignatures(const QByteArray &a, const QByteArray &b);
@@ -123,7 +123,7 @@ public:
QAtomicInt isInitialized;
QMutex mutex;
QUrl registryAddress;
- QHash<QString, QWeakPointer<QReplicaPrivateInterface> > replicas;
+ QHash<QString, QWeakPointer<QReplicaImplementationInterface> > replicas;
QMap<QString, SourceInfo> connectedSources;
QSet<ClientIoDevice*> pendingReconnect;
QSet<QUrl> requestedUrls;
@@ -144,7 +144,7 @@ class QRemoteObjectHostBasePrivate : public QRemoteObjectNodePrivate
public:
QRemoteObjectHostBasePrivate();
~QRemoteObjectHostBasePrivate() override {}
- QReplicaPrivateInterface *handleNewAcquire(const QMetaObject *meta, QRemoteObjectReplica *instance, const QString &name) override;
+ QReplicaImplementationInterface *handleNewAcquire(const QMetaObject *meta, QRemoteObjectReplica *instance, const QString &name) override;
public:
QRemoteObjectSourceIo *remoteObjectIo;