QJobManagerInterface renamed to QAspectJobManagerInterface

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

5 files changed, 10 insertions, 10 deletions

diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp
index e6f6c773c..18166d903 100644
--- a/src/core/aspects/qabstractaspect.cpp
+++ b/src/core/aspects/qabstractaspect.cpp
@@ -164,7 +164,7 @@ void QAbstractAspect::registerAspect(QEntity *rootObject)
     setRootEntity(rootObject);
 }
 
-QJobManagerInterface *QAbstractAspect::jobManager() const
+QAspectJobManagerInterface *QAbstractAspect::jobManager() const
 {
     Q_D(const QAbstractAspect);
     return d->m_jobManager;
diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h
index 7baf1e73b..0b18adb17 100644
--- a/src/core/aspects/qabstractaspect.h
+++ b/src/core/aspects/qabstractaspect.h
@@ -60,7 +60,7 @@ class QNode;
 class QBackendNode;
 class QEntity;
 class QAbstractAspectPrivate;
-class QJobManagerInterface;
+class QAspectJobManagerInterface;
 class QBackendNodeFunctor;
 
 typedef QSharedPointer<QBackendNodeFunctor> QBackendNodeFunctorPtr;
@@ -90,7 +90,7 @@ public:
 
     void registerAspect(QEntity *rootObject);
 
-    QJobManagerInterface *jobManager() const;
+    QAspectJobManagerInterface *jobManager() const;
 
 protected:
     QAbstractAspect(QAbstractAspectPrivate &dd, QObject *parent = 0);
diff --git a/src/core/aspects/qabstractaspect_p.h b/src/core/aspects/qabstractaspect_p.h
index cd0d245f4..8023fa7fb 100644
--- a/src/core/aspects/qabstractaspect_p.h
+++ b/src/core/aspects/qabstractaspect_p.h
@@ -53,7 +53,7 @@ namespace Qt3D {
 class QAbstractAspect;
 class QEntity;
 class QAspectManager;
-class QJobManagerInterface;
+class QAspectJobManagerInterface;
 class QChangeArbiter;
 
 class QAbstractAspectPrivate : public QObjectPrivate
@@ -64,7 +64,7 @@ public:
     Q_DECLARE_PUBLIC(QAbstractAspect)
 
     QEntity *m_root;
-    QJobManagerInterface *m_jobManager;
+    QAspectJobManagerInterface *m_jobManager;
     QChangeArbiter *m_arbiter;
     QAbstractAspect::AspectType m_aspectType;
     QHash<QString, QBackendNodeFunctorPtr> m_backendCreatorFunctors;
diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp
index 9d0d421b8..020931c91 100644
--- a/src/core/aspects/qaspectmanager.cpp
+++ b/src/core/aspects/qaspectmanager.cpp
@@ -45,7 +45,7 @@
 #include "qchangearbiter_p.h"
 // TODO Make the kind of job manager configurable (e.g. ThreadWeaver vs Intel TBB)
 #include "qjobmanager.h"
-#include "qjobmanagerinterface.h"
+#include "qaspectjobmanagerinterface.h"
 #include "qscheduler.h"
 #include "qtickclock.h"
 #include "qentity.h"
@@ -219,7 +219,7 @@ const QList<QAbstractAspect *> &QAspectManager::aspects() const
     return m_aspects;
 }
 
-QJobManagerInterface *QAspectManager::jobManager() const
+QAspectJobManagerInterface *QAspectManager::jobManager() const
 {
     return m_jobManager;
 }
diff --git a/src/core/aspects/qaspectmanager_p.h b/src/core/aspects/qaspectmanager_p.h
index fa275f9ed..9be4423b4 100644
--- a/src/core/aspects/qaspectmanager_p.h
+++ b/src/core/aspects/qaspectmanager_p.h
@@ -58,7 +58,7 @@ class QEntity;
 class QScheduler;
 class QChangeArbiter;
 class QAbstractAspect;
-class QJobManagerInterface;
+class QAspectJobManagerInterface;
 class QSceneObserverInterface;
 
 class QT3DCORESHARED_EXPORT QAspectManager : public QObject
@@ -81,7 +81,7 @@ public Q_SLOTS:
     void quit();
 
     const QList<QAbstractAspect *> &aspects() const;
-    QJobManagerInterface *jobManager() const;
+    QAspectJobManagerInterface *jobManager() const;
     QChangeArbiter *changeArbiter() const;
 
 private:
@@ -89,7 +89,7 @@ private:
     QEntity *m_root;
     QSurface *m_surface;
     QScheduler *m_scheduler;
-    QJobManagerInterface *m_jobManager;
+    QAspectJobManagerInterface *m_jobManager;
     QChangeArbiter *m_changeArbiter;
     QAtomicInt m_runMainLoop;
     QAtomicInt m_terminated;