Turn all services private for now

Change-Id: I9da605c77c5489b9bef4f07079e05f8babb9559f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

19 files changed, 124 insertions, 91 deletions

diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp
index 100f51b17..272d290ce 100644
--- a/src/core/aspects/qaspectengine.cpp
+++ b/src/core/aspects/qaspectengine.cpp
@@ -52,8 +52,8 @@
 #include <private/qscene_p.h>
 #include "qentity.h"
 #include "qcomponent.h"
-#include <Qt3DCore/qeventfilterservice.h>
-#include <Qt3DCore/qservicelocator.h>
+#include <Qt3DCore/private/qeventfilterservice_p.h>
+#include <Qt3DCore/private/qservicelocator_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp
index 7f59c1f20..014442e71 100644
--- a/src/core/aspects/qaspectmanager.cpp
+++ b/src/core/aspects/qaspectmanager.cpp
@@ -43,13 +43,13 @@
 #include "qabstractaspectjobmanager_p.h"
 #include "qentity.h"
 
-#include <Qt3DCore/qservicelocator.h>
+#include <Qt3DCore/private/qservicelocator_p.h>
 
 #include <Qt3DCore/private/qtickclockservice_p.h>
 #include <Qt3DCore/private/corelogging_p.h>
 #include <Qt3DCore/private/qscheduler_p.h>
 #include <Qt3DCore/private/qtickclock_p.h>
-#include <Qt3DCore/qabstractframeadvanceservice.h>
+#include <Qt3DCore/private/qabstractframeadvanceservice_p.h>
 #include <QEventLoop>
 #include <QThread>
 #include <QWaitCondition>
diff --git a/src/core/services/nullservices_p.h b/src/core/services/nullservices_p.h
index 3b8740963..5f395a2e2 100644
--- a/src/core/services/nullservices_p.h
+++ b/src/core/services/nullservices_p.h
@@ -50,8 +50,8 @@
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <Qt3DCore/qray3d.h>
-#include "qopenglinformationservice.h"
-#include "qsysteminformationservice.h"
+#include "qopenglinformationservice_p.h"
+#include "qsysteminformationservice_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/services/qabstractframeadvanceservice.cpp b/src/core/services/qabstractframeadvanceservice.cpp
index a396a718a..11e69e074 100644
--- a/src/core/services/qabstractframeadvanceservice.cpp
+++ b/src/core/services/qabstractframeadvanceservice.cpp
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#include "qabstractframeadvanceservice.h"
 #include "qabstractframeadvanceservice_p.h"
+#include "qabstractframeadvanceservice_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/services/qabstractframeadvanceservice_p.h b/src/core/services/qabstractframeadvanceservice_p.h
index 8e60658ef..4f49022be 100644
--- a/src/core/services/qabstractframeadvanceservice_p.h
+++ b/src/core/services/qabstractframeadvanceservice_p.h
@@ -49,22 +49,28 @@
 //
 
 #include <Qt3DCore/qt3dcore_global.h>
-#include <Qt3DCore/private/qabstractserviceprovider_p.h>
-#include <Qt3DCore/qservicelocator.h>
+#include <Qt3DCore/private/qservicelocator_p.h>
+#include <QString>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 
-class QAbstractFrameAdvanceServicePrivate : public QAbstractServiceProviderPrivate
+class QAbstractFrameAdvanceServicePrivate;
+
+class QT3DCORESHARED_EXPORT QAbstractFrameAdvanceService : public QAbstractServiceProvider
 {
 public:
-    QAbstractFrameAdvanceServicePrivate(const QString &description)
-        : QAbstractServiceProviderPrivate(QServiceLocator::FrameAdvanceService, description)
-    {}
+    virtual qint64 waitForNextFrame() = 0;
+    virtual void start() = 0;
+    virtual void stop() = 0;
+
+protected:
+    QAbstractFrameAdvanceService(const QString &description = QString());
+    QAbstractFrameAdvanceService(QAbstractFrameAdvanceServicePrivate &dd);
 };
 
-}
+} // Qt3D
 
 QT_END_NAMESPACE
 
