From 57790ce854443736782096f51b4f1059082d7d6f Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Sat, 2 Apr 2016 11:20:18 +0100 Subject: Create proper pimpl type from QPhysicalDeviceCreatedChangeBase Change-Id: I5d430a3ec2d5e18219d5e16fd9819b0ffac1e650 Reviewed-by: Paul Lemire --- src/core/qnodecreatedchange.cpp | 6 ++++++ src/core/qnodecreatedchange.h | 3 +++ src/input/frontend/qphysicaldevicecreatedchange.cpp | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/core/qnodecreatedchange.cpp b/src/core/qnodecreatedchange.cpp index d3cf78c0f..6e3316772 100644 --- a/src/core/qnodecreatedchange.cpp +++ b/src/core/qnodecreatedchange.cpp @@ -56,6 +56,12 @@ QNodeCreatedChangeBase::QNodeCreatedChangeBase(const QNode *node, Priority prior { } +QNodeCreatedChangeBase::QNodeCreatedChangeBase(QNodeCreatedChangeBasePrivate &dd) + : QSceneChange(dd) +{ + +} + QNodeCreatedChangeBase::~QNodeCreatedChangeBase() { } diff --git a/src/core/qnodecreatedchange.h b/src/core/qnodecreatedchange.h index f0689c3cc..838399620 100644 --- a/src/core/qnodecreatedchange.h +++ b/src/core/qnodecreatedchange.h @@ -58,6 +58,9 @@ public: const QMetaObject *metaObject() const Q_DECL_NOEXCEPT; bool isNodeEnabled() const Q_DECL_NOEXCEPT; +protected: + QNodeCreatedChangeBase(QNodeCreatedChangeBasePrivate &dd); + private: Q_DECLARE_PRIVATE(QNodeCreatedChangeBase) }; diff --git a/src/input/frontend/qphysicaldevicecreatedchange.cpp b/src/input/frontend/qphysicaldevicecreatedchange.cpp index 10059d77e..ff976c1b8 100644 --- a/src/input/frontend/qphysicaldevicecreatedchange.cpp +++ b/src/input/frontend/qphysicaldevicecreatedchange.cpp @@ -52,8 +52,9 @@ QPhysicalDeviceCreatedChangeBasePrivate::QPhysicalDeviceCreatedChangeBasePrivate } QPhysicalDeviceCreatedChangeBase::QPhysicalDeviceCreatedChangeBase(const QAbstractPhysicalDevice *device, Priority priority) - : Qt3DCore::QNodeCreatedChangeBase(device, priority) + : Qt3DCore::QNodeCreatedChangeBase(*new QPhysicalDeviceCreatedChangeBasePrivate(device)) { + d_func()->m_priority = priority; } Qt3DCore::QNodeIdVector QPhysicalDeviceCreatedChangeBase::axisSettingIds() const -- cgit v1.2.3