summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/remoteobjects/qconnection_local_backend.cpp12
-rw-r--r--src/remoteobjects/qconnection_local_backend_p.h6
-rw-r--r--src/remoteobjects/qconnection_qnx_backend.cpp12
-rw-r--r--src/remoteobjects/qconnection_qnx_backend_p.h12
-rw-r--r--src/remoteobjects/qconnection_tcpip_backend.cpp12
-rw-r--r--src/remoteobjects/qconnection_tcpip_backend_p.h6
-rw-r--r--src/remoteobjects/qconnectionfactories.cpp104
-rw-r--r--src/remoteobjects/qconnectionfactories.h48
-rw-r--r--src/remoteobjects/qconnectionfactories_p.h24
-rw-r--r--src/remoteobjects/qremoteobjectnode.cpp34
-rw-r--r--src/remoteobjects/qremoteobjectnode_p.h10
-rw-r--r--src/remoteobjects/qremoteobjectpacket.cpp6
-rw-r--r--src/remoteobjects/qremoteobjectpacket_p.h6
-rw-r--r--src/remoteobjects/qremoteobjectreplica.cpp4
-rw-r--r--src/remoteobjects/qremoteobjectreplica_p.h6
-rw-r--r--src/remoteobjects/qremoteobjectsource.cpp6
-rw-r--r--src/remoteobjects/qremoteobjectsource_p.h8
-rw-r--r--src/remoteobjects/qremoteobjectsourceio.cpp12
-rw-r--r--src/remoteobjects/qremoteobjectsourceio_p.h6
19 files changed, 167 insertions, 167 deletions
diff --git a/src/remoteobjects/qconnection_local_backend.cpp b/src/remoteobjects/qconnection_local_backend.cpp
index 60d9d07..97cd279 100644
--- a/src/remoteobjects/qconnection_local_backend.cpp
+++ b/src/remoteobjects/qconnection_local_backend.cpp
@@ -42,10 +42,10 @@
QT_BEGIN_NAMESPACE
LocalClientIo::LocalClientIo(QObject *parent)
- : ClientIoDevice(parent)
+ : QtROClientIoDevice(parent)
, m_socket(new QLocalSocket(this))
{
- connect(m_socket, &QLocalSocket::readyRead, this, &ClientIoDevice::readyRead);
+ connect(m_socket, &QLocalSocket::readyRead, this, &QtROClientIoDevice::readyRead);
connect(m_socket, &QLocalSocket::errorOccurred, this, &LocalClientIo::onError);
connect(m_socket, &QLocalSocket::stateChanged, this, &LocalClientIo::onStateChanged);
}
@@ -121,11 +121,11 @@ void LocalClientIo::onStateChanged(QLocalSocket::LocalSocketState state)
}
LocalServerIo::LocalServerIo(QLocalSocket *conn, QObject *parent)
- : ServerIoDevice(parent), m_connection(conn)
+ : QtROServerIoDevice(parent), m_connection(conn)
{
m_connection->setParent(this);
- connect(conn, &QIODevice::readyRead, this, &ServerIoDevice::readyRead);
- connect(conn, &QLocalSocket::disconnected, this, &ServerIoDevice::disconnected);
+ connect(conn, &QIODevice::readyRead, this, &QtROServerIoDevice::readyRead);
+ connect(conn, &QLocalSocket::disconnected, this, &QtROServerIoDevice::disconnected);
}
QIODevice *LocalServerIo::connection() const
@@ -149,7 +149,7 @@ LocalServerImpl::~LocalServerImpl()
m_server.close();
}
-ServerIoDevice *LocalServerImpl::configureNewConnection()
+QtROServerIoDevice *LocalServerImpl::configureNewConnection()
{
if (!m_server.isListening())
return nullptr;
diff --git a/src/remoteobjects/qconnection_local_backend_p.h b/src/remoteobjects/qconnection_local_backend_p.h
index 2f18df6..beed930 100644
--- a/src/remoteobjects/qconnection_local_backend_p.h
+++ b/src/remoteobjects/qconnection_local_backend_p.h
@@ -58,7 +58,7 @@
QT_BEGIN_NAMESPACE
-class LocalClientIo final : public ClientIoDevice
+class LocalClientIo final : public QtROClientIoDevice
{
Q_OBJECT
@@ -81,7 +81,7 @@ private:
QLocalSocket* m_socket;
};
-class LocalServerIo final : public ServerIoDevice
+class LocalServerIo final : public QtROServerIoDevice
{
Q_OBJECT
public:
@@ -105,7 +105,7 @@ public:
~LocalServerImpl() override;
bool hasPendingConnections() const override;
- ServerIoDevice *configureNewConnection() override;
+ QtROServerIoDevice *configureNewConnection() override;
QUrl address() const override;
bool listen(const QUrl &address) override;
QAbstractSocket::SocketError serverError() const override;
diff --git a/src/remoteobjects/qconnection_qnx_backend.cpp b/src/remoteobjects/qconnection_qnx_backend.cpp
index d9bd9c5..e7c85be 100644
--- a/src/remoteobjects/qconnection_qnx_backend.cpp
+++ b/src/remoteobjects/qconnection_qnx_backend.cpp
@@ -42,10 +42,10 @@
QT_BEGIN_NAMESPACE
QnxClientIo::QnxClientIo(QObject *parent)
- : ClientIoDevice(parent)
+ : QtROClientIoDevice(parent)
, m_socket(new QQnxNativeIo(this))
{
- connect(m_socket, &QQnxNativeIo::readyRead, this, &ClientIoDevice::readyRead);
+ connect(m_socket, &QQnxNativeIo::readyRead, this, &QtROClientIoDevice::readyRead);
connect(m_socket,
static_cast<void(QQnxNativeIo::*)(QAbstractSocket::SocketError)>(&QQnxNativeIo::error),
this,
@@ -119,10 +119,10 @@ void QnxClientIo::onStateChanged(QAbstractSocket::SocketState state)
}
QnxServerIo::QnxServerIo(QSharedPointer<QIOQnxSource> conn, QObject *parent)
- : ServerIoDevice(parent), m_connection(conn)
+ : QtROServerIoDevice(parent), m_connection(conn)
{
- connect(conn.data(), &QIODevice::readyRead, this, &ServerIoDevice::readyRead);
- connect(conn.data(), &QIOQnxSource::disconnected, this, &ServerIoDevice::disconnected);
+ connect(conn.data(), &QIODevice::readyRead, this, &QtROServerIoDevice::readyRead);
+ connect(conn.data(), &QIOQnxSource::disconnected, this, &QtROServerIoDevice::disconnected);
}
QIODevice *QnxServerIo::connection() const
@@ -149,7 +149,7 @@ QnxServerImpl::~QnxServerImpl()
m_server.close();
}
-ServerIoDevice *QnxServerImpl::configureNewConnection()
+QtROServerIoDevice *QnxServerImpl::configureNewConnection()
{
if (!m_server.isListening())
return nullptr;
diff --git a/src/remoteobjects/qconnection_qnx_backend_p.h b/src/remoteobjects/qconnection_qnx_backend_p.h
index a2cfe80..3110ed8 100644
--- a/src/remoteobjects/qconnection_qnx_backend_p.h
+++ b/src/remoteobjects/qconnection_qnx_backend_p.h
@@ -58,7 +58,7 @@
QT_BEGIN_NAMESPACE
/*!
- QtRO provides ClientIoDevice, ServerIoDevice and QConnectionAbstractServer
+ QtRO provides QtROClientIoDevice, QtROServerIoDevice and QConnectionAbstractServer
as abstract interfaces to allow different backends to be used by QtRO. The
concept behind these classes is that there needs to be a Host node, which
has an address that can be connected to. Then there is a client object,
@@ -78,10 +78,10 @@ QT_BEGIN_NAMESPACE
logic for the client-side and server-side QIODevice are very different.
Thus, three additional backend classes are needed as well.
- QnxClientIo implements the QtRO ClientIoDevice wrapper around the QNX
+ QnxClientIo implements the QtRO QtROClientIoDevice wrapper around the QNX
specific QQnxNativeIo QIODevice (the client-side QIODevice).
- QnxServerIo implements the QtRO ServerIoDevice wrapper around the QNX
+ QnxServerIo implements the QtRO QtROServerIoDevice wrapper around the QNX
specific QIOQnxSource QIODevice (the server-side QIODevice).
QnxServerImpl implements the QtRO QConnectionAbstractServer wrapper around
@@ -93,7 +93,7 @@ QT_BEGIN_NAMESPACE
QLocalServer/QLocalSocket QPA for QNX.
*/
-class QnxClientIo final : public ClientIoDevice
+class QnxClientIo final : public QtROClientIoDevice
{
Q_OBJECT
@@ -116,7 +116,7 @@ private:
QQnxNativeIo *m_socket;
};
-class QnxServerIo final : public ServerIoDevice
+class QnxServerIo final : public QtROServerIoDevice
{
public:
explicit QnxServerIo(QSharedPointer<QIOQnxSource> conn, QObject *parent = nullptr);
@@ -139,7 +139,7 @@ public:
~QnxServerImpl() override;
bool hasPendingConnections() const override;
- ServerIoDevice *configureNewConnection() override;
+ QtROServerIoDevice *configureNewConnection() override;
QUrl address() const override;
bool listen(const QUrl &address) override;
QAbstractSocket::SocketError serverError() const override;
diff --git a/src/remoteobjects/qconnection_tcpip_backend.cpp b/src/remoteobjects/qconnection_tcpip_backend.cpp
index ff53c34..ec33391 100644
--- a/src/remoteobjects/qconnection_tcpip_backend.cpp
+++ b/src/remoteobjects/qconnection_tcpip_backend.cpp
@@ -44,10 +44,10 @@
QT_BEGIN_NAMESPACE
TcpClientIo::TcpClientIo(QObject *parent)
- : ClientIoDevice(parent)
+ : QtROClientIoDevice(parent)
, m_socket(new QTcpSocket(this))
{
- connect(m_socket, &QTcpSocket::readyRead, this, &ClientIoDevice::readyRead);
+ connect(m_socket, &QTcpSocket::readyRead, this, &QtROClientIoDevice::readyRead);
connect(m_socket, &QAbstractSocket::errorOccurred, this, &TcpClientIo::onError);
connect(m_socket, &QTcpSocket::stateChanged, this, &TcpClientIo::onStateChanged);
}
@@ -127,11 +127,11 @@ void TcpClientIo::onStateChanged(QAbstractSocket::SocketState state)
TcpServerIo::TcpServerIo(QTcpSocket *conn, QObject *parent)
- : ServerIoDevice(parent), m_connection(conn)
+ : QtROServerIoDevice(parent), m_connection(conn)
{
m_connection->setParent(this);
- connect(conn, &QIODevice::readyRead, this, &ServerIoDevice::readyRead);
- connect(conn, &QAbstractSocket::disconnected, this, &ServerIoDevice::disconnected);
+ connect(conn, &QIODevice::readyRead, this, &QtROServerIoDevice::readyRead);
+ connect(conn, &QAbstractSocket::disconnected, this, &QtROServerIoDevice::disconnected);
}
QIODevice *TcpServerIo::connection() const
@@ -157,7 +157,7 @@ TcpServerImpl::~TcpServerImpl()
close();
}
-ServerIoDevice *TcpServerImpl::configureNewConnection()
+QtROServerIoDevice *TcpServerImpl::configureNewConnection()
{
if (!m_server.isListening())
return nullptr;
diff --git a/src/remoteobjects/qconnection_tcpip_backend_p.h b/src/remoteobjects/qconnection_tcpip_backend_p.h
index fd3873e..fdb8de6 100644
--- a/src/remoteobjects/qconnection_tcpip_backend_p.h
+++ b/src/remoteobjects/qconnection_tcpip_backend_p.h
@@ -58,7 +58,7 @@
QT_BEGIN_NAMESPACE
-class TcpClientIo final : public ClientIoDevice
+class TcpClientIo final : public QtROClientIoDevice
{
Q_OBJECT
@@ -82,7 +82,7 @@ private:
QTcpSocket *m_socket;
};
-class TcpServerIo final : public ServerIoDevice
+class TcpServerIo final : public QtROServerIoDevice
{
Q_OBJECT
public:
@@ -106,7 +106,7 @@ public:
~TcpServerImpl() override;
bool hasPendingConnections() const override;
- ServerIoDevice *configureNewConnection() override;
+ QtROServerIoDevice *configureNewConnection() override;
QUrl address() const override;
bool listen(const QUrl &address) override;
QAbstractSocket::SocketError serverError() const override;
diff --git a/src/remoteobjects/qconnectionfactories.cpp b/src/remoteobjects/qconnectionfactories.cpp
index 58ee5c0..9da37de 100644
--- a/src/remoteobjects/qconnectionfactories.cpp
+++ b/src/remoteobjects/qconnectionfactories.cpp
@@ -92,21 +92,21 @@ inline bool fromDataStream(QDataStream &in, QRemoteObjectPacketTypeEnum &type, Q
/*!
All communication between nodes happens through some form of QIODevice with
- an associated QDataStream to handle marshalling of Qt types. IoDeviceBase
+ an associated QDataStream to handle marshalling of Qt types. QtROIoDeviceBase
is an abstract base class that provides a consistent interface to QtRO, yet
can be extended to support different types of QIODevice.
*/
-IoDeviceBase::IoDeviceBase(QObject *parent) : QObject(*new IoDeviceBasePrivate, parent) { }
+QtROIoDeviceBase::QtROIoDeviceBase(QObject *parent) : QObject(*new QtROIoDeviceBasePrivate, parent) { }
-IoDeviceBase::IoDeviceBase(IoDeviceBasePrivate &dptr, QObject *parent) : QObject(dptr, parent) { }
+QtROIoDeviceBase::QtROIoDeviceBase(QtROIoDeviceBasePrivate &dptr, QObject *parent) : QObject(dptr, parent) { }
-IoDeviceBase::~IoDeviceBase()
+QtROIoDeviceBase::~QtROIoDeviceBase()
{
}
-bool IoDeviceBase::read(QRemoteObjectPacketTypeEnum &type, QString &name)
+bool QtROIoDeviceBase::read(QRemoteObjectPacketTypeEnum &type, QString &name)
{
- Q_D(IoDeviceBase);
+ Q_D(QtROIoDeviceBase);
qCDebug(QT_REMOTEOBJECT_IO) << deviceType() << "read()" << d->m_curReadSize << bytesAvailable();
if (d->m_curReadSize == 0) {
@@ -126,98 +126,98 @@ bool IoDeviceBase::read(QRemoteObjectPacketTypeEnum &type, QString &name)
return fromDataStream(d->m_dataStream, type, name);
}
-void IoDeviceBase::write(const QByteArray &data)
+void QtROIoDeviceBase::write(const QByteArray &data)
{
- Q_D(IoDeviceBase);
+ Q_D(QtROIoDeviceBase);
if (connection()->isOpen() && !d->m_isClosing)
connection()->write(data);
}
-void IoDeviceBase::write(const QByteArray &data, qint64 size)
+void QtROIoDeviceBase::write(const QByteArray &data, qint64 size)
{
- Q_D(IoDeviceBase);
+ Q_D(QtROIoDeviceBase);
if (connection()->isOpen() && !d->m_isClosing)
connection()->write(data.data(), size);
}
-bool IoDeviceBase::isOpen() const
+bool QtROIoDeviceBase::isOpen() const
{
return !isClosing();
}
-void IoDeviceBase::close()
+void QtROIoDeviceBase::close()
{
- Q_D(IoDeviceBase);
+ Q_D(QtROIoDeviceBase);
d->m_isClosing = true;
doClose();
}
-qint64 IoDeviceBase::bytesAvailable() const
+qint64 QtROIoDeviceBase::bytesAvailable() const
{
return connection()->bytesAvailable();
}
-void IoDeviceBase::initializeDataStream()
+void QtROIoDeviceBase::initializeDataStream()
{
- Q_D(IoDeviceBase);
+ Q_D(QtROIoDeviceBase);
d->m_dataStream.setDevice(connection());
d->m_dataStream.resetStatus();
}
-bool IoDeviceBase::isClosing() const
+bool QtROIoDeviceBase::isClosing() const
{
- Q_D(const IoDeviceBase);
+ Q_D(const QtROIoDeviceBase);
return d->m_isClosing;
}
-void IoDeviceBase::addSource(const QString &name)
+void QtROIoDeviceBase::addSource(const QString &name)
{
- Q_D(IoDeviceBase);
+ Q_D(QtROIoDeviceBase);
d->m_remoteObjects.insert(name);
}
-void IoDeviceBase::removeSource(const QString &name)
+void QtROIoDeviceBase::removeSource(const QString &name)
{
- Q_D(IoDeviceBase);
+ Q_D(QtROIoDeviceBase);
d->m_remoteObjects.remove(name);
}
-QSet<QString> IoDeviceBase::remoteObjects() const
+QSet<QString> QtROIoDeviceBase::remoteObjects() const
{
- Q_D(const IoDeviceBase);
+ Q_D(const QtROIoDeviceBase);
return d->m_remoteObjects;
}
-ClientIoDevice::ClientIoDevice(QObject *parent) : IoDeviceBase(*new ClientIoDevicePrivate, parent)
+QtROClientIoDevice::QtROClientIoDevice(QObject *parent) : QtROIoDeviceBase(*new QtROClientIoDevicePrivate, parent)
{
}
-ClientIoDevice::~ClientIoDevice()
+QtROClientIoDevice::~QtROClientIoDevice()
{
if (!isClosing())
close();
}
-void ClientIoDevice::disconnectFromServer()
+void QtROClientIoDevice::disconnectFromServer()
{
doDisconnectFromServer();
emit shouldReconnect(this);
}
-QUrl ClientIoDevice::url() const
+QUrl QtROClientIoDevice::url() const
{
- Q_D(const ClientIoDevice);
+ Q_D(const QtROClientIoDevice);
return d->m_url;
}
-QString ClientIoDevice::deviceType() const
+QString QtROClientIoDevice::deviceType() const
{
- return QStringLiteral("ClientIoDevice");
+ return QStringLiteral("QtROClientIoDevice");
}
-void ClientIoDevice::setUrl(const QUrl &url)
+void QtROClientIoDevice::setUrl(const QUrl &url)
{
- Q_D(ClientIoDevice);
+ Q_D(QtROClientIoDevice);
d->m_url = url;
}
@@ -226,13 +226,13 @@ void ClientIoDevice::setUrl(const QUrl &url)
problem is that they behave differently, so this class adds some
consistency.
*/
-ServerIoDevice::ServerIoDevice(QObject *parent) : IoDeviceBase(parent)
+QtROServerIoDevice::QtROServerIoDevice(QObject *parent) : QtROIoDeviceBase(parent)
{
}
-QString ServerIoDevice::deviceType() const
+QString QtROServerIoDevice::deviceType() const
{
- return QStringLiteral("ServerIoDevice");
+ return QStringLiteral("QtROServerIoDevice");
}
QConnectionAbstractServer::QConnectionAbstractServer(QObject *parent)
@@ -244,49 +244,49 @@ QConnectionAbstractServer::~QConnectionAbstractServer()
{
}
-ServerIoDevice *QConnectionAbstractServer::nextPendingConnection()
+QtROServerIoDevice *QConnectionAbstractServer::nextPendingConnection()
{
- ServerIoDevice *iodevice = configureNewConnection();
+ QtROServerIoDevice *iodevice = configureNewConnection();
iodevice->initializeDataStream();
return iodevice;
}
-ExternalIoDevice::ExternalIoDevice(QIODevice *device, QObject *parent)
- : IoDeviceBase(*new ExternalIoDevicePrivate(device), parent)
+QtROExternalIoDevice::QtROExternalIoDevice(QIODevice *device, QObject *parent)
+ : QtROIoDeviceBase(*new QtROExternalIoDevicePrivate(device), parent)
{
- Q_D(ExternalIoDevice);
+ Q_D(QtROExternalIoDevice);
initializeDataStream();
connect(device, &QIODevice::aboutToClose, this, [d]() { d->m_isClosing = true; });
- connect(device, &QIODevice::readyRead, this, &ExternalIoDevice::readyRead);
+ connect(device, &QIODevice::readyRead, this, &QtROExternalIoDevice::readyRead);
auto meta = device->metaObject();
if (-1 != meta->indexOfSignal(SIGNAL(disconnected())))
connect(device, SIGNAL(disconnected()), this, SIGNAL(disconnected()));
}
-QIODevice *ExternalIoDevice::connection() const
+QIODevice *QtROExternalIoDevice::connection() const
{
- Q_D(const ExternalIoDevice);
+ Q_D(const QtROExternalIoDevice);
return d->m_device;
}
-bool ExternalIoDevice::isOpen() const
+bool QtROExternalIoDevice::isOpen() const
{
- Q_D(const ExternalIoDevice);
+ Q_D(const QtROExternalIoDevice);
if (!d->m_device)
return false;
- return d->m_device->isOpen() && IoDeviceBase::isOpen();
+ return d->m_device->isOpen() && QtROIoDeviceBase::isOpen();
}
-void ExternalIoDevice::doClose()
+void QtROExternalIoDevice::doClose()
{
- Q_D(ExternalIoDevice);
+ Q_D(QtROExternalIoDevice);
if (isOpen())
d->m_device->close();
}
-QString ExternalIoDevice::deviceType() const
+QString QtROExternalIoDevice::deviceType() const
{
- return QStringLiteral("ExternalIoDevice");
+ return QStringLiteral("QtROExternalIoDevice");
}
/*!
@@ -381,7 +381,7 @@ QtROClientFactory *QtROClientFactory::instance()
\sa {qRegisterRemoteObjectsServer}
*/
-IoDeviceBasePrivate::IoDeviceBasePrivate() : QObjectPrivate()
+QtROIoDeviceBasePrivate::QtROIoDeviceBasePrivate() : QObjectPrivate()
{
m_dataStream.setVersion(dataStreamVersion);
}
diff --git a/src/remoteobjects/qconnectionfactories.h b/src/remoteobjects/qconnectionfactories.h
index c34c8fd..02ab03b 100644
--- a/src/remoteobjects/qconnectionfactories.h
+++ b/src/remoteobjects/qconnectionfactories.h
@@ -55,18 +55,18 @@
QT_BEGIN_NAMESPACE
-class IoDeviceBasePrivate;
-class ClientIoDevicePrivate;
-class ExternalIoDevicePrivate;
+class QtROIoDeviceBasePrivate;
+class QtROClientIoDevicePrivate;
+class QtROExternalIoDevicePrivate;
-class Q_REMOTEOBJECTS_EXPORT IoDeviceBase : public QObject
+class Q_REMOTEOBJECTS_EXPORT QtROIoDeviceBase : public QObject
{
Q_OBJECT
- Q_DISABLE_COPY(IoDeviceBase)
+ Q_DISABLE_COPY(QtROIoDeviceBase)
public:
- explicit IoDeviceBase(QObject *parent = nullptr);
- ~IoDeviceBase() override;
+ explicit QtROIoDeviceBase(QObject *parent = nullptr);
+ ~QtROIoDeviceBase() override;
bool read(QtRemoteObjects::QRemoteObjectPacketTypeEnum &, QString &);
@@ -87,24 +87,24 @@ Q_SIGNALS:
void disconnected();
protected:
- explicit IoDeviceBase(IoDeviceBasePrivate &, QObject *parent);
+ explicit QtROIoDeviceBase(QtROIoDeviceBasePrivate &, QObject *parent);
virtual QString deviceType() const = 0;
virtual void doClose() = 0;
private:
- Q_DECLARE_PRIVATE(IoDeviceBase)
+ Q_DECLARE_PRIVATE(QtROIoDeviceBase)
friend class QRemoteObjectNodePrivate;
friend class QConnectedReplicaImplementation;
friend class QRemoteObjectSourceIo;
};
-class Q_REMOTEOBJECTS_EXPORT ServerIoDevice : public IoDeviceBase
+class Q_REMOTEOBJECTS_EXPORT QtROServerIoDevice : public QtROIoDeviceBase
{
Q_OBJECT
- Q_DISABLE_COPY(ServerIoDevice)
+ Q_DISABLE_COPY(QtROServerIoDevice)
public:
- explicit ServerIoDevice(QObject *parent = nullptr);
+ explicit QtROServerIoDevice(QObject *parent = nullptr);
protected:
QString deviceType() const override;
@@ -120,27 +120,27 @@ public:
~QConnectionAbstractServer() override;
virtual bool hasPendingConnections() const = 0;
- ServerIoDevice* nextPendingConnection();
+ QtROServerIoDevice* nextPendingConnection();
virtual QUrl address() const = 0;
virtual bool listen(const QUrl &address) = 0;
virtual QAbstractSocket::SocketError serverError() const = 0;
virtual void close() = 0;
protected:
- virtual ServerIoDevice* configureNewConnection() = 0;
+ virtual QtROServerIoDevice* configureNewConnection() = 0;
Q_SIGNALS:
void newConnection();
};
-class Q_REMOTEOBJECTS_EXPORT ClientIoDevice : public IoDeviceBase
+class Q_REMOTEOBJECTS_EXPORT QtROClientIoDevice : public QtROIoDeviceBase
{
Q_OBJECT
- Q_DISABLE_COPY(ClientIoDevice)
+ Q_DISABLE_COPY(QtROClientIoDevice)
public:
- explicit ClientIoDevice(QObject *parent = nullptr);
- ~ClientIoDevice() override;
+ explicit QtROClientIoDevice(QObject *parent = nullptr);
+ ~QtROClientIoDevice() override;
void disconnectFromServer();
virtual void connectToServer() = 0;
@@ -148,7 +148,7 @@ public:
QUrl url() const;
Q_SIGNALS:
- void shouldReconnect(ClientIoDevice*);
+ void shouldReconnect(QtROClientIoDevice*);
protected:
virtual void doDisconnectFromServer() = 0;
@@ -156,7 +156,7 @@ protected:
void setUrl(const QUrl &url);
private:
- Q_DECLARE_PRIVATE(ClientIoDevice)
+ Q_DECLARE_PRIVATE(QtROClientIoDevice)
friend class QtROClientFactory;
};
@@ -198,13 +198,13 @@ public:
Q_REMOTEOBJECTS_EXPORT static QtROClientFactory *instance();
/// creates an object from a string
- ClientIoDevice *create(const QUrl &url, QObject *parent = nullptr)
+ QtROClientIoDevice *create(const QUrl &url, QObject *parent = nullptr)
{
auto creatorFunc = m_creatorFuncs.value(url.scheme());
if (!creatorFunc)
return nullptr;
- ClientIoDevice *res = (*creatorFunc)(parent);
+ QtROClientIoDevice *res = (*creatorFunc)(parent);
if (res)
res->setUrl(url);
return res;
@@ -213,7 +213,7 @@ public:
template<typename T>
void registerType(const QString &id)
{
- m_creatorFuncs[id] = [](QObject *parent) -> ClientIoDevice * {
+ m_creatorFuncs[id] = [](QObject *parent) -> QtROClientIoDevice * {
return new T(parent);
};
}
@@ -227,7 +227,7 @@ private:
friend class QtROFactoryLoader;
QtROClientFactory();
- using CreatorFunc = ClientIoDevice * (*)(QObject *);
+ using CreatorFunc = QtROClientIoDevice * (*)(QObject *);
QHash<QString, CreatorFunc> m_creatorFuncs;
};
diff --git a/src/remoteobjects/qconnectionfactories_p.h b/src/remoteobjects/qconnectionfactories_p.h
index 4b54d74..a0e1080 100644
--- a/src/remoteobjects/qconnectionfactories_p.h
+++ b/src/remoteobjects/qconnectionfactories_p.h
@@ -69,12 +69,12 @@ static const QLatin1String protocolVersion("QtRO 1.3");
}
-class ExternalIoDevice : public IoDeviceBase
+class QtROExternalIoDevice : public QtROIoDeviceBase
{
Q_OBJECT
public:
- explicit ExternalIoDevice(QIODevice *device, QObject *parent=nullptr);
+ explicit QtROExternalIoDevice(QIODevice *device, QObject *parent=nullptr);
QIODevice *connection() const override;
bool isOpen() const override;
@@ -82,13 +82,13 @@ protected:
void doClose() override;
QString deviceType() const override;
private:
- Q_DECLARE_PRIVATE(ExternalIoDevice)
+ Q_DECLARE_PRIVATE(QtROExternalIoDevice)
};
-class IoDeviceBasePrivate : public QObjectPrivate
+class QtROIoDeviceBasePrivate : public QObjectPrivate
{
public:
- IoDeviceBasePrivate();
+ QtROIoDeviceBasePrivate();
// TODO Remove stream()
QDataStream &stream() { return m_dataStream; }
@@ -98,23 +98,23 @@ public:
QDataStream m_dataStream;
QSet<QString> m_remoteObjects;
QRemoteObjectPackets::CodecBase *m_codec { nullptr };
- Q_DECLARE_PUBLIC(IoDeviceBase)
+ Q_DECLARE_PUBLIC(QtROIoDeviceBase)
};
-class ClientIoDevicePrivate : public IoDeviceBasePrivate
+class QtROClientIoDevicePrivate : public QtROIoDeviceBasePrivate
{
public:
- ClientIoDevicePrivate() : IoDeviceBasePrivate() { }
+ QtROClientIoDevicePrivate() : QtROIoDeviceBasePrivate() { }
QUrl m_url;
- Q_DECLARE_PUBLIC(ClientIoDevice)
+ Q_DECLARE_PUBLIC(QtROClientIoDevice)
};
-class ExternalIoDevicePrivate : public IoDeviceBasePrivate
+class QtROExternalIoDevicePrivate : public QtROIoDeviceBasePrivate
{
public:
- ExternalIoDevicePrivate(QIODevice *device) : IoDeviceBasePrivate(), m_device(device) { }
+ QtROExternalIoDevicePrivate(QIODevice *device) : QtROIoDeviceBasePrivate(), m_device(device) { }
QPointer<QIODevice> m_device;
- Q_DECLARE_PUBLIC(ExternalIoDevice)
+ Q_DECLARE_PUBLIC(QtROExternalIoDevice)
};
QT_END_NAMESPACE
diff --git a/src/remoteobjects/qremoteobjectnode.cpp b/src/remoteobjects/qremoteobjectnode.cpp
index 35cb283..59dd4a9 100644
--- a/src/remoteobjects/qremoteobjectnode.cpp
+++ b/src/remoteobjects/qremoteobjectnode.cpp
@@ -78,7 +78,7 @@ struct ManagedGadgetTypeEntry
static QMutex s_managedTypesMutex;
static QHash<int, ManagedGadgetTypeEntry> s_managedTypes;
-static QHash<int, QSet<IoDeviceBase*>> s_trackedConnections;
+static QHash<int, QSet<QtROIoDeviceBase*>> s_trackedConnections;
static void GadgetsStaticMetacallFunction(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
{
@@ -757,7 +757,7 @@ const QMetaObject *QRemoteObjectMetaObjectManager::metaObjectForType(const QStri
return dynamicTypes.value(type);
}
-static void trackConnection(int typeId, IoDeviceBase *connection)
+static void trackConnection(int typeId, QtROIoDeviceBase *connection)
{
QMutexLocker lock(&s_managedTypesMutex);
if (s_trackedConnections[typeId].contains(connection))
@@ -778,7 +778,7 @@ static void trackConnection(int typeId, IoDeviceBase *connection)
// Unregister the type only when the connection is destroyed
// Do not unregister types when the connections is discconected, because
// if it gets reconnected it will not register the types again
- QObject::connect(connection, &IoDeviceBase::destroyed, unregisterIfNotUsed);
+ QObject::connect(connection, &QtROIoDeviceBase::destroyed, unregisterIfNotUsed);
}
struct EnumPair {
@@ -879,7 +879,7 @@ static TypeInfo *registerEnum(const QByteArray &name, uint size=4u)
return result;
}
-static int registerGadgets(IoDeviceBase *connection, Gadgets &gadgets, QByteArray typeName)
+static int registerGadgets(QtROIoDeviceBase *connection, Gadgets &gadgets, QByteArray typeName)
{
const auto &gadget = gadgets.take(typeName);
// TODO Look at having registerGadgets return QMetaType index of the id of the type
@@ -979,7 +979,7 @@ static int registerGadgets(IoDeviceBase *connection, Gadgets &gadgets, QByteArra
return gadgetTypeId;
}
-static void registerAllGadgets(IoDeviceBase *connection, Gadgets &gadgets)
+static void registerAllGadgets(QtROIoDeviceBase *connection, Gadgets &gadgets)
{
while (!gadgets.isEmpty())
registerGadgets(connection, gadgets, gadgets.constBegin().key());
@@ -1000,7 +1000,7 @@ static void deserializeEnum(QDataStream &ds, EnumData &enumData)
}
}
-static void parseGadgets(IoDeviceBase *connection, QDataStream &in)
+static void parseGadgets(QtROIoDeviceBase *connection, QDataStream &in)
{
quint32 qtEnums, numGadgets;
in >> qtEnums; // Qt enums - just need registration
@@ -1037,7 +1037,7 @@ static void parseGadgets(IoDeviceBase *connection, QDataStream &in)
registerAllGadgets(connection, gadgets);
}
-QMetaObject *QRemoteObjectMetaObjectManager::addDynamicType(IoDeviceBase *connection, QDataStream &in)
+QMetaObject *QRemoteObjectMetaObjectManager::addDynamicType(QtROIoDeviceBase *connection, QDataStream &in)
{
QMetaObjectBuilder builder;
builder.setSuperClass(&QRemoteObjectReplica::staticMetaObject);
@@ -1218,17 +1218,17 @@ bool QRemoteObjectNodePrivate::initConnection(const QUrl &address)
return true;
}
- ClientIoDevice *connection = QtROClientFactory::instance()->create(address, q);
+ QtROClientIoDevice *connection = QtROClientFactory::instance()->create(address, q);
if (!connection) {
- qROPrivWarning() << "Could not create ClientIoDevice for client. Invalid url/scheme provided?" << address;
+ qROPrivWarning() << "Could not create QtROClientIoDevice for client. Invalid url/scheme provided?" << address;
return false;
}
qROPrivDebug() << "Opening connection to" << address.toString();
qROPrivDebug() << "Replica Connection isValid" << connection->isOpen();
- QObject::connect(connection, &ClientIoDevice::shouldReconnect, q, [this, connection]() {
+ QObject::connect(connection, &QtROClientIoDevice::shouldReconnect, q, [this, connection]() {
onShouldReconnect(connection);
});
- QObject::connect(connection, &IoDeviceBase::readyRead, q, [this, connection]() {
+ QObject::connect(connection, &QtROIoDeviceBase::readyRead, q, [this, connection]() {
onClientRead(connection);
});
connection->connectToServer();
@@ -1315,7 +1315,7 @@ void QRemoteObjectNodePrivate::onRegistryInitialized()
}
}
-void QRemoteObjectNodePrivate::onShouldReconnect(ClientIoDevice *ioDevice)
+void QRemoteObjectNodePrivate::onShouldReconnect(QtROClientIoDevice *ioDevice)
{
Q_Q(QRemoteObjectNode);
@@ -1385,7 +1385,7 @@ void QRemoteObjectNodePrivate::handleReplicaConnection(const QString &name)
}
}
-void QRemoteObjectNodePrivate::handleReplicaConnection(const QByteArray &sourceSignature, QConnectedReplicaImplementation *rep, IoDeviceBase *connection)
+void QRemoteObjectNodePrivate::handleReplicaConnection(const QByteArray &sourceSignature, QConnectedReplicaImplementation *rep, QtROIoDeviceBase *connection)
{
if (!checkSignatures(rep->m_objectSignature, sourceSignature)) {
qROPrivWarning() << "Signature mismatch for" << rep->m_metaObject->className() << (rep->m_objectName.isEmpty() ? QLatin1String("(unnamed)") : rep->m_objectName);
@@ -1414,7 +1414,7 @@ QReplicaImplementationInterface *QRemoteObjectHostBasePrivate::handleNewAcquire(
void QRemoteObjectNodePrivate::onClientRead(QObject *obj)
{
using namespace QRemoteObjectPackets;
- IoDeviceBase *connection = qobject_cast<IoDeviceBase*>(obj);
+ QtROIoDeviceBase *connection = qobject_cast<QtROIoDeviceBase*>(obj);
QRemoteObjectPacketTypeEnum packetType;
Q_ASSERT(connection);
auto &codec = connection->d_func()->m_codec;
@@ -2297,8 +2297,8 @@ void QRemoteObjectNode::addClientSideConnection(QIODevice *ioDevice)
qWarning() << "A null or closed QIODevice was passed to addClientSideConnection(). Ignoring.";
return;
}
- ExternalIoDevice *device = new ExternalIoDevice(ioDevice, this);
- connect(device, &IoDeviceBase::readyRead, this, [d, device]() {
+ QtROExternalIoDevice *device = new QtROExternalIoDevice(ioDevice, this);
+ connect(device, &QtROIoDeviceBase::readyRead, this, [d, device]() {
d->onClientRead(device);
});
if (device->bytesAvailable())
@@ -2583,7 +2583,7 @@ void QRemoteObjectHostBase::addHostSideConnection(QIODevice *ioDevice)
}
if (!d->remoteObjectIo)
d->remoteObjectIo = new QRemoteObjectSourceIo(this);
- ExternalIoDevice *device = new ExternalIoDevice(ioDevice, this);
+ QtROExternalIoDevice *device = new QtROExternalIoDevice(ioDevice, this);
return d->remoteObjectIo->newConnection(device);
}
diff --git a/src/remoteobjects/qremoteobjectnode_p.h b/src/remoteobjects/qremoteobjectnode_p.h
index dbfe0ca..4c4e0b0 100644
--- a/src/remoteobjects/qremoteobjectnode_p.h
+++ b/src/remoteobjects/qremoteobjectnode_p.h
@@ -90,7 +90,7 @@ public:
~QRemoteObjectMetaObjectManager();
const QMetaObject *metaObjectForType(const QString &type);
- QMetaObject *addDynamicType(IoDeviceBase* connection, QDataStream &in);
+ QMetaObject *addDynamicType(QtROIoDeviceBase* connection, QDataStream &in);
void addFromMetaObject(const QMetaObject *);
private:
@@ -156,11 +156,11 @@ public:
void onRemoteObjectSourceAdded(const QRemoteObjectSourceLocation &entry);
void onRemoteObjectSourceRemoved(const QRemoteObjectSourceLocation &entry);
void onRegistryInitialized();
- void onShouldReconnect(ClientIoDevice *ioDevice);
+ void onShouldReconnect(QtROClientIoDevice *ioDevice);
virtual QReplicaImplementationInterface *handleNewAcquire(const QMetaObject *meta, QRemoteObjectReplica *instance, const QString &name);
void handleReplicaConnection(const QString &name);
- void handleReplicaConnection(const QByteArray &sourceSignature, QConnectedReplicaImplementation *rep, IoDeviceBase *connection);
+ void handleReplicaConnection(const QByteArray &sourceSignature, QConnectedReplicaImplementation *rep, QtROIoDeviceBase *connection);
void initialize();
private:
bool checkSignatures(const QByteArray &a, const QByteArray &b);
@@ -168,7 +168,7 @@ private:
public:
struct SourceInfo
{
- IoDeviceBase* device;
+ QtROIoDeviceBase* device;
QString typeName;
QByteArray objectSignature;
};
@@ -178,7 +178,7 @@ public:
QHash<QString, QWeakPointer<QReplicaImplementationInterface> > replicas;
QMap<QString, SourceInfo> connectedSources;
QMap<QString, QRemoteObjectNode::RemoteObjectSchemaHandler> schemaHandlers;
- QSet<ClientIoDevice*> pendingReconnect;
+ QSet<QtROClientIoDevice*> pendingReconnect;
QSet<QUrl> requestedUrls;
QRemoteObjectRegistry *registry;
int retryInterval;
diff --git a/src/remoteobjects/qremoteobjectpacket.cpp b/src/remoteobjects/qremoteobjectpacket.cpp
index a5a431c..d3a94f0 100644
--- a/src/remoteobjects/qremoteobjectpacket.cpp
+++ b/src/remoteobjects/qremoteobjectpacket.cpp
@@ -734,7 +734,7 @@ DataStreamPacket::DataStreamPacket(quint16 id)
*this << id;
}
-void CodecBase::send(const QSet<IoDeviceBase *> &connections)
+void CodecBase::send(const QSet<QtROIoDeviceBase *> &connections)
{
const auto bytearray = getPayload();
for (auto conn : connections)
@@ -742,7 +742,7 @@ void CodecBase::send(const QSet<IoDeviceBase *> &connections)
reset();
}
-void CodecBase::send(const QList<IoDeviceBase *> &connections)
+void CodecBase::send(const QList<QtROIoDeviceBase *> &connections)
{
const auto bytearray = getPayload();
for (auto conn : connections)
@@ -750,7 +750,7 @@ void CodecBase::send(const QList<IoDeviceBase *> &connections)
reset();
}
-void CodecBase::send(IoDeviceBase *connection)
+void CodecBase::send(QtROIoDeviceBase *connection)
{
const auto bytearray = getPayload();
connection->write(bytearray);
diff --git a/src/remoteobjects/qremoteobjectpacket_p.h b/src/remoteobjects/qremoteobjectpacket_p.h
index 3935b7f..e532042 100644
--- a/src/remoteobjects/qremoteobjectpacket_p.h
+++ b/src/remoteobjects/qremoteobjectpacket_p.h
@@ -210,9 +210,9 @@ public:
virtual void deserializeInitPacket(QDataStream &, QVariantList &) = 0;
virtual void deserializeInvokeReplyPacket(QDataStream &in, int &ackedSerialId,
QVariant &value) = 0;
- void send(const QSet<IoDeviceBase *> &connections);
- void send(const QVector<IoDeviceBase *> &connections);
- void send(IoDeviceBase *connection);
+ void send(const QSet<QtROIoDeviceBase *> &connections);
+ void send(const QVector<QtROIoDeviceBase *> &connections);
+ void send(QtROIoDeviceBase *connection);
protected:
// A payload can consist of one or more packets
diff --git a/src/remoteobjects/qremoteobjectreplica.cpp b/src/remoteobjects/qremoteobjectreplica.cpp
index 86baea1..f37e9de 100644
--- a/src/remoteobjects/qremoteobjectreplica.cpp
+++ b/src/remoteobjects/qremoteobjectreplica.cpp
@@ -107,7 +107,7 @@ QConnectedReplicaImplementation::QConnectedReplicaImplementation(const QString &
connect(&m_heartbeatTimer, &QTimer::timeout, this, [this] {
// TODO: Revisit if a baseclass method can be used to avoid specialized cast
// conditional logic.
- auto clientIo = qobject_cast<ClientIoDevice *>(connectionToSource);
+ auto clientIo = qobject_cast<QtROClientIoDevice *>(connectionToSource);
if (m_pendingCalls.contains(0)) {
m_pendingCalls.take(0);
// The source didn't respond in time, disconnect the connection
@@ -468,7 +468,7 @@ void QConnectedReplicaImplementation::setProperty(int i, const QVariant &prop)
m_propertyStorage[i] = prop;
}
-void QConnectedReplicaImplementation::setConnection(IoDeviceBase *conn)
+void QConnectedReplicaImplementation::setConnection(QtROIoDeviceBase *conn)
{
if (connectionToSource.isNull()) {
connectionToSource = conn;
diff --git a/src/remoteobjects/qremoteobjectreplica_p.h b/src/remoteobjects/qremoteobjectreplica_p.h
index 9f350c4..dde0317 100644
--- a/src/remoteobjects/qremoteobjectreplica_p.h
+++ b/src/remoteobjects/qremoteobjectreplica_p.h
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
class QRemoteObjectReplica;
class QRemoteObjectSource;
-class IoDeviceBase;
+class QtROIoDeviceBase;
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(IoDeviceBase *conn);
+ void setConnection(QtROIoDeviceBase *conn);
void setDisconnected();
void _q_send(QMetaObject::Call call, int index, const QVariantList &args) override;
@@ -176,7 +176,7 @@ public:
QList<QRemoteObjectReplica *> m_parentsNeedingConnect;
QVariantList m_propertyStorage;
QList<int> m_childIndices;
- QPointer<IoDeviceBase> connectionToSource;
+ QPointer<QtROIoDeviceBase> connectionToSource;
// pending call data
int m_curSerialId = 1; // 0 is reserved for heartbeat signals
diff --git a/src/remoteobjects/qremoteobjectsource.cpp b/src/remoteobjects/qremoteobjectsource.cpp
index 1899cc1..e84cf64 100644
--- a/src/remoteobjects/qremoteobjectsource.cpp
+++ b/src/remoteobjects/qremoteobjectsource.cpp
@@ -281,7 +281,7 @@ QRemoteObjectRootSource::~QRemoteObjectRootSource()
// removeListener tries to modify d->m_listeners, this is O(N²),
// so clear d->m_listeners prior to calling unregister (consume loop).
// We can do this, because we don't care about the return value of removeListener() here.
- for (IoDeviceBase *io : qExchange(d->m_listeners, {})) {
+ for (QtROIoDeviceBase *io : qExchange(d->m_listeners, {})) {
removeListener(io, true);
}
delete d;
@@ -402,7 +402,7 @@ void QRemoteObjectSourceBase::handleMetaCall(int index, QMetaObject::Call call,
d->codec->send(d->m_listeners);
}
-void QRemoteObjectRootSource::addListener(IoDeviceBase *io, bool dynamic)
+void QRemoteObjectRootSource::addListener(QtROIoDeviceBase *io, bool dynamic)
{
d->m_listeners.append(io);
d->isDynamic = d->isDynamic || dynamic;
@@ -417,7 +417,7 @@ void QRemoteObjectRootSource::addListener(IoDeviceBase *io, bool dynamic)
}
}
-int QRemoteObjectRootSource::removeListener(IoDeviceBase *io, bool shouldSendRemove)
+int QRemoteObjectRootSource::removeListener(QtROIoDeviceBase *io, bool shouldSendRemove)
{
d->m_listeners.removeAll(io);
if (shouldSendRemove)
diff --git a/src/remoteobjects/qremoteobjectsource_p.h b/src/remoteobjects/qremoteobjectsource_p.h
index 467d504..fe71497 100644
--- a/src/remoteobjects/qremoteobjectsource_p.h
+++ b/src/remoteobjects/qremoteobjectsource_p.h
@@ -61,7 +61,7 @@
QT_BEGIN_NAMESPACE
class QRemoteObjectSourceIo;
-class IoDeviceBase;
+class QtROIoDeviceBase;
class QRemoteObjectSourceBase : public QObject
{
@@ -86,7 +86,7 @@ public:
struct Private {
Private(QRemoteObjectSourceIo *io, QRemoteObjectRootSource *root);
QRemoteObjectSourceIo *m_sourceIo;
- QList<IoDeviceBase*> m_listeners;
+ QList<QtROIoDeviceBase*> m_listeners;
// Pointer to codec, not owned by Private. We can assume it is valid.
QRemoteObjectPackets::CodecBase *codec;
@@ -123,8 +123,8 @@ public:
bool isRoot() const override { return true; }
QString name() const override { return m_name; }
- void addListener(IoDeviceBase *io, bool dynamic = false);
- int removeListener(IoDeviceBase *io, bool shouldSendRemove = false);
+ void addListener(QtROIoDeviceBase *io, bool dynamic = false);
+ int removeListener(QtROIoDeviceBase *io, bool shouldSendRemove = false);
QString m_name;
};
diff --git a/src/remoteobjects/qremoteobjectsourceio.cpp b/src/remoteobjects/qremoteobjectsourceio.cpp
index b651de2..b59fa6d 100644
--- a/src/remoteobjects/qremoteobjectsourceio.cpp
+++ b/src/remoteobjects/qremoteobjectsourceio.cpp
@@ -155,7 +155,7 @@ void QRemoteObjectSourceIo::unregisterSource(QRemoteObjectSourceBase *source)
void QRemoteObjectSourceIo::onServerDisconnect(QObject *conn)
{
- IoDeviceBase *connection = qobject_cast<IoDeviceBase*>(conn);
+ QtROIoDeviceBase *connection = qobject_cast<QtROIoDeviceBase*>(conn);
m_connections.remove(connection);
qRODebug(this) << "OnServerDisconnect";
@@ -173,7 +173,7 @@ void QRemoteObjectSourceIo::onServerDisconnect(QObject *conn)
void QRemoteObjectSourceIo::onServerRead(QObject *conn)
{
// Assert the invariant here conn is of type QIODevice
- IoDeviceBase *connection = qobject_cast<IoDeviceBase*>(conn);
+ QtROIoDeviceBase *connection = qobject_cast<QtROIoDeviceBase*>(conn);
QRemoteObjectPacketTypeEnum packetType;
do {
@@ -294,17 +294,17 @@ void QRemoteObjectSourceIo::handleConnection()
{
qRODebug(this) << "handleConnection" << m_connections;
- ServerIoDevice *conn = m_server->nextPendingConnection();
+ QtROServerIoDevice *conn = m_server->nextPendingConnection();
newConnection(conn);
}
-void QRemoteObjectSourceIo::newConnection(IoDeviceBase *conn)
+void QRemoteObjectSourceIo::newConnection(QtROIoDeviceBase *conn)
{
m_connections.insert(conn);
- connect(conn, &IoDeviceBase::readyRead, this, [this, conn]() {
+ connect(conn, &QtROIoDeviceBase::readyRead, this, [this, conn]() {
onServerRead(conn);
});
- connect(conn, &IoDeviceBase::disconnected, this, [this, conn]() {
+ connect(conn, &QtROIoDeviceBase::disconnected, this, [this, conn]() {
onServerDisconnect(conn);
});
diff --git a/src/remoteobjects/qremoteobjectsourceio_p.h b/src/remoteobjects/qremoteobjectsourceio_p.h
index 9f7a863..37d952e 100644
--- a/src/remoteobjects/qremoteobjectsourceio_p.h
+++ b/src/remoteobjects/qremoteobjectsourceio_p.h
@@ -78,7 +78,7 @@ public:
const QString &typeName);
bool enableRemoting(QObject *object, const SourceApiMap *api, QObject *adapter = nullptr);
bool disableRemoting(QObject *object);
- void newConnection(IoDeviceBase *conn);
+ void newConnection(QtROIoDeviceBase *conn);
QUrl serverAddress() const;
@@ -97,11 +97,11 @@ public:
void unregisterSource(QRemoteObjectSourceBase *source);
QHash<QIODevice*, quint32> m_readSize;
- QSet<IoDeviceBase*> m_connections;
+ QSet<QtROIoDeviceBase*> m_connections;
QHash<QObject *, QRemoteObjectRootSource*> m_objectToSourceMap;
QMap<QString, QRemoteObjectSourceBase*> m_sourceObjects;
QMap<QString, QRemoteObjectRootSource*> m_sourceRoots;
- QHash<IoDeviceBase*, QUrl> m_registryMapping;
+ QHash<QtROIoDeviceBase*, QUrl> m_registryMapping;
QScopedPointer<QConnectionAbstractServer> m_server;
// TODO should have some sort of manager for the codec
QScopedPointer<QRemoteObjectPackets::CodecBase> m_codec{new QRemoteObjectPackets::QDataStreamCodec};