Update jobs to remove post FF changes

Made the d_ptr private again.

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

37 files changed, 34 insertions, 60 deletions

diff --git a/src/animation/backend/abstractevaluateclipanimatorjob.cpp b/src/animation/backend/abstractevaluateclipanimatorjob.cpp
index 5267d4526..e3c8e9e40 100644
--- a/src/animation/backend/abstractevaluateclipanimatorjob.cpp
+++ b/src/animation/backend/abstractevaluateclipanimatorjob.cpp
@@ -75,7 +75,7 @@ void AbstractEvaluateClipAnimatorJob::setPostFrameData(const AnimationRecord &re
                     }), mainThreadCB.end());
     // Should now only have callbacks to be called on main thread
 
-    Q_D(AbstractEvaluateClipAnimatorJob);
+    Q_DJOB(AbstractEvaluateClipAnimatorJob);
     d->m_record = record;
     d->m_callbacks = mainThreadCB;
 }
diff --git a/src/animation/backend/abstractevaluateclipanimatorjob_p.h b/src/animation/backend/abstractevaluateclipanimatorjob_p.h
index 2a8914faa..7027a8639 100644
--- a/src/animation/backend/abstractevaluateclipanimatorjob_p.h
+++ b/src/animation/backend/abstractevaluateclipanimatorjob_p.h
@@ -64,9 +64,6 @@ protected:
     AbstractEvaluateClipAnimatorJob();
 
     void setPostFrameData(const AnimationRecord &record, const QVector<AnimationCallbackAndValue> &callbacks);
-
-private:
-    Q_DECLARE_PRIVATE(AbstractEvaluateClipAnimatorJob)
 };
 
 } // Animation
diff --git a/src/animation/backend/loadanimationclipjob.cpp b/src/animation/backend/loadanimationclipjob.cpp
index 93d4c2d9d..86d7edf87 100644
--- a/src/animation/backend/loadanimationclipjob.cpp
+++ b/src/animation/backend/loadanimationclipjob.cpp
@@ -85,7 +85,7 @@ void LoadAnimationClipJob::clearDirtyAnimationClips()
 void LoadAnimationClipJob::run()
 {
     Q_ASSERT(m_handler);
-    Q_D(LoadAnimationClipJob);
+    Q_DJOB(LoadAnimationClipJob);
 
     d->m_updatedNodes.reserve(m_animationClipHandles.size());
     AnimationClipLoaderManager *animationClipManager = m_handler->animationClipLoaderManager();
diff --git a/src/animation/backend/loadanimationclipjob_p.h b/src/animation/backend/loadanimationclipjob_p.h
index 07d78d416..42cf27854 100644
--- a/src/animation/backend/loadanimationclipjob_p.h
+++ b/src/animation/backend/loadanimationclipjob_p.h
@@ -76,8 +76,6 @@ protected:
     void run() override;
 
 private:
-    Q_DECLARE_PRIVATE(LoadAnimationClipJob)
-
     QVector<HAnimationClip> m_animationClipHandles;
     Handler *m_handler;
 };
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>
diff --git a/src/input/backend/assignkeyboardfocusjob.cpp b/src/input/backend/assignkeyboardfocusjob.cpp
index 5fe329004..d5947f9c9 100644
--- a/src/input/backend/assignkeyboardfocusjob.cpp
+++ b/src/input/backend/assignkeyboardfocusjob.cpp
@@ -77,7 +77,7 @@ void AssignKeyboardFocusJob::setInputHandler(InputHandler *handler)
 
 void AssignKeyboardFocusJob::run()
 {
-    Q_D(AssignKeyboardFocusJob);
+    Q_DJOB(AssignKeyboardFocusJob);
 
     KeyboardDevice *keyboardDevice = m_inputHandler->keyboardDeviceManager()->lookupResource(m_keyboardDevice);
     const auto handles = m_inputHandler->keyboardInputManager()->activeHandles();
diff --git a/src/input/backend/assignkeyboardfocusjob_p.h b/src/input/backend/assignkeyboardfocusjob_p.h
index 200fd72f1..87cc2fbda 100644
--- a/src/input/backend/assignkeyboardfocusjob_p.h
+++ b/src/input/backend/assignkeyboardfocusjob_p.h
@@ -70,8 +70,6 @@ public:
     void run() override;
 
 private:
-    Q_DECLARE_PRIVATE(AssignKeyboardFocusJob)
-
     InputHandler *m_inputHandler;
     const Qt3DCore::QNodeId m_keyboardDevice;
 };
