Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-animations

5 files changed, 74 insertions, 12 deletions

diff --git a/src/corelib/statemachine/qabstracttransition.cpp b/src/corelib/statemachine/qabstracttransition.cpp
index 1897aa6..6ddb416 100644
--- a/src/corelib/statemachine/qabstracttransition.cpp
+++ b/src/corelib/statemachine/qabstracttransition.cpp
@@ -179,8 +179,7 @@ QAbstractTransition::QAbstractTransition(const QList<QAbstractState*> &targets,
 #ifdef QT_STATEMACHINE_SOLUTION
     d_ptr->q_ptr = this;
 #endif
-    Q_D(QAbstractTransition);
-    d->targetStates = targets;
+    setTargetStates(targets);
 }
 
 /*!
@@ -220,8 +219,7 @@ QAbstractTransition::QAbstractTransition(QAbstractTransitionPrivate &dd,
 #ifdef QT_STATEMACHINE_SOLUTION
     d_ptr->q_ptr = this;
 #endif
-    Q_D(QAbstractTransition);
-    d->targetStates = targets;
+    setTargetStates(targets);
 }
 
 /*!
@@ -265,7 +263,7 @@ void QAbstractTransition::setTargetState(QAbstractState* target)
     if (!target)
         d->targetStates.clear();
     else
-        d->targetStates = QList<QAbstractState*>() << target;
+        setTargetStates(QList<QAbstractState*>() << target);
 }
 
 /*!
@@ -275,7 +273,13 @@ void QAbstractTransition::setTargetState(QAbstractState* target)
 QList<QAbstractState*> QAbstractTransition::targetStates() const
 {
     Q_D(const QAbstractTransition);
-    return d->targetStates;
+    QList<QAbstractState*> result;
+    for (int i = 0; i < d->targetStates.size(); ++i) {
+        QAbstractState *target = d->targetStates.at(i);
+        if (target)
+            result.append(target);
+    }
+    return result;
 }
 
 /*!
@@ -284,7 +288,22 @@ QList<QAbstractState*> QAbstractTransition::targetStates() const
 void QAbstractTransition::setTargetStates(const QList<QAbstractState*> &targets)
 {
     Q_D(QAbstractTransition);
-    d->targetStates = targets;
+
+    for (int i=0; i<targets.size(); ++i) {
+        QAbstractState *target = targets.at(i);
+        if (!target) {
+            qWarning("QAbstractTransition::setTargetStates: target state(s) cannot be null");
+            return;
+        }
+        if (target->machine() != 0 && target->machine()->rootState() == target) {
+            qWarning("QAbstractTransition::setTargetStates: root state cannot be target of transition");
+            return;
+        }
+    }
+
+    d->targetStates.clear();
+    for (int i = 0; i < targets.size(); ++i)
+        d->targetStates.append(targets.at(i));
 }
 
 /*!
diff --git a/src/corelib/statemachine/qabstracttransition_p.h b/src/corelib/statemachine/qabstracttransition_p.h
index b4e1c88..eb0ec21 100644
--- a/src/corelib/statemachine/qabstracttransition_p.h
+++ b/src/corelib/statemachine/qabstracttransition_p.h
@@ -58,6 +58,7 @@
 #endif
 
 #include <QtCore/qlist.h>
+#include <QtCore/qpointer.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -83,7 +84,7 @@ public:
     QState *sourceState() const;
     QStateMachine *machine() const;
 
-    QList<QAbstractState*> targetStates;
+    QList<QPointer<QAbstractState> > targetStates;
 
 #ifndef QT_NO_ANIMATION
     QList<QAbstractAnimation*> animations;
diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp
index 4c9e033..5f61865 100644
--- a/src/corelib/statemachine/qstate.cpp
+++ b/src/corelib/statemachine/qstate.cpp
@@ -280,11 +280,15 @@ QAbstractState *QState::errorState() const
 void QState::setErrorState(QAbstractState *state)
 {
     Q_D(QState);
-    if (state != 0 && QAbstractStatePrivate::get(state)->machine() != d->machine()) {
+    if (state != 0 && state->machine() != machine()) {
         qWarning("QState::setErrorState: error state cannot belong "
                  "to a different state machine");
         return;
     }
+    if (state->machine() != 0 && state->machine()->rootState() == state) {
+        qWarning("QStateMachine::setErrorState: root state cannot be error state");
+        return;
+    }
 
     d->errorState = state;
 }
@@ -301,7 +305,14 @@ QAbstractTransition *QState::addTransition(QAbstractTransition *transition)
         qWarning("QState::addTransition: cannot add null transition");
         return 0;
     }
-    const QList<QAbstractState*> &targets = QAbstractTransitionPrivate::get(transition)->targetStates;
+
+    // machine() will always be non-null for root state
+    if (machine() != 0 && machine()->rootState() == this) {
+        qWarning("QState::addTransition: cannot add transition from root state");
+        return 0;
+    }
+
+    const QList<QPointer<QAbstractState> > &targets = QAbstractTransitionPrivate::get(transition)->targetStates;
     for (int i = 0; i < targets.size(); ++i) {
         QAbstractState *t = targets.at(i);
         if (!t) {
@@ -335,6 +346,15 @@ QSignalTransition *QState::addTransition(QObject *sender, const char *signal,
         qWarning("QState::addTransition: signal cannot be null");
         return 0;
     }
+    if (!target) {
+        qWarning("QState::addTransition: cannot add transition to null state");
+        return 0;
+    }
+    if (*signal && sender->metaObject()->indexOfSignal(signal+1) == -1) {
+        qWarning("QState::addTransition: no such signal %s::%s",
+                 sender->metaObject()->className(), signal+1);
+        return 0;
+    }
     QSignalTransition *trans = new QSignalTransition(sender, signal, QList<QAbstractState*>() << target);
     addTransition(trans);
     return trans;
@@ -361,9 +381,12 @@ protected:
 */
 QAbstractTransition *QState::addTransition(QAbstractState *target)
 {
+    if (!target) {
+        qWarning("QState::addTransition: cannot add transition to null state");
+        return 0;
+    }
     UnconditionalTransition *trans = new UnconditionalTransition(target);
-    addTransition(trans);
-    return trans;
+    return addTransition(trans);
 }
 
 /*!
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index 21e564c..24af8e4 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -1011,6 +1011,8 @@ void QStateMachinePrivate::setError(QStateMachine::Error errorCode, QAbstractSta
     }
 
     Q_ASSERT(currentErrorState != 0);
+    Q_ASSERT(currentErrorState != rootState);
+    
     QState *lca = findLCA(QList<QAbstractState*>() << currentErrorState << currentContext);
     addStatesToEnter(currentErrorState, lca, pendingErrorStates, pendingErrorStatesForDefaultEntry);
 }
@@ -1222,10 +1224,12 @@ void QStateMachinePrivate::_q_process()
         break;
     case Finished:
         state = NotRunning;
+        unregisterAllTransitions();
         emit q->finished();
         break;
     case Stopped:
         state = NotRunning;
+        unregisterAllTransitions();
         emit q->stopped();
         break;
     }
@@ -1356,6 +1360,20 @@ void QStateMachinePrivate::unregisterSignalTransition(QSignalTransition *transit
 #endif
 }
 
+void QStateMachinePrivate::unregisterAllTransitions()
+{
+    {
+        QList<QSignalTransition*> transitions = qFindChildren<QSignalTransition*>(rootState);
+        for (int i = 0; i < transitions.size(); ++i)
+            unregisterSignalTransition(transitions.at(i));
+    }
+    {
+        QList<QEventTransition*> transitions = qFindChildren<QEventTransition*>(rootState);
+        for (int i = 0; i < transitions.size(); ++i)
+            unregisterEventTransition(transitions.at(i));
+    }
+}
+
 #ifndef QT_NO_STATEMACHINE_EVENTFILTER
 void QStateMachinePrivate::registerEventTransition(QEventTransition *transition)
 {
diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h
index bb4a78c..47b139c 100644
--- a/src/corelib/statemachine/qstatemachine_p.h
+++ b/src/corelib/statemachine/qstatemachine_p.h
@@ -150,6 +150,7 @@ public:
     void unregisterEventTransition(QEventTransition *transition);
 #endif
     void unregisterTransition(QAbstractTransition *transition);
+    void unregisterAllTransitions();
     void handleTransitionSignal(const QObject *sender, int signalIndex,
                                 void **args);    
     void scheduleProcess();