diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-05-18 05:56:18 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-05-20 05:55:07 +0000 |
| commit | 5e28b995f5e43c6a908906966190f4ad594edede (patch) | |
| tree | a68746c499d0f3218b573d0ca0b79027935dd0e0 /src/render/frontend | |
| parent | cc5ca324a7ee2163ba9e342318e711d47871c65c (diff) | |
Do not initialize q_ptr in classes derived from QObjectPrivate
QObject does that behind the scenes, in a proper way.
Change-Id: I92561060757d36358d1e507f4335ca605f681678
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend')
| -rw-r--r-- | src/render/frontend/qopenglfilter.cpp | 6 | ||||
| -rw-r--r-- | src/render/frontend/qwrapmode.cpp | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/render/frontend/qopenglfilter.cpp b/src/render/frontend/qopenglfilter.cpp index b4b16981d..2c57daa3f 100644 --- a/src/render/frontend/qopenglfilter.cpp +++ b/src/render/frontend/qopenglfilter.cpp @@ -45,15 +45,13 @@ namespace Qt3D { class QOpenGLFilterPrivate : public QObjectPrivate { public: - - QOpenGLFilterPrivate(QOpenGLFilter *qq) + QOpenGLFilterPrivate() : QObjectPrivate() , m_api(QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL ? QOpenGLFilter::Desktop : QOpenGLFilter::ES) , m_profile(QOpenGLFilter::None) // matches all (no profile, core, compat) , m_minor(0) , m_major(0) { - q_ptr = qq; } Q_DECLARE_PUBLIC(QOpenGLFilter) @@ -66,7 +64,7 @@ public: }; QOpenGLFilter::QOpenGLFilter(QObject *parent) - : QObject(*new QOpenGLFilterPrivate(this), parent) + : QObject(*new QOpenGLFilterPrivate, parent) { } diff --git a/src/render/frontend/qwrapmode.cpp b/src/render/frontend/qwrapmode.cpp index e73ff6541..a040183c4 100644 --- a/src/render/frontend/qwrapmode.cpp +++ b/src/render/frontend/qwrapmode.cpp @@ -44,9 +44,8 @@ namespace Qt3D { class QTextureWrapModePrivate : public QObjectPrivate { public: - QTextureWrapModePrivate(QTextureWrapMode *qq) + QTextureWrapModePrivate() : QObjectPrivate() - , q_ptr(qq) , m_x(QTextureWrapMode::ClampToEdge) , m_y(QTextureWrapMode::ClampToEdge) , m_z(QTextureWrapMode::ClampToEdge) @@ -54,7 +53,6 @@ public: } Q_DECLARE_PUBLIC(QTextureWrapMode) - QTextureWrapMode *q_ptr; QTextureWrapMode::WrapMode m_x; QTextureWrapMode::WrapMode m_y; QTextureWrapMode::WrapMode m_z; @@ -69,7 +67,7 @@ public: */ QTextureWrapMode::QTextureWrapMode(WrapMode wrapMode, QObject *parent) - : QObject(*new QTextureWrapModePrivate(this), parent) + : QObject(*new QTextureWrapModePrivate, parent) { d_func()->m_x = wrapMode; d_func()->m_y = wrapMode; @@ -81,7 +79,7 @@ QTextureWrapMode::QTextureWrapMode(WrapMode wrapMode, QObject *parent) each dimension \a x, \a y \a z of the texture and \a parent as parent. */ QTextureWrapMode::QTextureWrapMode(WrapMode x,WrapMode y, WrapMode z, QObject *parent) - : QObject(*new QTextureWrapModePrivate(this), parent) + : QObject(*new QTextureWrapModePrivate, parent) { d_func()->m_x = x; d_func()->m_y = y; |