Add prefix to statemachine-specific event types

"Signal" and "Wrapped" is too generic; prefix with StateMachine.

Reviewed-by: Eskil Abrahamsen Blomfeldt

3 files changed, 5 insertions, 5 deletions

diff --git a/src/corelib/statemachine/qeventtransition.cpp b/src/corelib/statemachine/qeventtransition.cpp
index f278371..949f39e 100644
--- a/src/corelib/statemachine/qeventtransition.cpp
+++ b/src/corelib/statemachine/qeventtransition.cpp
@@ -231,7 +231,7 @@ void QEventTransition::setEventSource(QObject *object)
 bool QEventTransition::eventTest(QEvent *event)
 {
     Q_D(const QEventTransition);
-    if (event->type() == QEvent::Wrapped) {
+    if (event->type() == QEvent::StateMachineWrapped) {
         QStateMachine::WrappedEvent *we = static_cast<QStateMachine::WrappedEvent*>(event);
         return (we->object() == d->object)
             && (we->event()->type() == d->eventType);
diff --git a/src/corelib/statemachine/qsignaltransition.cpp b/src/corelib/statemachine/qsignaltransition.cpp
index 9811725..f55f634 100644
--- a/src/corelib/statemachine/qsignaltransition.cpp
+++ b/src/corelib/statemachine/qsignaltransition.cpp
@@ -218,7 +218,7 @@ void QSignalTransition::setSignal(const QByteArray &signal)
 bool QSignalTransition::eventTest(QEvent *event)
 {
     Q_D(const QSignalTransition);
-    if (event->type() == QEvent::Signal) {
+    if (event->type() == QEvent::StateMachineSignal) {
         if (d->signalIndex == -1)
             return false;
         QStateMachine::SignalEvent *se = static_cast<QStateMachine::SignalEvent*>(event);
@@ -248,7 +248,7 @@ void QSignalTransitionPrivate::callOnTransition(QEvent *e)
 {
     Q_Q(QSignalTransition);
 
-    if (e->type() == QEvent::Signal) {
+    if (e->type() == QEvent::StateMachineSignal) {
         QStateMachine::SignalEvent *se = static_cast<QStateMachine::SignalEvent *>(e);
         int savedSignalIndex = se->m_signalIndex;
         se->m_signalIndex = originalSignalIndex;
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index c7144e4..e182c88 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -2206,7 +2206,7 @@ QSignalEventGenerator::QSignalEventGenerator(QStateMachine *parent)
 */
 QStateMachine::SignalEvent::SignalEvent(QObject *sender, int signalIndex,
                                         const QList<QVariant> &arguments)
-    : QEvent(QEvent::Signal), m_sender(sender),
+    : QEvent(QEvent::StateMachineSignal), m_sender(sender),
       m_signalIndex(signalIndex), m_arguments(arguments)
 {
 }
@@ -2269,7 +2269,7 @@ QStateMachine::SignalEvent::~SignalEvent()
   The WrappedEvent object takes ownership of \a event.
 */
 QStateMachine::WrappedEvent::WrappedEvent(QObject *object, QEvent *event)
-    : QEvent(QEvent::Wrapped), m_object(object), m_event(event)
+    : QEvent(QEvent::StateMachineWrapped), m_object(object), m_event(event)
 {
 }