Move classes for adding a custom transport protocol to a public header

Although these classes weren't documented, they could be used externally
to specify a custom transport via inheriting from them and registering
the custom classes using qRegisterRemoteObjectsClient() and
qRegisterRemoteObjectsServer() methods.

Change-Id: Id4cfddf77cd5b55278b5780f4fca447f0706d464
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Reviewed-by: Michael Brasser <michael.brasser@live.com>

1 files changed, 6 insertions, 31 deletions

diff --git a/src/remoteobjects/qconnectionfactories.cpp b/src/remoteobjects/qconnectionfactories.cpp
index af674d0..3a6b668 100644
--- a/src/remoteobjects/qconnectionfactories.cpp
+++ b/src/remoteobjects/qconnectionfactories.cpp
@@ -37,10 +37,8 @@
 **
 ****************************************************************************/
 
-#include <QtCore/private/qobject_p.h>
-
-#include "qconnectionfactories_p.h"
 #include "qconnectionfactories_p.h"
+#include "qremoteobjectpacket_p.h"
 
 // BEGIN: Backends
 #if defined(Q_OS_QNX)
@@ -63,34 +61,6 @@ public:
 
 Q_GLOBAL_STATIC(QtROFactoryLoader, loader)
 
-class IoDeviceBasePrivate : public QObjectPrivate
-{
-public:
-    IoDeviceBasePrivate() : QObjectPrivate() { m_dataStream.setVersion(dataStreamVersion); }
-    ~IoDeviceBasePrivate() = default;
-    bool m_isClosing = false;
-    quint32 m_curReadSize = 0;
-    QDataStream m_dataStream;
-    QSet<QString> m_remoteObjects;
-    Q_DECLARE_PUBLIC(IoDeviceBase)
-};
-
-class ClientIoDevicePrivate : public IoDeviceBasePrivate
-{
-public:
-    ClientIoDevicePrivate() : IoDeviceBasePrivate() { }
-    QUrl m_url;
-    Q_DECLARE_PUBLIC(ClientIoDevice)
-};
-
-class ExternalIoDevicePrivate : public IoDeviceBasePrivate
-{
-public:
-    ExternalIoDevicePrivate(QIODevice *device) : IoDeviceBasePrivate(), m_device(device) { }
-    QPointer<QIODevice> m_device;
-    Q_DECLARE_PUBLIC(ExternalIoDevice)
-};
-
 inline bool fromDataStream(QDataStream &in, QRemoteObjectPacketTypeEnum &type, QString &name)
 {
     quint16 _type;
@@ -418,3 +388,8 @@ QtROClientFactory *QtROClientFactory::instance()
 */
 
 QT_END_NAMESPACE
+
+IoDeviceBasePrivate::IoDeviceBasePrivate() : QObjectPrivate()
+{
+    m_dataStream.setVersion(dataStreamVersion);
+}