summaryrefslogtreecommitdiffstats
path: root/src/core/nodes
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2015-05-18 05:56:18 +0400
committerKonstantin Ritt <ritt.ks@gmail.com>2015-05-20 05:55:07 +0000
commit5e28b995f5e43c6a908906966190f4ad594edede (patch)
treea68746c499d0f3218b573d0ca0b79027935dd0e0 /src/core/nodes
parentcc5ca324a7ee2163ba9e342318e711d47871c65c (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/core/nodes')
-rw-r--r--src/core/nodes/qnode.cpp4
-rw-r--r--src/core/nodes/qnode_p.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp
index da9d96679..53b1e8f77 100644
--- a/src/core/nodes/qnode.cpp
+++ b/src/core/nodes/qnode.cpp
@@ -67,7 +67,7 @@ QNodePrivate::QNodePrivate(QNode *qq)
, m_propertyChangesSetup(false)
, m_signals(this)
{
- q_ptr = qq;
+ Q_UNUSED(qq) // ###
}
// Called by QEvent::childAdded (main thread)
@@ -325,7 +325,7 @@ void QNodePrivate::nodePtrDeleter(QNode *q)
Creates a new Qt3D::QNode instance with parent \a parent.
*/
QNode::QNode(QNode *parent)
- : QObject(*new QNodePrivate(this), parent)
+ : QObject(*new QNodePrivate, parent)
{
// We rely on QEvent::childAdded to be triggered on the parent
// So we don't actually need to invoke a method or anything
diff --git a/src/core/nodes/qnode_p.h b/src/core/nodes/qnode_p.h
index 67f999f3e..34b413029 100644
--- a/src/core/nodes/qnode_p.h
+++ b/src/core/nodes/qnode_p.h
@@ -54,7 +54,7 @@ class QAspectEngine;
class QT3DCORESHARED_EXPORT QNodePrivate : public QObjectPrivate, public QObservableInterface
{
public:
- QNodePrivate(QNode *qq);
+ QNodePrivate(QNode *qq = Q_NULLPTR);
void setScene(QSceneInterface *scene);
QSceneInterface *scene() const;