diff --git a/src/core/services/qabstractframeadvanceservice.h b/src/core/services/qabstractframeadvanceservice_p_p.h
index f72672fd3..74a1ed6a4 100644
--- a/src/core/services/qabstractframeadvanceservice.h
+++ b/src/core/services/qabstractframeadvanceservice_p_p.h
@@ -34,34 +34,39 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DCORE_QABSTRACTFRAMEADVANCESERVICE
-#define QT3DCORE_QABSTRACTFRAMEADVANCESERVICE
+#ifndef QT3DCORE_QABSTRACTFRAMEADVANCESERVICE_P_P_H
+#define QT3DCORE_QABSTRACTFRAMEADVANCESERVICE_P_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <Qt3DCore/qt3dcore_global.h>
-#include <Qt3DCore/qservicelocator.h>
-#include <QString>
+#include <Qt3DCore/private/qabstractserviceprovider_p.h>
+#include <Qt3DCore/private/qservicelocator_p.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 
-class QAbstractFrameAdvanceServicePrivate;
-
-class QT3DCORESHARED_EXPORT QAbstractFrameAdvanceService : public QAbstractServiceProvider
+class QAbstractFrameAdvanceServicePrivate : public QAbstractServiceProviderPrivate
 {
 public:
-    virtual qint64 waitForNextFrame() = 0;
-    virtual void start() = 0;
-    virtual void stop() = 0;
-
-protected:
-    QAbstractFrameAdvanceService(const QString &description = QString());
-    QAbstractFrameAdvanceService(QAbstractFrameAdvanceServicePrivate &dd);
+    QAbstractFrameAdvanceServicePrivate(const QString &description)
+        : QAbstractServiceProviderPrivate(QServiceLocator::FrameAdvanceService, description)
+    {}
 };
 
-} // Qt3D
+}
 
 QT_END_NAMESPACE
 
-#endif // QT3DCORE_QABSTRACTFRAMEADVANCESERVICE
+#endif // QT3DCORE_QABSTRACTFRAMEADVANCESERVICE_P_P_H
 
diff --git a/src/core/services/qeventfilterservice.cpp b/src/core/services/qeventfilterservice.cpp
index 36a39116f..c9a74a173 100644
--- a/src/core/services/qeventfilterservice.cpp
+++ b/src/core/services/qeventfilterservice.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qeventfilterservice.h"
+#include "qeventfilterservice_p.h"
 #include "qabstractserviceprovider_p.h"
 #include <QMap>
 #include <QObject>
diff --git a/src/core/services/qeventfilterservice.h b/src/core/services/qeventfilterservice_p.h
index 6c5b8609e..19d8a1d64 100644
--- a/src/core/services/qeventfilterservice.h
+++ b/src/core/services/qeventfilterservice_p.h
@@ -38,7 +38,7 @@
 #define QT3DCORE_QEVENTFILTERSERVICE_H
 
 #include <Qt3DCore/qt3dcore_global.h>
-#include <Qt3DCore/qservicelocator.h>
+#include <Qt3DCore/private/qservicelocator_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/services/qopenglinformationservice.cpp b/src/core/services/qopenglinformationservice.cpp
index c54f3cf30..b77cca3bf 100644
--- a/src/core/services/qopenglinformationservice.cpp
+++ b/src/core/services/qopenglinformationservice.cpp
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#include "qopenglinformationservice.h"
 #include "qopenglinformationservice_p.h"
+#include "qopenglinformationservice_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/services/qopenglinformationservice_p.h b/src/core/services/qopenglinformationservice_p.h
index c16a34d5c..4c5c933b8 100644
--- a/src/core/services/qopenglinformationservice_p.h
+++ b/src/core/services/qopenglinformationservice_p.h
@@ -49,24 +49,28 @@
 //
 
 #include <Qt3DCore/qt3dcore_global.h>
-#include <Qt3DCore/private/qabstractserviceprovider_p.h>
-#include <Qt3DCore/qservicelocator.h>
+#include <Qt3DCore/private/qservicelocator_p.h>
+#include <QtGui/qsurfaceformat.h>
+#include <QtCore/qstring.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 
-class QOpenGLInformationServicePrivate : public QAbstractServiceProviderPrivate
+class QOpenGLInformationServicePrivate;
+
+class QT3DCORESHARED_EXPORT QOpenGLInformationService : public QAbstractServiceProvider
 {
 public:
-    QOpenGLInformationServicePrivate(const QString &description)
-        : QAbstractServiceProviderPrivate(QServiceLocator::OpenGLInformation, description)
-    {}
+    virtual QSurfaceFormat format() const = 0;
+
+protected:
+    QOpenGLInformationService(const QString &description = QString());
+    QOpenGLInformationService(QOpenGLInformationServicePrivate &dd);
 };
 
