summaryrefslogtreecommitdiffstats
path: root/src/input/frontend
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2019-10-08 08:01:10 +0100
committerMike Krus <mike.krus@kdab.com>2019-10-20 21:25:38 +0100
commitce4663c2659d9e1611a1647a9b3cd26da8a80604 (patch)
tree8b2a30476e5f6501ce2f3bc713a7e6c5d7667168 /src/input/frontend
parent683151c338046621d239ac0d9b597171c56e3991 (diff)
Clean up old property update code
Remove useless includes, clear up commented out or unused code Change-Id: Id3382b16108d79f1e2522d43463c8d70aef8fcb2 Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/input/frontend')
-rw-r--r--src/input/frontend/qabstractphysicaldeviceproxy.cpp1
-rw-r--r--src/input/frontend/qaction.cpp1
-rw-r--r--src/input/frontend/qaxis.cpp1
-rw-r--r--src/input/frontend/qaxisaccumulator.cpp1
-rw-r--r--src/input/frontend/qkeyboarddevice.cpp11
-rw-r--r--src/input/frontend/qkeyboarddevice.h1
-rw-r--r--src/input/frontend/qkeyboardhandler.cpp1
-rw-r--r--src/input/frontend/qmousehandler.cpp1
8 files changed, 0 insertions, 18 deletions
diff --git a/src/input/frontend/qabstractphysicaldeviceproxy.cpp b/src/input/frontend/qabstractphysicaldeviceproxy.cpp
index a7930ed76..4ed116440 100644
--- a/src/input/frontend/qabstractphysicaldeviceproxy.cpp
+++ b/src/input/frontend/qabstractphysicaldeviceproxy.cpp
@@ -41,7 +41,6 @@
#include "qabstractphysicaldeviceproxy_p_p.h"
#include <Qt3DInput/qphysicaldevicecreatedchange.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
QT_BEGIN_NAMESPACE
diff --git a/src/input/frontend/qaction.cpp b/src/input/frontend/qaction.cpp
index c835062a2..512a5aca7 100644
--- a/src/input/frontend/qaction.cpp
+++ b/src/input/frontend/qaction.cpp
@@ -41,7 +41,6 @@
#include "qaction_p.h"
#include <Qt3DInput/qabstractactioninput.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
#include <Qt3DCore/qnodecreatedchange.h>
#include <Qt3DCore/private/qnode_p.h>
diff --git a/src/input/frontend/qaxis.cpp b/src/input/frontend/qaxis.cpp
index b6018c887..7faa6a459 100644
--- a/src/input/frontend/qaxis.cpp
+++ b/src/input/frontend/qaxis.cpp
@@ -40,7 +40,6 @@
#include "qaxis_p.h"
#include <Qt3DInput/qabstractaxisinput.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
#include <Qt3DCore/qnodecreatedchange.h>
QT_BEGIN_NAMESPACE
diff --git a/src/input/frontend/qaxisaccumulator.cpp b/src/input/frontend/qaxisaccumulator.cpp
index 7e9930f66..03f6e3bd1 100644
--- a/src/input/frontend/qaxisaccumulator.cpp
+++ b/src/input/frontend/qaxisaccumulator.cpp
@@ -42,7 +42,6 @@
#include <Qt3DInput/qaxis.h>
#include <Qt3DCore/qnodecreatedchange.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
QT_BEGIN_NAMESPACE
diff --git a/src/input/frontend/qkeyboarddevice.cpp b/src/input/frontend/qkeyboarddevice.cpp
index 257a5be8c..0fe3a1338 100644
--- a/src/input/frontend/qkeyboarddevice.cpp
+++ b/src/input/frontend/qkeyboarddevice.cpp
@@ -41,7 +41,6 @@
#include "qkeyboarddevice_p.h"
#include <Qt3DInput/qkeyboardhandler.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
#include <Qt3DCore/private/qscene_p.h>
@@ -310,16 +309,6 @@ QKeyboardDevice::QKeyboardDevice(QKeyboardDevicePrivate &dd, QNode *parent)
{
}
-/*! \internal */
-void QKeyboardDevice::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change)
-{
- Q_D(QKeyboardDevice);
- Qt3DCore::QPropertyUpdatedChangePtr e = qSharedPointerCast<Qt3DCore::QPropertyUpdatedChange>(change);
- if (e->type() == Qt3DCore::PropertyUpdated && e->propertyName() == QByteArrayLiteral("activeInput")) {
- Qt3DCore::QNodeId activeInputId = e->value().value<Qt3DCore::QNodeId>();
- setActiveInput(qobject_cast<QKeyboardHandler *>(d->scene()->lookupNode(activeInputId)));
- }
-}
/*!
* Set the active input to \a activeInput
*/
diff --git a/src/input/frontend/qkeyboarddevice.h b/src/input/frontend/qkeyboarddevice.h
index c3478ec27..ee4b864f7 100644
--- a/src/input/frontend/qkeyboarddevice.h
+++ b/src/input/frontend/qkeyboarddevice.h
@@ -71,7 +71,6 @@ public:
protected:
explicit QKeyboardDevice(QKeyboardDevicePrivate &dd, QNode *parent = nullptr);
- void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
Q_SIGNALS:
void activeInputChanged(QKeyboardHandler *activeInput);
diff --git a/src/input/frontend/qkeyboardhandler.cpp b/src/input/frontend/qkeyboardhandler.cpp
index aff136a04..1581f763c 100644
--- a/src/input/frontend/qkeyboardhandler.cpp
+++ b/src/input/frontend/qkeyboardhandler.cpp
@@ -41,7 +41,6 @@
#include "qkeyboardhandler_p.h"
#include <Qt3DInput/qkeyboarddevice.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
QT_BEGIN_NAMESPACE
diff --git a/src/input/frontend/qmousehandler.cpp b/src/input/frontend/qmousehandler.cpp
index 944ca391a..f3e7a18c8 100644
--- a/src/input/frontend/qmousehandler.cpp
+++ b/src/input/frontend/qmousehandler.cpp
@@ -42,7 +42,6 @@
#include <Qt3DInput/qmousedevice.h>
#include <Qt3DInput/qmouseevent.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
#include <QtCore/QTimer>
QT_BEGIN_NAMESPACE