remove constructors that are not useful

The constructors that take a list of target states produce
hard-to-read code, and they're rarely useful in practice since
99% of transitions take a single target state; so it's better
to enforce that setTarget{State,States}() be used instead.

15 files changed, 28 insertions, 138 deletions

diff --git a/examples/animation/stickman/lifecycle.cpp b/examples/animation/stickman/lifecycle.cpp
index c761d87..700916d 100644
--- a/examples/animation/stickman/lifecycle.cpp
+++ b/examples/animation/stickman/lifecycle.cpp
@@ -56,8 +56,9 @@ public:
     {
     }
     KeyPressTransition(GraphicsView *receiver, Qt::Key key, QAbstractState *target)
-        : QSignalTransition(receiver, SIGNAL(keyPressed(int)), QList<QAbstractState*>() << target), m_key(key)
+        : QSignalTransition(receiver, SIGNAL(keyPressed(int))), m_key(key)
     {
+        setTargetState(target);
     }
 
     virtual bool eventTest(QEvent *e)
@@ -78,8 +79,9 @@ class LightningStrikesTransition: public QEventTransition
 {
 public:
     LightningStrikesTransition(QAbstractState *target)
-        : QEventTransition(this, QEvent::Timer, QList<QAbstractState*>() << target)
+        : QEventTransition(this, QEvent::Timer)
     {
+        setTargetState(target);
         qsrand((uint)QDateTime::currentDateTime().toTime_t());
         startTimer(1000);
     }
diff --git a/src/corelib/statemachine/qabstracttransition.cpp b/src/corelib/statemachine/qabstracttransition.cpp
index 0004d3e..3248dcf 100644
--- a/src/corelib/statemachine/qabstracttransition.cpp
+++ b/src/corelib/statemachine/qabstracttransition.cpp
@@ -153,34 +153,12 @@ QAbstractTransition::QAbstractTransition(QState *sourceState)
 }
 
 /*!
-  Constructs a new QAbstractTransition object with the given \a targets and \a
-  sourceState.
-*/
-QAbstractTransition::QAbstractTransition(const QList<QAbstractState*> &targets,
-                                         QState *sourceState)
-    : QObject(*new QAbstractTransitionPrivate, sourceState)
-{
-    setTargetStates(targets);
-}
-
-/*!
-  \internal
-*/
-QAbstractTransition::QAbstractTransition(QAbstractTransitionPrivate &dd,
-                                         QState *parent)
-    : QObject(dd, parent)
-{
-}
-
-/*!
   \internal
 */
 QAbstractTransition::QAbstractTransition(QAbstractTransitionPrivate &dd,
-                                         const QList<QAbstractState*> &targets,
                                          QState *parent)
     : QObject(dd, parent)
 {
-    setTargetStates(targets);
 }
 
 /*!
diff --git a/src/corelib/statemachine/qabstracttransition.h b/src/corelib/statemachine/qabstracttransition.h
index 9ba1f11..8ff3a6e 100644
--- a/src/corelib/statemachine/qabstracttransition.h
+++ b/src/corelib/statemachine/qabstracttransition.h
@@ -72,7 +72,6 @@ class Q_CORE_EXPORT QAbstractTransition : public QObject
     Q_PROPERTY(QList<QAbstractState*> targetStates READ targetStates WRITE setTargetStates)
 public:
     QAbstractTransition(QState *sourceState = 0);
-    QAbstractTransition(const QList<QAbstractState*> &targets, QState *sourceState = 0);
     virtual ~QAbstractTransition();
 
     QState *sourceState() const;
@@ -104,8 +103,6 @@ protected:
 
 protected:
     QAbstractTransition(QAbstractTransitionPrivate &dd, QState *parent);
-    QAbstractTransition(QAbstractTransitionPrivate &dd,
-                        const QList<QAbstractState*> &targets, QState *parent);
 
 private:
     Q_DISABLE_COPY(QAbstractTransition)
diff --git a/src/corelib/statemachine/qeventtransition.cpp b/src/corelib/statemachine/qeventtransition.cpp
index 3933981..813c960 100644
--- a/src/corelib/statemachine/qeventtransition.cpp
+++ b/src/corelib/statemachine/qeventtransition.cpp
@@ -153,22 +153,6 @@ QEventTransition::QEventTransition(QObject *object, QEvent::Type type,
 }
 
 /*!
-  Constructs a new QEventTransition object associated with events of the given
-  \a type for the given \a object. The transition has the given \a targets and
-  \a sourceState.
-*/
-QEventTransition::QEventTransition(QObject *object, QEvent::Type type,
-                                   const QList<QAbstractState*> &targets,
-                                   QState *sourceState)
-    : QAbstractTransition(*new QEventTransitionPrivate, targets, sourceState)
-{
-    Q_D(QEventTransition);
-    d->registered = false;
-    d->object = object;
-    d->eventType = type;
-}
-
-/*!
   \internal
 */
 QEventTransition::QEventTransition(QEventTransitionPrivate &dd, QState *parent)