-}
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
 #endif // QT3DCORE_QOPENGLINFORMATIONSERVICE_P_H
-
diff --git a/src/core/services/qopenglinformationservice.h b/src/core/services/qopenglinformationservice_p_p.h
index 2bd2ffbab..98750b9d5 100644
--- a/src/core/services/qopenglinformationservice.h
+++ b/src/core/services/qopenglinformationservice_p_p.h
@@ -34,32 +34,39 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DCORE_QOPENGLINFORMATIONSERVICE_H
-#define QT3DCORE_QOPENGLINFORMATIONSERVICE_H
+#ifndef QT3DCORE_QOPENGLINFORMATIONSERVICE_P_P_H
+#define QT3DCORE_QOPENGLINFORMATIONSERVICE_P_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <Qt3DCore/qt3dcore_global.h>
-#include <Qt3DCore/qservicelocator.h>
-#include <QtGui/qsurfaceformat.h>
-#include <QtCore/qstring.h>
+#include <Qt3DCore/private/qabstractserviceprovider_p.h>
+#include <Qt3DCore/private/qservicelocator_p.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 
-class QOpenGLInformationServicePrivate;
-
-class QT3DCORESHARED_EXPORT QOpenGLInformationService : public QAbstractServiceProvider
+class QOpenGLInformationServicePrivate : public QAbstractServiceProviderPrivate
 {
 public:
-    virtual QSurfaceFormat format() const = 0;
-
-protected:
-    QOpenGLInformationService(const QString &description = QString());
-    QOpenGLInformationService(QOpenGLInformationServicePrivate &dd);
+    QOpenGLInformationServicePrivate(const QString &description)
+        : QAbstractServiceProviderPrivate(QServiceLocator::OpenGLInformation, description)
+    {}
 };
 
-} // namespace Qt3DCore
+}
 
 QT_END_NAMESPACE
 
-#endif // QT3DCORE_QOPENGLINFORMATIONSERVICE_H
+#endif // QT3DCORE_QOPENGLINFORMATIONSERVICE_P_P_H
+
diff --git a/src/core/services/qservicelocator.cpp b/src/core/services/qservicelocator.cpp
index 394078012..eaa74a925 100644
--- a/src/core/services/qservicelocator.cpp
+++ b/src/core/services/qservicelocator.cpp
@@ -34,11 +34,11 @@
 **
 ****************************************************************************/
 
-#include "qservicelocator.h"
+#include "qservicelocator_p.h"
 #include "qabstractserviceprovider_p.h"
 #include "nullservices_p.h"
 #include "qtickclockservice_p.h"
-#include "qeventfilterservice.h"
+#include "qeventfilterservice_p.h"
 #include <QHash>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/services/qservicelocator.h b/src/core/services/qservicelocator_p.h
index 1692b7072..1692b7072 100644
--- a/src/core/services/qservicelocator.h
+++ b/src/core/services/qservicelocator_p.h
diff --git a/src/core/services/qsysteminformationservice.cpp b/src/core/services/qsysteminformationservice.cpp
index 73148932b..524579a10 100644
--- a/src/core/services/qsysteminformationservice.cpp
+++ b/src/core/services/qsysteminformationservice.cpp
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#include "qsysteminformationservice.h"
 #include "qsysteminformationservice_p.h"
+#include "qsysteminformationservice_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/services/qsysteminformationservice_p.h b/src/core/services/qsysteminformationservice_p.h
index d2aecf1c8..1e4a8bb2a 100644
--- a/src/core/services/qsysteminformationservice_p.h
+++ b/src/core/services/qsysteminformationservice_p.h
@@ -49,24 +49,28 @@
 //
 
 #include <Qt3DCore/qt3dcore_global.h>
-#include <Qt3DCore/private/qabstractserviceprovider_p.h>
-#include <Qt3DCore/qservicelocator.h>
+#include <Qt3DCore/private/qservicelocator_p.h>
+#include <QtCore/qstringlist.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 
-class QSystemInformationServicePrivate : public QAbstractServiceProviderPrivate
+class QSystemInformationServicePrivate;
+
+class QT3DCORESHARED_EXPORT QSystemInformationService : public QAbstractServiceProvider
 {
 public:
-    QSystemInformationServicePrivate(const QString &description)
-        : QAbstractServiceProviderPrivate(QServiceLocator::SystemInformation, description)
-    {}
+    virtual QStringList aspectNames() const = 0;
+    virtual int threadPoolThreadCount() const = 0;
+
+protected:
+    QSystemInformationService(const QString &description = QString());
+    QSystemInformationService(QSystemInformationServicePrivate &dd);
 };
 
