Update jobs to remove post FF changes

Made the d_ptr private again.

Change-Id: Ia5ba23b03cd22290d5c922e9a1c657a67ff98977
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

3 files changed, 10 insertions, 1 deletions

diff --git a/src/core/jobs/qaspectjob.cpp b/src/core/jobs/qaspectjob.cpp
index 318a431ac..bdb2063ba 100644
--- a/src/core/jobs/qaspectjob.cpp
+++ b/src/core/jobs/qaspectjob.cpp
@@ -66,6 +66,11 @@ QAspectJobPrivate *QAspectJobPrivate::get(QAspectJob *job)
     return job->d_func();
 }
 
+const QAspectJobPrivate *QAspectJobPrivate::get(const QAspectJob *job)
+{
+    return job->d_func();
+}
+
 void QAspectJobPrivate::postFrame(QAspectManager *aspectManager)
 {
     Q_UNUSED(aspectManager)
diff --git a/src/core/jobs/qaspectjob.h b/src/core/jobs/qaspectjob.h
index deb8cf2ed..bd86a61e1 100644
--- a/src/core/jobs/qaspectjob.h
+++ b/src/core/jobs/qaspectjob.h
@@ -66,11 +66,11 @@ public:
 
 protected:
     explicit QAspectJob(QAspectJobPrivate &dd);
-    QAspectJobPrivate *d_ptr;
 
 private:
     Q_DISABLE_COPY(QAspectJob)
     Q_DECLARE_PRIVATE(QAspectJob)
+    QAspectJobPrivate *d_ptr;
 };
 
 typedef QSharedPointer<QAspectJob> QAspectJobPtr;
diff --git a/src/core/jobs/qaspectjob_p.h b/src/core/jobs/qaspectjob_p.h
index b16c3cad2..5504bd936 100644
--- a/src/core/jobs/qaspectjob_p.h
+++ b/src/core/jobs/qaspectjob_p.h
@@ -111,6 +111,7 @@ public:
     virtual ~QAspectJobPrivate();
 
     static QAspectJobPrivate *get(QAspectJob *job);
+    static const QAspectJobPrivate *get(const QAspectJob *job);
 
     virtual void postFrame(QAspectManager *aspectManager);
 
@@ -122,6 +123,9 @@ public:
 
 } // Qt3D
 
+#define Q_DJOB(Class) \
+    Class##Private *d = static_cast<Class##Private *>(Qt3DCore::QAspectJobPrivate::get(this))
+
 #if QT_CONFIG(qt3d_profile_jobs)
 
 #include <Qt3DCore/private/qaspectjob_p.h>