@@ -190,20 +174,6 @@ QEventTransition::QEventTransition(QEventTransitionPrivate &dd, QObject *object,
 }
 
 /*!
-  \internal
-*/
-QEventTransition::QEventTransition(QEventTransitionPrivate &dd, QObject *object,
-                                   QEvent::Type type, const QList<QAbstractState*> &targets,
-                                   QState *parent)
-    : QAbstractTransition(dd, targets, parent)
-{
-    Q_D(QEventTransition);
-    d->registered = false;
-    d->object = object;
-    d->eventType = type;
-}
-
-/*!
   Destroys this QObject event transition.
 */
 QEventTransition::~QEventTransition()
diff --git a/src/corelib/statemachine/qeventtransition.h b/src/corelib/statemachine/qeventtransition.h
index b05ffef..0ebca19 100644
--- a/src/corelib/statemachine/qeventtransition.h
+++ b/src/corelib/statemachine/qeventtransition.h
@@ -62,8 +62,6 @@ class Q_CORE_EXPORT QEventTransition : public QAbstractTransition
 public:
     QEventTransition(QState *sourceState = 0);
     QEventTransition(QObject *object, QEvent::Type type, QState *sourceState = 0);
-    QEventTransition(QObject *object, QEvent::Type type,
-                     const QList<QAbstractState*> &targets, QState *sourceState = 0);
     ~QEventTransition();
 
     QObject *eventObject() const;
@@ -82,9 +80,6 @@ protected:
     QEventTransition(QEventTransitionPrivate &dd, QState *parent);
     QEventTransition(QEventTransitionPrivate &dd, QObject *object,
                      QEvent::Type type, QState *parent);
-    QEventTransition(QEventTransitionPrivate &dd, QObject *object,
-                     QEvent::Type type, const QList<QAbstractState*> &targets,
-                     QState *parent);
 
 private:
     Q_DISABLE_COPY(QEventTransition)
diff --git a/src/corelib/statemachine/qsignaltransition.cpp b/src/corelib/statemachine/qsignaltransition.cpp
index 389e513..7814699 100644
--- a/src/corelib/statemachine/qsignaltransition.cpp
+++ b/src/corelib/statemachine/qsignaltransition.cpp
@@ -159,21 +159,6 @@ QSignalTransition::QSignalTransition(QObject *sender, const char *signal,
 }
 
 /*!
-  Constructs a new signal transition associated with the given \a signal of
-  the given \a sender. The transition has the given \a targets and \a
-  sourceState.
-*/
-QSignalTransition::QSignalTransition(QObject *sender, const char *signal,
-                                     const QList<QAbstractState*> &targets,
-                                     QState *sourceState)
-    : QAbstractTransition(*new QSignalTransitionPrivate, targets, sourceState)
-{
-    Q_D(QSignalTransition);
-    d->sender = sender;
-    d->signal = signal;
-}
-
-/*!
   Destroys this signal transition.
 */
 QSignalTransition::~QSignalTransition()
