diff options
author | Mike Krus <mike.krus@kdab.com> | 2019-12-02 08:28:38 +0000 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2019-12-03 09:07:32 +0000 |
commit | ac70d64a037e58a1e8c0fdebc83809f50948f742 (patch) | |
tree | c02a411633c990d625561796332a5e4aa6967d62 /src/core | |
parent | d7f72429c5478d59489c7dd6ec9225f614fd90ec (diff) |
Revert "Update jobs to remove post FF changes"
d521b994450f0a4febbd789ba66701ba24fdbe22
Change-Id: Ibe6d608e8400e69b50775c0eb156e74e4e90b25c
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/jobs/qaspectjob.cpp | 5 | ||||
-rw-r--r-- | src/core/jobs/qaspectjob.h | 2 | ||||
-rw-r--r-- | src/core/jobs/qaspectjob_p.h | 4 |
3 files changed, 1 insertions, 10 deletions
diff --git a/src/core/jobs/qaspectjob.cpp b/src/core/jobs/qaspectjob.cpp index bdb2063ba..318a431ac 100644 --- a/src/core/jobs/qaspectjob.cpp +++ b/src/core/jobs/qaspectjob.cpp @@ -66,11 +66,6 @@ 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 bd86a61e1..deb8cf2ed 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 5504bd936..b16c3cad2 100644 --- a/src/core/jobs/qaspectjob_p.h +++ b/src/core/jobs/qaspectjob_p.h @@ -111,7 +111,6 @@ public: virtual ~QAspectJobPrivate(); static QAspectJobPrivate *get(QAspectJob *job); - static const QAspectJobPrivate *get(const QAspectJob *job); virtual void postFrame(QAspectManager *aspectManager); @@ -123,9 +122,6 @@ 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> |