summaryrefslogtreecommitdiffstats
path: root/src/input
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2016-05-12 23:09:24 +0300
committerPaul Lemire <paul.lemire@kdab.com>2016-05-13 14:43:03 +0000
commit78c015e509b67416b9852abcbfe51cf10c5f7c26 (patch)
treed6e78d9d50da6e73ae311b49c1e7f001b5bb806f /src/input
parentf94b336044d040d07d960c752f147b411b21c87d (diff)
Remove QBackendNodePropertyChange
Not needed as we can just use delivery flags on QPropertyUpdatedChange. Task-number: QTBUG-51494 Change-Id: I53b52ac7a1b226dd30756bcebcdd62bffd3a6fd5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/input')
-rw-r--r--src/input/backend/action.cpp4
-rw-r--r--src/input/backend/axis.cpp4
-rw-r--r--src/input/backend/keyboardhandler.cpp7
-rw-r--r--src/input/backend/mousehandler.cpp7
-rw-r--r--src/input/frontend/qkeyboarddevice.cpp5
-rw-r--r--src/input/frontend/qkeyboardhandler.cpp4
-rw-r--r--src/input/frontend/qmousehandler.cpp4
7 files changed, 18 insertions, 17 deletions
diff --git a/src/input/backend/action.cpp b/src/input/backend/action.cpp
index 832c0013d..67ccda11b 100644
--- a/src/input/backend/action.cpp
+++ b/src/input/backend/action.cpp
@@ -44,7 +44,6 @@
#include <Qt3DCore/qpropertyupdatedchange.h>
#include <Qt3DCore/qpropertynodeaddedchange.h>
#include <Qt3DCore/qpropertynoderemovedchange.h>
-#include <Qt3DCore/qbackendnodepropertychange.h>
QT_BEGIN_NAMESPACE
@@ -78,7 +77,8 @@ void Action::setActionTriggered(bool actionTriggered)
m_actionTriggered = actionTriggered;
// Send change to the frontend
- Qt3DCore::QBackendNodePropertyChangePtr e(new Qt3DCore::QBackendNodePropertyChange(peerId()));
+ auto e = Qt3DCore::QPropertyUpdatedChangePtr::create(peerId());
+ e->setDeliveryFlags(Qt3DCore::QSceneChange::DeliverToAll);
e->setPropertyName("active");
e->setValue(m_actionTriggered);
notifyObservers(e);
diff --git a/src/input/backend/axis.cpp b/src/input/backend/axis.cpp
index d27d1ee1a..b64173626 100644
--- a/src/input/backend/axis.cpp
+++ b/src/input/backend/axis.cpp
@@ -44,7 +44,6 @@
#include <Qt3DCore/qpropertyupdatedchange.h>
#include <Qt3DCore/qpropertynodeaddedchange.h>
#include <Qt3DCore/qpropertynoderemovedchange.h>
-#include <Qt3DCore/qbackendnodepropertychange.h>
QT_BEGIN_NAMESPACE
@@ -78,7 +77,8 @@ void Axis::setAxisValue(float axisValue)
m_axisValue = axisValue;
// Send a change to the frontend
- Qt3DCore::QBackendNodePropertyChangePtr e(new Qt3DCore::QBackendNodePropertyChange(peerId()));
+ auto e = Qt3DCore::QPropertyUpdatedChangePtr::create(peerId());
+ e->setDeliveryFlags(Qt3DCore::QSceneChange::DeliverToAll);
e->setPropertyName("value");
e->setValue(m_axisValue);
notifyObservers(e);
diff --git a/src/input/backend/keyboardhandler.cpp b/src/input/backend/keyboardhandler.cpp
index 700c48772..2132496b1 100644
--- a/src/input/backend/keyboardhandler.cpp
+++ b/src/input/backend/keyboardhandler.cpp
@@ -44,7 +44,6 @@
#include "inputhandler_p.h"
#include "inputmanagers_p.h"
#include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qbackendnodepropertychange.h>
#include <QVariant>
QT_BEGIN_NAMESPACE
@@ -87,7 +86,8 @@ void KeyboardHandler::setFocus(bool focus)
{
if (focus != m_focus) {
m_focus = focus;
- QBackendNodePropertyChangePtr e(new QBackendNodePropertyChange(peerId()));
+ auto e = Qt3DCore::QPropertyUpdatedChangePtr::create(peerId());
+ e->setDeliveryFlags(Qt3DCore::QSceneChange::DeliverToAll);
e->setPropertyName("focus");
e->setValue(m_focus);
notifyObservers(e);
@@ -96,7 +96,8 @@ void KeyboardHandler::setFocus(bool focus)
void KeyboardHandler::keyEvent(const QKeyEventPtr &event)
{
- QBackendNodePropertyChangePtr e(new QBackendNodePropertyChange(peerId()));
+ auto e = Qt3DCore::QPropertyUpdatedChangePtr::create(peerId());
+ e->setDeliveryFlags(Qt3DCore::QSceneChange::DeliverToAll);
e->setPropertyName("event");
e->setValue(QVariant::fromValue(event));
notifyObservers(e);
diff --git a/src/input/backend/mousehandler.cpp b/src/input/backend/mousehandler.cpp
index b300aae3f..638c090e5 100644
--- a/src/input/backend/mousehandler.cpp
+++ b/src/input/backend/mousehandler.cpp
@@ -46,7 +46,6 @@
#include <Qt3DInput/private/qmousehandler_p.h>
#include <Qt3DInput/qmousedevice.h>
#include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qbackendnodepropertychange.h>
QT_BEGIN_NAMESPACE
@@ -84,7 +83,8 @@ void MouseHandler::setInputHandler(InputHandler *handler)
void MouseHandler::mouseEvent(const QMouseEventPtr &event)
{
- QBackendNodePropertyChangePtr e(new QBackendNodePropertyChange(peerId()));
+ auto e = Qt3DCore::QPropertyUpdatedChangePtr::create(peerId());
+ e->setDeliveryFlags(Qt3DCore::QSceneChange::DeliverToAll);
e->setPropertyName("mouse");
e->setValue(QVariant::fromValue(event));
notifyObservers(e);
@@ -92,7 +92,8 @@ void MouseHandler::mouseEvent(const QMouseEventPtr &event)
void MouseHandler::wheelEvent(const QWheelEventPtr &event)
{
- QBackendNodePropertyChangePtr e(new QBackendNodePropertyChange(peerId()));
+ auto e = Qt3DCore::QPropertyUpdatedChangePtr::create(peerId());
+ e->setDeliveryFlags(Qt3DCore::QSceneChange::DeliverToAll);
e->setPropertyName("wheel");
e->setValue(QVariant::fromValue(event));
notifyObservers(e);
diff --git a/src/input/frontend/qkeyboarddevice.cpp b/src/input/frontend/qkeyboarddevice.cpp
index 55f4102ca..cbfcd51f6 100644
--- a/src/input/frontend/qkeyboarddevice.cpp
+++ b/src/input/frontend/qkeyboarddevice.cpp
@@ -41,8 +41,7 @@
#include "qkeyboarddevice_p.h"
#include "qkeyboardhandler.h"
#include <Qt3DCore/private/qscene_p.h>
-#include <Qt3DCore/qbackendnodepropertychange.h>
-#include <Qt3DCore/qbackendnodepropertychange.h>
+#include <Qt3DCore/qpropertyupdatedchange.h>
QT_BEGIN_NAMESPACE
@@ -273,7 +272,7 @@ QKeyboardDevice::QKeyboardDevice(QKeyboardDevicePrivate &dd, QNode *parent)
void QKeyboardDevice::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change)
{
Q_D(QKeyboardDevice);
- Qt3DCore::QBackendNodePropertyChangePtr e = qSharedPointerCast<Qt3DCore::QBackendNodePropertyChange>(change);
+ 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)));
diff --git a/src/input/frontend/qkeyboardhandler.cpp b/src/input/frontend/qkeyboardhandler.cpp
index 6bdd5d2db..927eed48e 100644
--- a/src/input/frontend/qkeyboardhandler.cpp
+++ b/src/input/frontend/qkeyboardhandler.cpp
@@ -40,7 +40,7 @@
#include "qkeyboardhandler.h"
#include "qkeyboardhandler_p.h"
#include "qkeyboarddevice.h"
-#include <Qt3DCore/qbackendnodepropertychange.h>
+#include <Qt3DCore/qpropertyupdatedchange.h>
QT_BEGIN_NAMESPACE
@@ -161,7 +161,7 @@ QKeyboardHandler::QKeyboardHandler(QNode *parent)
void QKeyboardHandler::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change)
{
Q_D(QKeyboardHandler);
- QBackendNodePropertyChangePtr e = qSharedPointerCast<QBackendNodePropertyChange>(change);
+ QPropertyUpdatedChangePtr e = qSharedPointerCast<QPropertyUpdatedChange>(change);
if (e->type() == PropertyUpdated) {
if (e->propertyName() == QByteArrayLiteral("focus")) {
bool block = blockNotifications(true);
diff --git a/src/input/frontend/qmousehandler.cpp b/src/input/frontend/qmousehandler.cpp
index e6f0c5c45..2d81b0b75 100644
--- a/src/input/frontend/qmousehandler.cpp
+++ b/src/input/frontend/qmousehandler.cpp
@@ -41,7 +41,7 @@
#include "qmousehandler_p.h"
#include "qmousedevice.h"
#include "qmouseevent.h"
-#include <Qt3DCore/qbackendnodepropertychange.h>
+#include <Qt3DCore/qpropertyupdatedchange.h>
QT_BEGIN_NAMESPACE
@@ -164,7 +164,7 @@ void QMouseHandler::setContainsMouse(bool contains)
void QMouseHandler::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change)
{
Q_D(QMouseHandler);
- QBackendNodePropertyChangePtr e = qSharedPointerCast<QBackendNodePropertyChange>(change);
+ QPropertyUpdatedChangePtr e = qSharedPointerCast<QPropertyUpdatedChange>(change);
if (e->type() == PropertyUpdated) {
if (e->propertyName() == QByteArrayLiteral("mouse")) {
QMouseEventPtr ev = e->value().value<QMouseEventPtr>();