diff --git a/src/corelib/statemachine/qsignaltransition.h b/src/corelib/statemachine/qsignaltransition.h
index 69060ae..415751e 100644
--- a/src/corelib/statemachine/qsignaltransition.h
+++ b/src/corelib/statemachine/qsignaltransition.h
@@ -62,9 +62,6 @@ public:
     QSignalTransition(QState *sourceState = 0);
     QSignalTransition(QObject *sender, const char *signal,
                       QState *sourceState = 0);
-    QSignalTransition(QObject *sender, const char *signal,
-                      const QList<QAbstractState*> &targets,
-                      QState *sourceState = 0);
     ~QSignalTransition();
 
     QObject *senderObject() const;
diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp
index 2042288..09d0be0 100644
--- a/src/corelib/statemachine/qstate.cpp
+++ b/src/corelib/statemachine/qstate.cpp
@@ -339,7 +339,8 @@ QSignalTransition *QState::addTransition(QObject *sender, const char *signal,
             return 0;
         }
     }
-    QSignalTransition *trans = new QSignalTransition(sender, signal, QList<QAbstractState*>() << target);
+    QSignalTransition *trans = new QSignalTransition(sender, signal);
+    trans->setTargetState(target);
     addTransition(trans);
     return trans;
 }
@@ -351,7 +352,8 @@ class UnconditionalTransition : public QAbstractTransition
 {
 public:
     UnconditionalTransition(QAbstractState *target)
-        : QAbstractTransition(QList<QAbstractState*>() << target) {}
+        : QAbstractTransition()
+    { setTargetState(target); }
 protected:
     void onTransition(QEvent *) {}
     bool eventTest(QEvent *) { return true; }
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index 5aa5917..9cb1d4d 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -1139,7 +1139,8 @@ class InitialTransition : public QAbstractTransition
 {
 public:
     InitialTransition(QAbstractState *target)
-        : QAbstractTransition(QList<QAbstractState*>() << target) {}
+        : QAbstractTransition()
+    { setTargetState(target); }
 protected:
     virtual bool eventTest(QEvent *) { return true; }
     virtual void onTransition(QEvent *) {}
@@ -1306,7 +1307,8 @@ class GoToStateTransition : public QAbstractTransition
 {
 public:
     GoToStateTransition(QAbstractState *target)
-        : QAbstractTransition(QList<QAbstractState*>() << target) {}
+        : QAbstractTransition()
+    { setTargetState(target); }
 protected:
     void onTransition(QEvent *) { deleteLater(); }
     bool eventTest(QEvent *) { return true; }
diff --git a/src/gui/statemachine/qkeyeventtransition.cpp b/src/gui/statemachine/qkeyeventtransition.cpp
index 51b3ccc..21a0736 100644
--- a/src/gui/statemachine/qkeyeventtransition.cpp
+++ b/src/gui/statemachine/qkeyeventtransition.cpp
@@ -106,19 +106,6 @@ QKeyEventTransition::QKeyEventTransition(QObject *object, QEvent::Type type,
 }
 
 /*!
-  Constructs a new key event transition for events of the given \a type for
-  the given \a object, with the given \a key, \a targets and \a sourceState.
-*/
-QKeyEventTransition::QKeyEventTransition(QObject *object, QEvent::Type type,
-                                         int key, const QList<QAbstractState*> &targets,
-                                         QState *sourceState)
-    : QEventTransition(*new QKeyEventTransitionPrivate, object, type, targets, sourceState)
-{
-    Q_D(QKeyEventTransition);
-    d->transition = new QBasicKeyEventTransition(type, key);
-}
-
-/*!
   Destroys this key event transition.
 */
 QKeyEventTransition::~QKeyEventTransition()
diff --git a/src/gui/statemachine/qkeyeventtransition.h b/src/gui/statemachine/qkeyeventtransition.h
index f5e8de3..45ae684 100644
--- a/src/gui/statemachine/qkeyeventtransition.h
+++ b/src/gui/statemachine/qkeyeventtransition.h
@@ -62,9 +62,6 @@ public:
     QKeyEventTransition(QState *sourceState = 0);
     QKeyEventTransition(QObject *object, QEvent::Type type, int key,
                         QState *sourceState = 0);
-    QKeyEventTransition(QObject *object, QEvent::Type type, int key,
-                        const QList<QAbstractState*> &targets,
-                        QState *sourceState = 0);
     ~QKeyEventTransition();
 
     int key() const;
diff --git a/src/gui/statemachine/qmouseeventtransition.cpp b/src/gui/statemachine/qmouseeventtransition.cpp
index 0cd096a..dbe50b3 100644
--- a/src/gui/statemachine/qmouseeventtransition.cpp
+++ b/src/gui/statemachine/qmouseeventtransition.cpp
@@ -112,21 +112,6 @@ QMouseEventTransition::QMouseEventTransition(QObject *object, QEvent::Type type,
 }
 
 /*!
-  Constructs a new mouse event transition for events of the given \a type for
-  the given \a object, with the given \a button, \a targets and \a
-  sourceState.
-*/
-QMouseEventTransition::QMouseEventTransition(QObject *object, QEvent::Type type,
-                                             Qt::MouseButton button,
-                                             const QList<QAbstractState*> &targets,
-                                             QState *sourceState)
-    : QEventTransition(*new QMouseEventTransitionPrivate, object, type, targets, sourceState)
-{
-    Q_D(QMouseEventTransition);
-    d->transition = new QBasicMouseEventTransition(type, button);
-}
-
-/*!
   Destroys this mouse event transition.
 */
 QMouseEventTransition::~QMouseEventTransition()
diff --git a/src/gui/statemachine/qmouseeventtransition.h b/src/gui/statemachine/qmouseeventtransition.h
index 73ae6c9..a56a554 100644
--- a/src/gui/statemachine/qmouseeventtransition.h
+++ b/src/gui/statemachine/qmouseeventtransition.h
@@ -63,10 +63,6 @@ public:
     QMouseEventTransition(QState *sourceState = 0);
     QMouseEventTransition(QObject *object, QEvent::Type type,
                           Qt::MouseButton button, QState *sourceState = 0);
-    QMouseEventTransition(QObject *object, QEvent::Type type,
-                          Qt::MouseButton button,
-                          const QList<QAbstractState*> &targets,
-                          QState *sourceState = 0);
     ~QMouseEventTransition();
 
     Qt::MouseButton button() const;
diff --git a/tests/auto/qstate/tst_qstate.cpp b/tests/auto/qstate/tst_qstate.cpp
index 78b9853..43ea7fe 100644
--- a/tests/auto/qstate/tst_qstate.cpp
+++ b/tests/auto/qstate/tst_qstate.cpp
@@ -250,8 +250,9 @@ class EventTestTransition: public QAbstractTransition
 {
 public:
     EventTestTransition(QEvent::Type type, QState *targetState) 
-        : QAbstractTransition(QList<QAbstractState*>() << targetState), m_type(type)
-    {        
+        : QAbstractTransition(), m_type(type)
+    {
+        setTargetState(targetState);
     }
 
 protected:
diff --git a/tests/auto/qstatemachine/tst_qstatemachine.cpp b/tests/auto/qstatemachine/tst_qstatemachine.cpp
index 32812e2..97115bb 100644
--- a/tests/auto/qstatemachine/tst_qstatemachine.cpp
+++ b/tests/auto/qstatemachine/tst_qstatemachine.cpp
@@ -226,7 +226,8 @@ class TestTransition : public QAbstractTransition
 {
 public:
     TestTransition(QAbstractState *target)
-        : QAbstractTransition(QList<QAbstractState*>() << target) {}
+        : QAbstractTransition()
+    { setTargetState(target); }
     QList<int> triggers;
 protected:
     virtual bool eventTest(QEvent *) {
@@ -249,7 +250,8 @@ class EventTransition : public QAbstractTransition
 {
 public:
     EventTransition(QEvent::Type type, QAbstractState *target, QState *parent = 0)
-        : QAbstractTransition(QList<QAbstractState*>() << target, parent), m_type(type) {}
+        : QAbstractTransition(parent), m_type(type)
+    { setTargetState(target); }
 protected:
     virtual bool eventTest(QEvent *e) {
         return (e->type() == m_type);
@@ -1514,7 +1516,8 @@ class StringTransition : public QAbstractTransition
 {
 public:
     StringTransition(const QString &value, QAbstractState *target)
-        : QAbstractTransition(QList<QAbstractState*>() << target), m_value(value) {}
+        : QAbstractTransition(), m_value(value)
+    { setTargetState(target); }
 
 protected:
     virtual bool eventTest(QEvent *e) 
@@ -1737,7 +1740,8 @@ public:
         : QSignalTransition(sourceState) {}
     TestSignalTransition(QObject *sender, const char *signal,
                          QAbstractState *target)
-        : QSignalTransition(sender, signal, QList<QAbstractState*>() << target) {}
+        : QSignalTransition(sender, signal)
+    { setTargetState(target); }
     QVariantList argumentsReceived() const {
         return m_args;
     }
@@ -2022,20 +2026,15 @@ void tst_QStateMachine::signalTransitions()
 void tst_QStateMachine::eventTransitions()
 {
     QPushButton button;
-    for (int x = 0; x < 2; ++x) {
+    {
         QStateMachine machine;
         QState *s0 = new QState(&machine);
         QFinalState *s1 = new QFinalState(&machine);
 
         QMouseEventTransition *trans;
-        if (x == 0) {
-            trans = new QMouseEventTransition(&button, QEvent::MouseButtonPress, Qt::LeftButton);
-            QCOMPARE(trans->targetState(), (QAbstractState*)0);
-            trans->setTargetState(s1);
-        } else {
-            trans = new QMouseEventTransition(&button, QEvent::MouseButtonPress,
-                                              Qt::LeftButton, QList<QAbstractState*>() << s1);
-        }
+        trans = new QMouseEventTransition(&button, QEvent::MouseButtonPress, Qt::LeftButton);
+        QCOMPARE(trans->targetState(), (QAbstractState*)0);
+        trans->setTargetState(s1);
         QCOMPARE(trans->eventType(), QEvent::MouseButtonPress);
         QCOMPARE(trans->button(), Qt::LeftButton);
         QCOMPARE(trans->targetState(), (QAbstractState*)s1);
@@ -2071,7 +2070,7 @@ void tst_QStateMachine::eventTransitions()
         QTest::mousePress(&button2, Qt::LeftButton);
         QTRY_COMPARE(finishedSpy.count(), 4);
     }
-    for (int x = 0; x < 3; ++x) {
+    for (int x = 0; x < 2; ++x) {
         QStateMachine machine;
         QState *s0 = new QState(&machine);
         QFinalState *s1 = new QFinalState(&machine);
@@ -2087,9 +2086,6 @@ void tst_QStateMachine::eventTransitions()
         } else if (x == 1) {
             trans = new QEventTransition(&button, QEvent::MouseButtonPress);
             trans->setTargetState(s1);
-        } else {
-            trans = new QEventTransition(&button, QEvent::MouseButtonPress,
-                                         QList<QAbstractState*>() << s1);
         }
         QCOMPARE(trans->eventObject(), (QObject*)&button);
         QCOMPARE(trans->eventType(), QEvent::MouseButtonPress);