-}
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
 #endif // QT3DCORE_QSYSTEMINFORMATIONSERVICE_P_H
-
diff --git a/src/core/services/qsysteminformationservice.h b/src/core/services/qsysteminformationservice_p_p.h
index 19b515e2e..df68ab860 100644
--- a/src/core/services/qsysteminformationservice.h
+++ b/src/core/services/qsysteminformationservice_p_p.h
@@ -34,32 +34,39 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DCORE_QSYSTEMINFORMATIONSERVICE_H
-#define QT3DCORE_QSYSTEMINFORMATIONSERVICE_H
+#ifndef QT3DCORE_QSYSTEMINFORMATIONSERVICE_P_P_H
+#define QT3DCORE_QSYSTEMINFORMATIONSERVICE_P_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <Qt3DCore/qt3dcore_global.h>
-#include <Qt3DCore/qservicelocator.h>
-#include <QtCore/qstringlist.h>
+#include <Qt3DCore/private/qabstractserviceprovider_p.h>
+#include <Qt3DCore/private/qservicelocator_p.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 
-class QSystemInformationServicePrivate;
-
-class QT3DCORESHARED_EXPORT QSystemInformationService : public QAbstractServiceProvider
+class QSystemInformationServicePrivate : public QAbstractServiceProviderPrivate
 {
 public:
-    virtual QStringList aspectNames() const = 0;
-    virtual int threadPoolThreadCount() const = 0;
-
-protected:
-    QSystemInformationService(const QString &description = QString());
-    QSystemInformationService(QSystemInformationServicePrivate &dd);
+    QSystemInformationServicePrivate(const QString &description)
+        : QAbstractServiceProviderPrivate(QServiceLocator::SystemInformation, description)
+    {}
 };
 
-} // namespace Qt3DCore
+}
 
 QT_END_NAMESPACE
 
-#endif // QT3DCORE_QSYSTEMINFORMATIONSERVICE_H
+#endif // QT3DCORE_QSYSTEMINFORMATIONSERVICE_P_P_H
+
diff --git a/src/core/services/qtickclockservice.cpp b/src/core/services/qtickclockservice.cpp
index f13dbfdc5..b53c6b327 100644
--- a/src/core/services/qtickclockservice.cpp
+++ b/src/core/services/qtickclockservice.cpp
@@ -37,6 +37,7 @@
 #include "qtickclockservice_p.h"
 #include "qtickclock_p.h"
 #include "qabstractframeadvanceservice_p.h"
+#include "qabstractframeadvanceservice_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/services/qtickclockservice_p.h b/src/core/services/qtickclockservice_p.h
index 6c1b07722..ec5055da2 100644
--- a/src/core/services/qtickclockservice_p.h
+++ b/src/core/services/qtickclockservice_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include "qabstractframeadvanceservice.h"
+#include "qabstractframeadvanceservice_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/services/services.pri b/src/core/services/services.pri
index a7b00476e..ae0cfd9f8 100644
--- a/src/core/services/services.pri
+++ b/src/core/services/services.pri
@@ -8,17 +8,16 @@ SOURCES += \
     $$PWD/qeventfilterservice.cpp
 
 HEADERS += \
-    $$PWD/qservicelocator.h \
-    $$PWD/qsysteminformationservice.h \
-    $$PWD/nullservices_p.h \
-    $$PWD/qopenglinformationservice.h \
-    $$PWD/qabstractserviceprovider_p.h \
+    $$PWD/qservicelocator_p.h \
     $$PWD/qsysteminformationservice_p.h \
+    $$PWD/nullservices_p.h \
     $$PWD/qopenglinformationservice_p.h \
+    $$PWD/qabstractserviceprovider_p.h \
+    $$PWD/qsysteminformationservice_p_p.h \
+    $$PWD/qopenglinformationservice_p_p.h \
     $$PWD/qtickclockservice_p.h \
-    $$PWD/qtickclockservice_p.h \
-    $$PWD/qabstractframeadvanceservice.h \
     $$PWD/qabstractframeadvanceservice_p.h \
-    $$PWD/qeventfilterservice.h
+    $$PWD/qabstractframeadvanceservice_p_p.h \
+    $$PWD/qeventfilterservice_p.h
 
 INCLUDEPATH += $$PWD