diff --git a/src/input/backend/axisaccumulatorjob.cpp b/src/input/backend/axisaccumulatorjob.cpp
index 16a68349e..b6c1c8482 100644
--- a/src/input/backend/axisaccumulatorjob.cpp
+++ b/src/input/backend/axisaccumulatorjob.cpp
@@ -73,7 +73,7 @@ AxisAccumulatorJob::AxisAccumulatorJob(AxisAccumulatorManager *axisAccumulatorma
 
 void AxisAccumulatorJob::run()
 {
-    Q_D(AxisAccumulatorJob);
+    Q_DJOB(AxisAccumulatorJob);
     // Iterate over the accumulators and ask each to step the integrations
     const auto activeHandles = m_axisAccumulatorManager->activeHandles();
     d->updates.reserve(activeHandles.size());
diff --git a/src/input/backend/axisaccumulatorjob_p.h b/src/input/backend/axisaccumulatorjob_p.h
index 702004dd2..3e8122287 100644
--- a/src/input/backend/axisaccumulatorjob_p.h
+++ b/src/input/backend/axisaccumulatorjob_p.h
@@ -75,8 +75,6 @@ public:
     void run() override;
 
 private:
-    Q_DECLARE_PRIVATE(AxisAccumulatorJob)
-
     AxisAccumulatorManager *m_axisAccumulatorManager;
     AxisManager *m_axisManager;
     float m_dt;
diff --git a/src/input/backend/keyeventdispatcherjob.cpp b/src/input/backend/keyeventdispatcherjob.cpp
index 26a35e885..31db01e53 100644
--- a/src/input/backend/keyeventdispatcherjob.cpp
+++ b/src/input/backend/keyeventdispatcherjob.cpp
@@ -67,7 +67,7 @@ KeyEventDispatcherJob::KeyEventDispatcherJob(Qt3DCore::QNodeId input, const QLis
     : QAspectJob(*new KeyEventDispatcherJobPrivate)
     , m_inputHandler(nullptr)
 {
-    Q_D(KeyEventDispatcherJob);
+    Q_DJOB(KeyEventDispatcherJob);
     d->m_keyboardHandler = input;
     d->m_events = events;
     SET_JOB_RUN_STAT_TYPE(this, JobTypes::KeyEventDispatcher, 0)
diff --git a/src/input/backend/keyeventdispatcherjob_p.h b/src/input/backend/keyeventdispatcherjob_p.h
index bd0c770d4..975dc3d31 100644
--- a/src/input/backend/keyeventdispatcherjob_p.h
+++ b/src/input/backend/keyeventdispatcherjob_p.h
@@ -71,8 +71,6 @@ public:
     void run() override;
 
 private:
-    Q_DECLARE_PRIVATE(KeyEventDispatcherJob)
-
     InputHandler *m_inputHandler;
 };
 
diff --git a/src/input/backend/loadproxydevicejob.cpp b/src/input/backend/loadproxydevicejob.cpp
index 69f14beae..059d14bc0 100644
--- a/src/input/backend/loadproxydevicejob.cpp
+++ b/src/input/backend/loadproxydevicejob.cpp
@@ -94,7 +94,7 @@ QVector<Qt3DCore::QNodeId> LoadProxyDeviceJob::proxies() const
 
 void LoadProxyDeviceJob::run()
 {
-    Q_D(LoadProxyDeviceJob);
+    Q_DJOB(LoadProxyDeviceJob);
     d->updates.reserve(m_proxies.size());
 
     Q_ASSERT(m_inputHandler);
diff --git a/src/input/backend/loadproxydevicejob_p.h b/src/input/backend/loadproxydevicejob_p.h
index 0848c8529..0a425f3a5 100644
--- a/src/input/backend/loadproxydevicejob_p.h
+++ b/src/input/backend/loadproxydevicejob_p.h
@@ -76,8 +76,6 @@ public:
 
     void run() final;
 private:
-    Q_DECLARE_PRIVATE(LoadProxyDeviceJob)
-
     InputHandler *m_inputHandler;
     QVector<Qt3DCore::QNodeId> m_proxies;
 };
diff --git a/src/input/backend/mouseeventdispatcherjob.cpp b/src/input/backend/mouseeventdispatcherjob.cpp
index 0ee6862fb..b91a7b638 100644
--- a/src/input/backend/mouseeventdispatcherjob.cpp
+++ b/src/input/backend/mouseeventdispatcherjob.cpp
@@ -75,7 +75,7 @@ MouseEventDispatcherJob::MouseEventDispatcherJob(Qt3DCore::QNodeId input,
     : QAspectJob(*new MouseEventDispatcherJobPrivate)
     , m_inputHandler(nullptr)
 {
-    Q_D(MouseEventDispatcherJob);
+    Q_DJOB(MouseEventDispatcherJob);
     d->m_mouseInput = input;
     d->m_mouseEvents = mouseEvents;
 #if QT_CONFIG(wheelevent)
diff --git a/src/input/backend/mouseeventdispatcherjob_p.h b/src/input/backend/mouseeventdispatcherjob_p.h
index 696d60da4..983837446 100644
--- a/src/input/backend/mouseeventdispatcherjob_p.h
+++ b/src/input/backend/mouseeventdispatcherjob_p.h
@@ -76,8 +76,6 @@ public:
     void run() final;
 
 private:
-    Q_DECLARE_PRIVATE(MouseEventDispatcherJob)
-
     InputHandler *m_inputHandler;
 };
 
diff --git a/src/input/backend/updateaxisactionjob.cpp b/src/input/backend/updateaxisactionjob.cpp
index 58ed36639..5732c2a9b 100644
--- a/src/input/backend/updateaxisactionjob.cpp
+++ b/src/input/backend/updateaxisactionjob.cpp
@@ -89,7 +89,7 @@ void UpdateAxisActionJob::run()
 
 void UpdateAxisActionJob::updateAction(LogicalDevice *device)
 {
-    Q_D(UpdateAxisActionJob);
+    Q_DJOB(UpdateAxisActionJob);
     const auto actionIds = device->actions();
     d->m_triggeredActions.reserve(actionIds.size());
 
@@ -117,7 +117,7 @@ bool UpdateAxisActionJob::processActionInput(const Qt3DCore::QNodeId actionInput
 
 void UpdateAxisActionJob::updateAxis(LogicalDevice *device)
 {
-    Q_D(UpdateAxisActionJob);
+    Q_DJOB(UpdateAxisActionJob);
     const auto axisIds = device->axes();
     d->m_triggeredAxis.reserve(axisIds.size());
 
diff --git a/src/input/backend/updateaxisactionjob_p.h b/src/input/backend/updateaxisactionjob_p.h
index 040ed9775..39b5f5cf6 100644
--- a/src/input/backend/updateaxisactionjob_p.h
+++ b/src/input/backend/updateaxisactionjob_p.h
@@ -76,8 +76,6 @@ public:
     void run() final;
 
 private:
-    Q_DECLARE_PRIVATE(UpdateAxisActionJob)
-
     void updateAction(LogicalDevice *device);
     bool processActionInput(const Qt3DCore::QNodeId actionInputId);
     void updateAxis(LogicalDevice *device);
diff --git a/src/render/jobs/loadbufferjob.cpp b/src/render/jobs/loadbufferjob.cpp
index c9cbb623d..68e92cfa7 100644
--- a/src/render/jobs/loadbufferjob.cpp
+++ b/src/render/jobs/loadbufferjob.cpp
@@ -68,7 +68,7 @@ LoadBufferJob::LoadBufferJob(const HBuffer &handle)
     , m_handle(handle)
     , m_nodeManagers(nullptr)
 {
-    SET_JOB_RUN_STAT_TYPE(this, JobTypes::LoadBuffer, 0);
+    SET_JOB_RUN_STAT_TYPE(this, JobTypes::LoadBuffer, 0)
 }
 
 LoadBufferJob::~LoadBufferJob()
@@ -77,7 +77,7 @@ LoadBufferJob::~LoadBufferJob()
 
 void LoadBufferJob::run()
 {
-    Q_D(LoadBufferJob);
+    Q_DJOB(LoadBufferJob);
     // Let's leave it for the moment until this has been properly tested
     qCDebug(Jobs) << Q_FUNC_INFO;
     Buffer *buffer = m_nodeManagers->data<Buffer, BufferManager>(m_handle);
diff --git a/src/render/jobs/loadbufferjob_p.h b/src/render/jobs/loadbufferjob_p.h
index e86e4f835..884870a62 100644
--- a/src/render/jobs/loadbufferjob_p.h
+++ b/src/render/jobs/loadbufferjob_p.h
@@ -77,9 +77,6 @@ public:
 protected:
     HBuffer m_handle;
     NodeManagers *m_nodeManagers;
-
-private:
-    Q_DECLARE_PRIVATE(LoadBufferJob)
 };
 
 typedef QSharedPointer<LoadBufferJob> LoadBufferJobPtr;
diff --git a/src/render/jobs/loadgeometryjob.cpp b/src/render/jobs/loadgeometryjob.cpp
index 88930038a..3d32f7d4e 100644
--- a/src/render/jobs/loadgeometryjob.cpp
+++ b/src/render/jobs/loadgeometryjob.cpp
@@ -75,7 +75,7 @@ LoadGeometryJob::~LoadGeometryJob()
 
 void LoadGeometryJob::run()
 {
-    Q_D(LoadGeometryJob);
+    Q_DJOB(LoadGeometryJob);
     GeometryRenderer *geometryRenderer = m_nodeManagers->geometryRendererManager()->data(m_handle);
     if (geometryRenderer != nullptr)
         d->m_updates.push_back({ geometryRenderer->peerId(), geometryRenderer->executeFunctor() });
diff --git a/src/render/jobs/loadgeometryjob_p.h b/src/render/jobs/loadgeometryjob_p.h
index 998d543ac..869abbe18 100644
--- a/src/render/jobs/loadgeometryjob_p.h
+++ b/src/render/jobs/loadgeometryjob_p.h
@@ -76,9 +76,6 @@ protected:
     void run() override;
     HGeometryRenderer m_handle;
     NodeManagers *m_nodeManagers;
-
-private:
-    Q_DECLARE_PRIVATE(LoadGeometryJob)
 };
 
 typedef QSharedPointer<LoadGeometryJob> LoadGeometryJobPtr;
diff --git a/src/render/jobs/loadscenejob.cpp b/src/render/jobs/loadscenejob.cpp
index f858f82e3..22d5da887 100644
--- a/src/render/jobs/loadscenejob.cpp
+++ b/src/render/jobs/loadscenejob.cpp
@@ -139,7 +139,7 @@ void LoadSceneJob::run()
         }
     }
 
-    Q_D(LoadSceneJob);
+    Q_DJOB(LoadSceneJob);
     d->m_sceneSubtree = sceneSubTree;
     d->m_status = finalStatus;
 
diff --git a/src/render/jobs/loadscenejob_p.h b/src/render/jobs/loadscenejob_p.h
index 3675d94c1..79c8a2935 100644
--- a/src/render/jobs/loadscenejob_p.h
+++ b/src/render/jobs/loadscenejob_p.h
@@ -113,7 +113,6 @@ private:
     Qt3DCore::QEntity *tryLoadScene(QSceneLoader::Status &finalStatus,
                                     const QStringList &extensions,
                                     const std::function<void (QSceneImporter *)> &importerSetupFunc);
-    Q_DECLARE_PRIVATE(LoadSceneJob)
 };
 
 typedef QSharedPointer<LoadSceneJob> LoadSceneJobPtr;
diff --git a/src/render/jobs/loadskeletonjob.cpp b/src/render/jobs/loadskeletonjob.cpp
index 8d0d47fb9..ddd59f5d7 100644
--- a/src/render/jobs/loadskeletonjob.cpp
+++ b/src/render/jobs/loadskeletonjob.cpp
@@ -75,7 +75,7 @@ LoadSkeletonJob::LoadSkeletonJob(const HSkeleton &handle)
 
 void LoadSkeletonJob::run()
 {
-    Q_D(LoadSkeletonJob);
+    Q_DJOB(LoadSkeletonJob);
     d->m_backendSkeleton = nullptr;
 
     Skeleton *skeleton = m_nodeManagers->skeletonManager()->data(m_handle);
@@ -120,7 +120,7 @@ void LoadSkeletonJob::loadSkeleton(Skeleton *skeleton)
 
 void LoadSkeletonJob::loadSkeletonFromUrl(Skeleton *skeleton)
 {
-    Q_D(LoadSkeletonJob);
+    Q_DJOB(LoadSkeletonJob);
 
     using namespace Qt3DCore;
 
diff --git a/src/render/jobs/loadskeletonjob_p.h b/src/render/jobs/loadskeletonjob_p.h
index 0cc09da3d..5ea4912ee 100644
--- a/src/render/jobs/loadskeletonjob_p.h
+++ b/src/render/jobs/loadskeletonjob_p.h
@@ -88,9 +88,6 @@ protected:
 
     HSkeleton m_handle;
     NodeManagers *m_nodeManagers;
-
-private:
-    Q_DECLARE_PRIVATE(LoadSkeletonJob)
 };
 
 typedef QSharedPointer<LoadSkeletonJob> LoadSkeletonJobPtr;
diff --git a/src/render/jobs/pickboundingvolumejob.cpp b/src/render/jobs/pickboundingvolumejob.cpp
index 2973ee100..ae0cb2350 100644
--- a/src/render/jobs/pickboundingvolumejob.cpp
+++ b/src/render/jobs/pickboundingvolumejob.cpp
@@ -380,7 +380,7 @@ void PickBoundingVolumeJob::dispatchPickEvents(const QMouseEvent &event,
                                                bool allHitsRequested,
                                                Qt3DCore::QNodeId viewportNodeId)
 {
-    Q_D(PickBoundingVolumeJob);
+    Q_DJOB(PickBoundingVolumeJob);
 
     ObjectPicker *lastCurrentPicker = m_manager->objectPickerManager()->data(m_currentPicker);
     // If we have hits
@@ -541,7 +541,7 @@ void PickBoundingVolumeJob::dispatchPickEvents(const QMouseEvent &event,
 
 void PickBoundingVolumeJob::clearPreviouslyHoveredPickers()
 {
-    Q_D(PickBoundingVolumeJob);
+    Q_DJOB(PickBoundingVolumeJob);
 
     for (const HObjectPicker &pickHandle : qAsConst(m_hoveredPickersToClear)) {
         ObjectPicker *pick = m_manager->objectPickerManager()->data(pickHandle);
diff --git a/src/render/jobs/pickboundingvolumejob_p.h b/src/render/jobs/pickboundingvolumejob_p.h
index 49b11b775..751d0be7b 100644
--- a/src/render/jobs/pickboundingvolumejob_p.h
+++ b/src/render/jobs/pickboundingvolumejob_p.h
@@ -102,8 +102,6 @@ protected:
                             Qt3DCore::QNodeId viewportNodeId);
 
 private:
-    Q_DECLARE_PRIVATE(PickBoundingVolumeJob)
-
     void clearPreviouslyHoveredPickers();
 
     QList<QPair<QObject*, QMouseEvent>> m_pendingMouseEvents;
diff --git a/src/render/jobs/raycastingjob.cpp b/src/render/jobs/raycastingjob.cpp
index 380447873..a6f172b86 100644
--- a/src/render/jobs/raycastingjob.cpp
+++ b/src/render/jobs/raycastingjob.cpp
@@ -273,7 +273,7 @@ void RayCastingJob::dispatchHits(RayCaster *rayCaster, const PickingUtils::HitLi
         };
     }
 
-    Q_D(RayCastingJob);
+    Q_DJOB(RayCastingJob);
     d->dispatches.push_back({rayCaster, hits});
 }
 
diff --git a/src/render/jobs/raycastingjob_p.h b/src/render/jobs/raycastingjob_p.h
index 4b8b91ad5..ba0e2f309 100644
--- a/src/render/jobs/raycastingjob_p.h
+++ b/src/render/jobs/raycastingjob_p.h
@@ -82,8 +82,6 @@ protected:
     void dispatchHits(RayCaster *rayCaster, const PickingUtils::HitList &sphereHits);
 
 private:
-    Q_DECLARE_PRIVATE(RayCastingJob)
-
     bool m_castersDirty;
     bool m_oneEnabledAtLeast;
 };
diff --git a/src/render/jobs/sendbuffercapturejob.cpp b/src/render/jobs/sendbuffercapturejob.cpp
index 3fa185684..889a86c68 100644
--- a/src/render/jobs/sendbuffercapturejob.cpp
+++ b/src/render/jobs/sendbuffercapturejob.cpp
@@ -69,7 +69,7 @@ SendBufferCaptureJob::SendBufferCaptureJob()
     : Qt3DCore::QAspectJob(*new SendBufferCaptureJobPrivate)
     , m_nodeManagers(nullptr)
 {
-    SET_JOB_RUN_STAT_TYPE(this, JobTypes::SendBufferCapture, 0);
+    SET_JOB_RUN_STAT_TYPE(this, JobTypes::SendBufferCapture, 0)
 }
 
 SendBufferCaptureJob::~SendBufferCaptureJob()
@@ -79,7 +79,7 @@ SendBufferCaptureJob::~SendBufferCaptureJob()
 // Called from SubmitRenderView while rendering
 void SendBufferCaptureJob::addRequest(QPair<Qt3DCore::QNodeId, QByteArray> request)
 {
-    Q_D(SendBufferCaptureJob);
+    Q_DJOB(SendBufferCaptureJob);
     QMutexLocker locker(&d->m_mutex);
     d->m_buffersToCapture.push_back(request);
 }
@@ -87,7 +87,7 @@ void SendBufferCaptureJob::addRequest(QPair<Qt3DCore::QNodeId, QByteArray> reque
 // Called by aspect thread jobs to execute (we may still be rendering at this point)
 bool SendBufferCaptureJob::hasRequests() const
 {
-    Q_D(const SendBufferCaptureJob);
+    Q_DJOB(const SendBufferCaptureJob);
     QMutexLocker locker(&d->m_mutex);
     return d->m_buffersToCapture.size() > 0;
 }
@@ -95,7 +95,7 @@ bool SendBufferCaptureJob::hasRequests() const
 void SendBufferCaptureJob::run()
 {
     Q_ASSERT(m_nodeManagers);
-    Q_D(SendBufferCaptureJob);
+    Q_DJOB(SendBufferCaptureJob);
     QMutexLocker locker(&d->m_mutex);
     for (const QPair<Qt3DCore::QNodeId, QByteArray> &pendingCapture : qAsConst(d->m_buffersToCapture)) {
         Buffer *buffer = m_nodeManagers->bufferManager()->lookupResource(pendingCapture.first);
diff --git a/src/render/jobs/sendbuffercapturejob_p.h b/src/render/jobs/sendbuffercapturejob_p.h
index 3b9f5d12b..ce797f0a9 100644
--- a/src/render/jobs/sendbuffercapturejob_p.h
+++ b/src/render/jobs/sendbuffercapturejob_p.h
@@ -83,7 +83,6 @@ public:
     void run() final;
 
 private:
-    Q_DECLARE_PRIVATE(SendBufferCaptureJob)
     NodeManagers *m_nodeManagers;
 };
 
diff --git a/src/render/jobs/updatelevelofdetailjob.cpp b/src/render/jobs/updatelevelofdetailjob.cpp
index 0a28b7628..9ac923d8b 100644
--- a/src/render/jobs/updatelevelofdetailjob.cpp
+++ b/src/render/jobs/updatelevelofdetailjob.cpp
@@ -248,7 +248,7 @@ void UpdateLevelOfDetailJob::setFrameGraphRoot(FrameGraphNode *frameGraphRoot)
 
 void UpdateLevelOfDetailJob::run()
 {
-    Q_D(UpdateLevelOfDetailJob);
+    Q_DJOB(UpdateLevelOfDetailJob);
 
     Q_ASSERT(m_frameGraphRoot && m_root && m_manager);
 
diff --git a/src/render/jobs/updatelevelofdetailjob_p.h b/src/render/jobs/updatelevelofdetailjob_p.h
index 9ac5cf0e9..e0f9bd064 100644
--- a/src/render/jobs/updatelevelofdetailjob_p.h
+++ b/src/render/jobs/updatelevelofdetailjob_p.h
@@ -82,8 +82,6 @@ public:
     Entity *root() const { return m_root; }
 
 private:
-    Q_DECLARE_PRIVATE(UpdateLevelOfDetailJob)
-
     NodeManagers *m_manager;
     FrameGraphNode *m_frameGraphRoot;
     Entity *m_root;
diff --git a/src/render/jobs/updateworldtransformjob.cpp b/src/render/jobs/updateworldtransformjob.cpp
index fc661a7ce..e3487e68b 100644
--- a/src/render/jobs/updateworldtransformjob.cpp
+++ b/src/render/jobs/updateworldtransformjob.cpp
@@ -128,7 +128,7 @@ void UpdateWorldTransformJob::run()
     // TODO: Parallelise this on each level using a parallel_for
     // implementation.
 
-    Q_D(UpdateWorldTransformJob);
+    Q_DJOB(UpdateWorldTransformJob);
     qCDebug(Jobs) << "Entering" << Q_FUNC_INFO << QThread::currentThread();
 
     Matrix4x4 parentTransform;
diff --git a/src/render/jobs/updateworldtransformjob_p.h b/src/render/jobs/updateworldtransformjob_p.h
index e7ff592de..ded501a07 100644
--- a/src/render/jobs/updateworldtransformjob_p.h
+++ b/src/render/jobs/updateworldtransformjob_p.h
@@ -78,7 +78,6 @@ public:
 private:
     Entity *m_node;
     NodeManagers *m_manager;
-    Q_DECLARE_PRIVATE(UpdateWorldTransformJob)
 };
 
 typedef QSharedPointer<UpdateWorldTransformJob> UpdateWorldTransformJobPtr;