summaryrefslogtreecommitdiffstats
path: root/src/input
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2016-05-10 14:01:04 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-05-10 19:09:54 +0000
commitb6ee562da9314fe2d737284ddef67567f1682619 (patch)
treef8aae4c1e0e2c4062201c97a0b9619a798916374 /src/input
parentbd9391529798c19f3e933ac6ecf468064cfe3346 (diff)
Rename QNodeRemovedPropertyChange -> QPropertyNodeRemovedChange
Task-number: QTBUG-51494 Change-Id: I1c7f1c680bc18c6201b790e96dc4023564837122 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/inputchord.cpp4
-rw-r--r--src/input/backend/inputsequence.cpp4
-rw-r--r--src/input/backend/logicaldevice.cpp4
-rw-r--r--src/input/backend/qabstractphysicaldevicebackendnode.cpp4
-rw-r--r--src/input/frontend/qabstractphysicaldevice.cpp4
-rw-r--r--src/input/frontend/qaction.cpp4
-rw-r--r--src/input/frontend/qaxis.cpp4
-rw-r--r--src/input/frontend/qinputchord.cpp4
-rw-r--r--src/input/frontend/qinputsequence.cpp4
-rw-r--r--src/input/frontend/qlogicaldevice.cpp6
12 files changed, 25 insertions, 25 deletions
diff --git a/src/input/backend/action.cpp b/src/input/backend/action.cpp
index b76c93e8c..832c0013d 100644
--- a/src/input/backend/action.cpp
+++ b/src/input/backend/action.cpp
@@ -43,7 +43,7 @@
#include <Qt3DInput/private/qaction_p.h>
#include <Qt3DCore/qpropertyupdatedchange.h>
#include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
#include <Qt3DCore/qbackendnodepropertychange.h>
QT_BEGIN_NAMESPACE
@@ -96,7 +96,7 @@ void Action::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
}
case Qt3DCore::PropertyValueRemoved: {
- const auto change = qSharedPointerCast<Qt3DCore::QNodeRemovedPropertyChange>(e);
+ const auto change = qSharedPointerCast<Qt3DCore::QPropertyNodeRemovedChange>(e);
if (change->propertyName() == QByteArrayLiteral("input"))
m_inputs.removeOne(change->removedNodeId());
}
diff --git a/src/input/backend/axis.cpp b/src/input/backend/axis.cpp
index 87db8ae1f..d27d1ee1a 100644
--- a/src/input/backend/axis.cpp
+++ b/src/input/backend/axis.cpp
@@ -43,7 +43,7 @@
#include <Qt3DInput/private/qaxis_p.h>
#include <Qt3DCore/qpropertyupdatedchange.h>
#include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
#include <Qt3DCore/qbackendnodepropertychange.h>
QT_BEGIN_NAMESPACE
@@ -96,7 +96,7 @@ void Axis::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
}
case Qt3DCore::PropertyValueRemoved: {
- const auto change = qSharedPointerCast<Qt3DCore::QNodeRemovedPropertyChange>(e);
+ const auto change = qSharedPointerCast<Qt3DCore::QPropertyNodeRemovedChange>(e);
if (change->propertyName() == QByteArrayLiteral("input"))
m_inputs.removeOne(change->removedNodeId());
}
diff --git a/src/input/backend/inputchord.cpp b/src/input/backend/inputchord.cpp
index f5d7e88a7..7ecd611a8 100644
--- a/src/input/backend/inputchord.cpp
+++ b/src/input/backend/inputchord.cpp
@@ -42,7 +42,7 @@
#include <Qt3DInput/private/qinputchord_p.h>
#include <Qt3DCore/qpropertyupdatedchange.h>
#include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
QT_BEGIN_NAMESPACE
@@ -118,7 +118,7 @@ void InputChord::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
}
case Qt3DCore::PropertyValueRemoved: {
- const auto change = qSharedPointerCast<Qt3DCore::QNodeRemovedPropertyChange>(e);
+ const auto change = qSharedPointerCast<Qt3DCore::QPropertyNodeRemovedChange>(e);
if (change->propertyName() == QByteArrayLiteral("chord")) {
m_chords.removeOne(change->removedNodeId());
m_inputsToTrigger.removeOne(change->removedNodeId());
diff --git a/src/input/backend/inputsequence.cpp b/src/input/backend/inputsequence.cpp
index 6e31c3d33..aae88f9a1 100644
--- a/src/input/backend/inputsequence.cpp
+++ b/src/input/backend/inputsequence.cpp
@@ -43,7 +43,7 @@
#include <Qt3DInput/private/qinputsequence_p.h>
#include <Qt3DCore/qpropertyupdatedchange.h>
#include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
#include <QDateTime>
QT_BEGIN_NAMESPACE
@@ -143,7 +143,7 @@ void InputSequence::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
}
case Qt3DCore::PropertyValueRemoved: {
- const auto change = qSharedPointerCast<Qt3DCore::QNodeRemovedPropertyChange>(e);
+ const auto change = qSharedPointerCast<Qt3DCore::QPropertyNodeRemovedChange>(e);
if (change->propertyName() == QByteArrayLiteral("sequence")) {
m_sequences.removeOne(change->removedNodeId());
m_inputsToTrigger.removeOne(change->removedNodeId());
diff --git a/src/input/backend/logicaldevice.cpp b/src/input/backend/logicaldevice.cpp
index 57e1b859b..fd4a637f2 100644
--- a/src/input/backend/logicaldevice.cpp
+++ b/src/input/backend/logicaldevice.cpp
@@ -45,7 +45,7 @@
#include <Qt3DInput/private/qlogicaldevice_p.h>
#include <Qt3DCore/qpropertyupdatedchange.h>
#include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
QT_BEGIN_NAMESPACE
@@ -86,7 +86,7 @@ void LogicalDevice::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
}
case Qt3DCore::PropertyValueRemoved: {
- const auto change = qSharedPointerCast<Qt3DCore::QNodeRemovedPropertyChange>(e);
+ const auto change = qSharedPointerCast<Qt3DCore::QPropertyNodeRemovedChange>(e);
if (change->propertyName() == QByteArrayLiteral("axis"))
m_axes.removeOne(change->removedNodeId());
else if (change->propertyName() == QByteArrayLiteral("action"))
diff --git a/src/input/backend/qabstractphysicaldevicebackendnode.cpp b/src/input/backend/qabstractphysicaldevicebackendnode.cpp
index c97ab3f79..eb66f4188 100644
--- a/src/input/backend/qabstractphysicaldevicebackendnode.cpp
+++ b/src/input/backend/qabstractphysicaldevicebackendnode.cpp
@@ -50,7 +50,7 @@
#include <Qt3DCore/qpropertyupdatedchange.h>
#include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
#include <Qt3DCore/private/qabstractaspect_p.h>
#include <cmath>
@@ -191,7 +191,7 @@ void QAbstractPhysicalDeviceBackendNode::sceneChangeEvent(const Qt3DCore::QScene
}
case Qt3DCore::PropertyValueRemoved: {
- const auto change = qSharedPointerCast<Qt3DCore::QNodeRemovedPropertyChange>(e);
+ const auto change = qSharedPointerCast<Qt3DCore::QPropertyNodeRemovedChange>(e);
if (change->propertyName() == QByteArrayLiteral("axisSettings"))
d->removeAxisSetting(change->removedNodeId());
break;
diff --git a/src/input/frontend/qabstractphysicaldevice.cpp b/src/input/frontend/qabstractphysicaldevice.cpp
index e445ae90d..82d721a73 100644
--- a/src/input/frontend/qabstractphysicaldevice.cpp
+++ b/src/input/frontend/qabstractphysicaldevice.cpp
@@ -43,7 +43,7 @@
#include <Qt3DInput/qaxissetting.h>
#include <Qt3DCore/qpropertyupdatedchange.h>
#include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
#include <Qt3DCore/private/qnode_p.h>
QT_BEGIN_NAMESPACE
@@ -174,7 +174,7 @@ void QAbstractPhysicalDevice::removeAxisSetting(QAxisSetting *axisSetting)
Q_D(QAbstractPhysicalDevice);
if (axisSetting && d->m_axisSettings.contains(axisSetting)) {
if (d->m_changeArbiter) {
- const auto change = Qt3DCore::QNodeRemovedPropertyChangePtr::create(id(), axisSetting);
+ const auto change = Qt3DCore::QPropertyNodeRemovedChangePtr::create(id(), axisSetting);
change->setPropertyName("axisSettings");
d->notifyObservers(change);
}
diff --git a/src/input/frontend/qaction.cpp b/src/input/frontend/qaction.cpp
index 3f46d7b75..2d7d29887 100644
--- a/src/input/frontend/qaction.cpp
+++ b/src/input/frontend/qaction.cpp
@@ -42,7 +42,7 @@
#include <Qt3DCore/private/qnode_p.h>
#include <Qt3DCore/qpropertyupdatedchange.h>
#include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
#include <Qt3DCore/qnodecreatedchange.h>
#include <Qt3DInput/qabstractactioninput.h>
@@ -137,7 +137,7 @@ void QAction::removeInput(QAbstractActionInput *input)
if (d->m_inputs.contains(input)) {
if (d->m_changeArbiter != nullptr) {
- const auto change = Qt3DCore::QNodeRemovedPropertyChangePtr::create(id(), input);
+ const auto change = Qt3DCore::QPropertyNodeRemovedChangePtr::create(id(), input);
change->setPropertyName("input");
d->notifyObservers(change);
}
diff --git a/src/input/frontend/qaxis.cpp b/src/input/frontend/qaxis.cpp
index f49e20690..1cee05203 100644
--- a/src/input/frontend/qaxis.cpp
+++ b/src/input/frontend/qaxis.cpp
@@ -41,7 +41,7 @@
#include <Qt3DInput/qabstractaxisinput.h>
#include <Qt3DCore/qpropertyupdatedchange.h>
#include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
#include <Qt3DCore/qnodecreatedchange.h>
QT_BEGIN_NAMESPACE
@@ -92,7 +92,7 @@ void QAxis::removeInput(QAbstractAxisInput *input)
if (d->m_inputs.contains(input)) {
if (d->m_changeArbiter != nullptr) {
- const auto change = Qt3DCore::QNodeRemovedPropertyChangePtr::create(id(), input);
+ const auto change = Qt3DCore::QPropertyNodeRemovedChangePtr::create(id(), input);
change->setPropertyName("input");
d->notifyObservers(change);
}
diff --git a/src/input/frontend/qinputchord.cpp b/src/input/frontend/qinputchord.cpp
index 6d39a5ccc..b00bccd4b 100644
--- a/src/input/frontend/qinputchord.cpp
+++ b/src/input/frontend/qinputchord.cpp
@@ -42,7 +42,7 @@
#include <Qt3DInput/qabstractphysicaldevice.h>
#include <Qt3DCore/qpropertyupdatedchange.h>
#include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
QT_BEGIN_NAMESPACE
@@ -169,7 +169,7 @@ void QInputChord::removeChord(QAbstractActionInput *input)
if (d->m_chords.contains(input)) {
if (d->m_changeArbiter != nullptr) {
- const auto change = Qt3DCore::QNodeRemovedPropertyChangePtr::create(id(), input);
+ const auto change = Qt3DCore::QPropertyNodeRemovedChangePtr::create(id(), input);
change->setPropertyName("chord");
d->notifyObservers(change);
}
diff --git a/src/input/frontend/qinputsequence.cpp b/src/input/frontend/qinputsequence.cpp
index ff74418a1..461605a64 100644
--- a/src/input/frontend/qinputsequence.cpp
+++ b/src/input/frontend/qinputsequence.cpp
@@ -44,7 +44,7 @@
#include <Qt3DInput/qabstractactioninput.h>
#include <Qt3DCore/qpropertyupdatedchange.h>
#include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
QT_BEGIN_NAMESPACE
@@ -214,7 +214,7 @@ void QInputSequence::removeSequence(QAbstractActionInput *input)
Q_D(QInputSequence);
if (d->m_sequences.contains(input)) {
if (d->m_changeArbiter != nullptr) {
- const auto change = Qt3DCore::QNodeRemovedPropertyChangePtr::create(id(), input);
+ const auto change = Qt3DCore::QPropertyNodeRemovedChangePtr::create(id(), input);
change->setPropertyName("sequence");
d->notifyObservers(change);
}
diff --git a/src/input/frontend/qlogicaldevice.cpp b/src/input/frontend/qlogicaldevice.cpp
index 9d053c4bf..07f233e48 100644
--- a/src/input/frontend/qlogicaldevice.cpp
+++ b/src/input/frontend/qlogicaldevice.cpp
@@ -44,7 +44,7 @@
#include <Qt3DCore/qnodecreatedchange.h>
#include <Qt3DCore/qpropertyupdatedchange.h>
#include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
QT_BEGIN_NAMESPACE
@@ -175,7 +175,7 @@ void QLogicalDevice::removeAction(QAction *action)
if (d->m_actions.contains(action)) {
if (d->m_changeArbiter != nullptr) {
- const auto change = Qt3DCore::QNodeRemovedPropertyChangePtr::create(id(), action);
+ const auto change = Qt3DCore::QPropertyNodeRemovedChangePtr::create(id(), action);
change->setPropertyName("action");
d->notifyObservers(change);
}
@@ -228,7 +228,7 @@ void QLogicalDevice::removeAxis(QAxis *axis)
Q_D(QLogicalDevice);
if (d->m_axes.contains(axis)) {
if (d->m_changeArbiter != nullptr) {
- const auto change = Qt3DCore::QNodeRemovedPropertyChangePtr::create(id(), axis);
+ const auto change = Qt3DCore::QPropertyNodeRemovedChangePtr::create(id(), axis);
change->setPropertyName("axis");
d->notifyObservers(change);
}