summaryrefslogtreecommitdiffstats
path: root/src/input
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2015-08-03 20:42:48 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-08-05 10:07:12 +0000
commit3811b0bd8fded65478439bec9dea7a3b6cd26a59 (patch)
tree61d7853c5dc09387cf2db73776dcd10142f6548b /src/input
parent09da4cc0362974b68b377d4dcd6a0871d8e651ef (diff)
Add a couple of missing QNode::cleanup() calls to input aspect
Change-Id: I3e134ced2dcf99f832d141ce98af08ff41c0722b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/input')
-rw-r--r--src/input/qmousecontroller.cpp11
-rw-r--r--src/input/qmousecontroller.h2
-rw-r--r--src/input/qmouseinput.cpp11
-rw-r--r--src/input/qmouseinput.h1
4 files changed, 25 insertions, 0 deletions
diff --git a/src/input/qmousecontroller.cpp b/src/input/qmousecontroller.cpp
index 7fd585091..8e53077eb 100644
--- a/src/input/qmousecontroller.cpp
+++ b/src/input/qmousecontroller.cpp
@@ -63,11 +63,22 @@ QMouseController::QMouseController(QNode *parent)
{
}
+/*!
+ \internal
+*/
QMouseController::QMouseController(QMouseControllerPrivate &dd, QNode *parent)
: QNode(dd, parent)
{
}
+/*!
+ Destroys this QMouseController object.
+*/
+QMouseController::~QMouseController()
+{
+ QNode::cleanup();
+}
+
void QMouseController::sceneChangeEvent(const QSceneChangePtr &change)
{
Q_UNUSED(change);
diff --git a/src/input/qmousecontroller.h b/src/input/qmousecontroller.h
index 89f99c022..4d0e3ef04 100644
--- a/src/input/qmousecontroller.h
+++ b/src/input/qmousecontroller.h
@@ -56,6 +56,8 @@ public:
protected:
QMouseController(QMouseControllerPrivate &dd, QNode *parent = 0);
+ ~QMouseController();
+
void sceneChangeEvent(const QSceneChangePtr &change) Q_DECL_OVERRIDE;
private:
diff --git a/src/input/qmouseinput.cpp b/src/input/qmouseinput.cpp
index dbaa1ebc4..49c8654a1 100644
--- a/src/input/qmouseinput.cpp
+++ b/src/input/qmouseinput.cpp
@@ -74,12 +74,23 @@ QMouseInput::QMouseInput(QNode *parent)
{
}
+/*!
+ \internal
+*/
QMouseInput::QMouseInput(QMouseInputPrivate &dd, QNode *parent)
: QComponent(dd, parent)
{
}
/*!
+ Destroys this QMouseInput object
+*/
+QMouseInput::~QMouseInput()
+{
+ QNode::cleanup();
+}
+
+/*!
* Sets the mouse controller of the Qt3D::QMouseInput instance to \a controller.
*/
void QMouseInput::setController(QMouseController *controller)
diff --git a/src/input/qmouseinput.h b/src/input/qmouseinput.h
index 0f7ae5d6a..83eab1525 100644
--- a/src/input/qmouseinput.h
+++ b/src/input/qmouseinput.h
@@ -56,6 +56,7 @@ class QT3DINPUTSHARED_EXPORT QMouseInput : public QComponent
public:
explicit QMouseInput(QNode *parent = 0);
+ ~QMouseInput();
void setController(QMouseController *controller);
QMouseController *controller() const;