From 368c3c936fc12ef5249d72ffa5541df3b8558e4d Mon Sep 17 00:00:00 2001
From: Kent Hansen <khansen@trolltech.com>
Date: Wed, 17 Jun 2009 10:59:50 +0200
Subject: bring back QAbstractTransition::triggered() signal

It's been requested by several users. Since we have
QAbstractState::{entered,exited}() signals, we should have this one
as well.
---
 src/corelib/statemachine/qabstracttransition.cpp | 15 +++++++++++++++
 src/corelib/statemachine/qabstracttransition.h   |  6 ++++++
 src/corelib/statemachine/qabstracttransition_p.h |  1 +
 src/corelib/statemachine/qstatemachine.cpp       |  1 +
 tests/auto/qstatemachine/tst_qstatemachine.cpp   |  2 ++
 5 files changed, 25 insertions(+)

diff --git a/src/corelib/statemachine/qabstracttransition.cpp b/src/corelib/statemachine/qabstracttransition.cpp
index 3be3b73..670aa7d 100644
--- a/src/corelib/statemachine/qabstracttransition.cpp
+++ b/src/corelib/statemachine/qabstracttransition.cpp
@@ -67,6 +67,8 @@ QT_BEGIN_NAMESPACE
   targetStates() function returns the targets of the transition. The machine()
   function returns the state machine that the transition is part of.
 
+  The triggered() signal is emitted when the transition has been triggered.
+
   Transitions can cause animations to be played. Use the addAnimation()
   function to add an animation to the transition.
 
@@ -139,6 +141,12 @@ QState *QAbstractTransitionPrivate::sourceState() const
     return qobject_cast<QState*>(parent);
 }
 
+void QAbstractTransitionPrivate::emitTriggered()
+{
+    Q_Q(QAbstractTransition);
+    emit q->triggered();
+}
+
 /*!
   Constructs a new QAbstractTransition object with the given \a sourceState.
 */
@@ -333,6 +341,13 @@ QList<QAbstractAnimation*> QAbstractTransition::animations() const
 */
 
 /*!
+  \fn QAbstractTransition::triggered()
+
+  This signal is emitted when the transition has been triggered (after
+  onTransition() has been called).
+*/
+
+/*!
   \reimp
 */
 bool QAbstractTransition::event(QEvent *e)
diff --git a/src/corelib/statemachine/qabstracttransition.h b/src/corelib/statemachine/qabstracttransition.h
index 83899ce..9ba1f11 100644
--- a/src/corelib/statemachine/qabstracttransition.h
+++ b/src/corelib/statemachine/qabstracttransition.h
@@ -89,6 +89,12 @@ public:
     QList<QAbstractAnimation*> animations() const;
 #endif
 
+Q_SIGNALS:
+#if !defined(Q_MOC_RUN) && !defined(qdoc)
+private: // can only be emitted by QAbstractTransition
+#endif
+    void triggered();
+
 protected:
     virtual bool eventTest(QEvent *event) = 0;
 
diff --git a/src/corelib/statemachine/qabstracttransition_p.h b/src/corelib/statemachine/qabstracttransition_p.h
index f0b9bb3..784832d 100644
--- a/src/corelib/statemachine/qabstracttransition_p.h
+++ b/src/corelib/statemachine/qabstracttransition_p.h
@@ -78,6 +78,7 @@ public:
     void callOnTransition(QEvent *e);
     QState *sourceState() const;
     QStateMachine *machine() const;
+    void emitTriggered();
 
     QList<QPointer<QAbstractState> > targetStates;
 
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index 7a34e4b..04cce50 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -498,6 +498,7 @@ void QStateMachinePrivate::executeTransitionContent(QEvent *event, const QList<Q
         qDebug() << q_func() << ": triggering" << t;
 #endif
         QAbstractTransitionPrivate::get(t)->callOnTransition(event);
+        QAbstractTransitionPrivate::get(t)->emitTriggered();
     }
 }
 
diff --git a/tests/auto/qstatemachine/tst_qstatemachine.cpp b/tests/auto/qstatemachine/tst_qstatemachine.cpp
index 6404e15..9bccb97 100644
--- a/tests/auto/qstatemachine/tst_qstatemachine.cpp
+++ b/tests/auto/qstatemachine/tst_qstatemachine.cpp
@@ -1157,6 +1157,7 @@ void tst_QStateMachine::stateEntryAndExit()
         QVERIFY(!machine.isRunning());
         QSignalSpy s1EnteredSpy(s1, SIGNAL(entered()));
         QSignalSpy s1ExitedSpy(s1, SIGNAL(exited()));
+        QSignalSpy tTriggeredSpy(t, SIGNAL(triggered()));
         QSignalSpy s2EnteredSpy(s2, SIGNAL(entered()));
         QSignalSpy s2ExitedSpy(s2, SIGNAL(exited()));
         machine.start();
@@ -1187,6 +1188,7 @@ void tst_QStateMachine::stateEntryAndExit()
 
         QCOMPARE(s1EnteredSpy.count(), 1);
         QCOMPARE(s1ExitedSpy.count(), 1);
+        QCOMPARE(tTriggeredSpy.count(), 1);
         QCOMPARE(s2EnteredSpy.count(), 1);
         QCOMPARE(s2ExitedSpy.count(), 1);
     }
-- 
cgit v0.12