QtRO{Client,Server}Factory: Make ctor private

Reduce exposed public API a little bit more. As suggested in a previous
change-request.

Change-Id: Ia64e9a2dc515969943deb2bca2c5702b4f26a52e
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>

2 files changed, 8 insertions, 6 deletions

diff --git a/src/remoteobjects/qconnectionfactories.cpp b/src/remoteobjects/qconnectionfactories.cpp
index 01546be..6be1e17 100644
--- a/src/remoteobjects/qconnectionfactories.cpp
+++ b/src/remoteobjects/qconnectionfactories.cpp
@@ -52,14 +52,14 @@ QT_BEGIN_NAMESPACE
 
 using namespace QtRemoteObjects;
 
-class FactoryLoader
+class QtROFactoryLoader
 {
 public:
     QtROClientFactory clientFactory;
     QtROServerFactory serverFactory;
 };
 
-Q_GLOBAL_STATIC(FactoryLoader, loader)
+Q_GLOBAL_STATIC(QtROFactoryLoader, loader)
 
 inline bool fromDataStream(QDataStream &in, QRemoteObjectPacketTypeEnum &type, QString &name)
 {
diff --git a/src/remoteobjects/qconnectionfactories.h b/src/remoteobjects/qconnectionfactories.h
index e9f8b45..8556f3a 100644
--- a/src/remoteobjects/qconnectionfactories.h
+++ b/src/remoteobjects/qconnectionfactories.h
@@ -153,8 +153,6 @@ private:
 class QtROServerFactory
 {
 public:
-    QtROServerFactory();
-
     Q_REMOTEOBJECTS_EXPORT static QtROServerFactory *instance();
 
     QConnectionAbstractServer *create(const QUrl &url, QObject *parent = nullptr)
@@ -172,6 +170,9 @@ public:
     }
 
 private:
+    friend class QtROFactoryLoader;
+    QtROServerFactory();
+
     using CreatorFunc = QConnectionAbstractServer * (*)(QObject *);
     QHash<QString, CreatorFunc> m_creatorFuncs;
 };
@@ -179,8 +180,6 @@ private:
 class QtROClientFactory
 {
 public:
-    QtROClientFactory();
-
     Q_REMOTEOBJECTS_EXPORT static QtROClientFactory *instance();
 
     /// creates an object from a string
@@ -205,6 +204,9 @@ public:
     }
 
 private:
+    friend class QtROFactoryLoader;
+    QtROClientFactory();
+
     using CreatorFunc = ClientIoDevice * (*)(QObject *);
     QHash<QString, CreatorFunc> m_creatorFuncs;
 };