Revert "Update jobs to remove post FF changes"

d521b994450f0a4febbd789ba66701ba24fdbe22

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

12 files changed, 19 insertions, 7 deletions

diff --git a/src/input/backend/assignkeyboardfocusjob.cpp b/src/input/backend/assignkeyboardfocusjob.cpp
index d5947f9c9..5fe329004 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_DJOB(AssignKeyboardFocusJob);
+    Q_D(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 87cc2fbda..200fd72f1 100644
--- a/src/input/backend/assignkeyboardfocusjob_p.h
+++ b/src/input/backend/assignkeyboardfocusjob_p.h
@@ -70,6 +70,8 @@ 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 b6c1c8482..16a68349e 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_DJOB(AxisAccumulatorJob);
+    Q_D(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 3e8122287..702004dd2 100644
--- a/src/input/backend/axisaccumulatorjob_p.h
+++ b/src/input/backend/axisaccumulatorjob_p.h
@@ -75,6 +75,8 @@ 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 31db01e53..26a35e885 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_DJOB(KeyEventDispatcherJob);
+    Q_D(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 975dc3d31..bd0c770d4 100644
--- a/src/input/backend/keyeventdispatcherjob_p.h
+++ b/src/input/backend/keyeventdispatcherjob_p.h
@@ -71,6 +71,8 @@ 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 059d14bc0..69f14beae 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_DJOB(LoadProxyDeviceJob);
+    Q_D(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 0a425f3a5..0848c8529 100644
--- a/src/input/backend/loadproxydevicejob_p.h
+++ b/src/input/backend/loadproxydevicejob_p.h
@@ -76,6 +76,8 @@ 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 b91a7b638..0ee6862fb 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_DJOB(MouseEventDispatcherJob);
+    Q_D(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 983837446..696d60da4 100644
--- a/src/input/backend/mouseeventdispatcherjob_p.h
+++ b/src/input/backend/mouseeventdispatcherjob_p.h
@@ -76,6 +76,8 @@ 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 5732c2a9b..58ed36639 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_DJOB(UpdateAxisActionJob);
+    Q_D(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_DJOB(UpdateAxisActionJob);
+    Q_D(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 39b5f5cf6..040ed9775 100644
--- a/src/input/backend/updateaxisactionjob_p.h
+++ b/src/input/backend/updateaxisactionjob_p.h
@@ -76,6 +76,8 @@ public:
     void run() final;
 
 private:
+    Q_DECLARE_PRIVATE(UpdateAxisActionJob)
+
     void updateAction(LogicalDevice *device);
     bool processActionInput(const Qt3DCore::QNodeId actionInputId);
     void updateAxis(LogicalDevice *device);