Make QAspectJobProviderInterface private

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

6 files changed, 33 insertions, 10 deletions

diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp
index 7dd3d277f..72ec7c502 100644
--- a/src/core/aspects/qabstractaspect.cpp
+++ b/src/core/aspects/qabstractaspect.cpp
@@ -192,6 +192,12 @@ QAbstractAspectJobManager *QAbstractAspectPrivate::jobManager() const
     return m_jobManager;
 }
 
+QVector<QAspectJobPtr> QAbstractAspectPrivate::jobsToExecute(qint64 time)
+{
+    Q_Q(QAbstractAspect);
+    return q->jobsToExecute(time);
+}
+
 void QAbstractAspect::onStartup()
 {
 }
diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h
index 98b157cc0..e5842aa08 100644
--- a/src/core/aspects/qabstractaspect.h
+++ b/src/core/aspects/qabstractaspect.h
@@ -40,24 +40,23 @@
 #include <QObject>
 #include <QSharedPointer>
 #include <Qt3DCore/qt3dcore_global.h>
-#include <Qt3DCore/qaspectjobproviderinterface.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 
 class QAspectEngine;
+class QAspectJob;
 class QAspectManager;
 class QNode;
 class QEntity;
 class QAbstractAspectPrivate;
 class QBackendNodeFunctor;
 
+typedef QSharedPointer<QAspectJob> QAspectJobPtr;
 typedef QSharedPointer<QBackendNodeFunctor> QBackendNodeFunctorPtr;
 
-class QT3DCORESHARED_EXPORT QAbstractAspect
-        : public QObject
-        , public QAspectJobProviderInterface
+class QT3DCORESHARED_EXPORT QAbstractAspect : public QObject
 {
     Q_OBJECT
 
@@ -74,6 +73,8 @@ protected:
 private:
     virtual QVariant executeCommand(const QStringList &args);
 
+    virtual QVector<QAspectJobPtr> jobsToExecute(qint64 time) = 0;
+
     virtual void onInitialize(const QVariantMap &data) = 0;
     virtual void onCleanup() = 0;
 
diff --git a/src/core/aspects/qabstractaspect_p.h b/src/core/aspects/qabstractaspect_p.h
index 2870801aa..445441067 100644
--- a/src/core/aspects/qabstractaspect_p.h
+++ b/src/core/aspects/qabstractaspect_p.h
@@ -49,6 +49,7 @@
 //
 
 #include <private/qobject_p.h>
+#include <private/qaspectjobproviderinterface_p.h>
 #include <private/qbackendnode_p.h>
 #include <private/qbackendnodefactory_p.h>
 #include <private/qsceneobserverinterface_p.h>
@@ -71,6 +72,7 @@ class QT3DCORE_PRIVATE_EXPORT QAbstractAspectPrivate
         : public QObjectPrivate
         , public QBackendNodeFactory
         , public QSceneObserverInterface
+        , public QAspectJobProviderInterface
 {
 public:
     QAbstractAspectPrivate();
@@ -80,6 +82,8 @@ public:
     QServiceLocator *services() const;
     QAbstractAspectJobManager *jobManager() const;
 
+    QVector<QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
+
     QBackendNode *createBackendNode(QNode *frontend) const Q_DECL_OVERRIDE;
     void clearBackendNode(QNode *frontend) const;
 
diff --git a/src/core/jobs/jobs.pri b/src/core/jobs/jobs.pri
index bdd4670ce..58d3184ef 100644
--- a/src/core/jobs/jobs.pri
+++ b/src/core/jobs/jobs.pri
@@ -10,7 +10,7 @@ SOURCES += \
 HEADERS += \
     $$PWD/qaspectjob.h \
     $$PWD/qaspectjob_p.h \
-    $$PWD/qaspectjobproviderinterface.h \
+    $$PWD/qaspectjobproviderinterface_p.h \
     $$PWD/qaspectjobmanager_p.h \
     $$PWD/qabstractaspectjobmanager_p.h \
     $$PWD/dependencyhandler_p.h \
diff --git a/src/core/jobs/qaspectjobproviderinterface.h b/src/core/jobs/qaspectjobproviderinterface_p.h
index c529dfd32..02350b5d6 100644
--- a/src/core/jobs/qaspectjobproviderinterface.h
+++ b/src/core/jobs/qaspectjobproviderinterface_p.h
@@ -34,10 +34,21 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DCORE_QASPECTJOBPROVIDERINTERFACE_H
-#define QT3DCORE_QASPECTJOBPROVIDERINTERFACE_H
+#ifndef QT3DCORE_QASPECTJOBPROVIDERINTERFACE_P_H
+#define QT3DCORE_QASPECTJOBPROVIDERINTERFACE_P_H
 
-#include <Qt3DCore/qt3dcore_global.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/private/qt3dcore_global_p.h>
 #include <Qt3DCore/qaspectjob.h>
 
 #include <QVector>
@@ -63,4 +74,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DCORE_QASPECTJOBPROVIDERINTERFACE_H
+#endif // QT3DCORE_QASPECTJOBPROVIDERINTERFACE_P_H
diff --git a/src/core/qscheduler.cpp b/src/core/qscheduler.cpp
index e0bf05caa..b6b3dedc6 100644
--- a/src/core/qscheduler.cpp
+++ b/src/core/qscheduler.cpp
@@ -37,6 +37,7 @@
 #include "qscheduler_p.h"
 
 #include "qabstractaspect.h"
+#include "qabstractaspect_p.h"
 #include "qaspectmanager_p.h"
 #include "qabstractaspectjobmanager_p.h"
 
@@ -71,7 +72,7 @@ void QScheduler::scheduleAndWaitForFrameAspectJobs(qint64 time)
     // For now just queue them up as they are
     const QList<QAbstractAspect *> &aspects = m_aspectManager->aspects();
     Q_FOREACH (QAbstractAspect *aspect, aspects) {
-        QVector<QAspectJobPtr> aspectJobs = aspect->jobsToExecute(time);
+        QVector<QAspectJobPtr> aspectJobs = QAbstractAspectPrivate::get(aspect)->jobsToExecute(time);
         jobQueue << aspectJobs;
     }