summaryrefslogtreecommitdiffstats
path: root/src/corelib/statemachine/qstatemachine_p.h
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-05-12 16:38:32 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-05-12 16:38:32 (GMT)
commit09d1e6ee7d93c9fb658b2be5fe49698bf3faa0d6 (patch)
tree2e68a3b01279934464acf98dd774b90659573dc6 /src/corelib/statemachine/qstatemachine_p.h
parent3db6f6234eb36ec4b3d6e14dc48917762653cbd7 (diff)
downloadQt-09d1e6ee7d93c9fb658b2be5fe49698bf3faa0d6.zip
Qt-09d1e6ee7d93c9fb658b2be5fe49698bf3faa0d6.tar.gz
Qt-09d1e6ee7d93c9fb658b2be5fe49698bf3faa0d6.tar.bz2
correctly handle multiple signal transitions for same (object,signal)
The signal was not disconnected at the right time. We now store the number of active signal transitions for a particular (object,signal) and only disconnect when the count drops to zero.
Diffstat (limited to 'src/corelib/statemachine/qstatemachine_p.h')
-rw-r--r--src/corelib/statemachine/qstatemachine_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h
index 47b139c..4bf9ce2 100644
--- a/src/corelib/statemachine/qstatemachine_p.h
+++ b/src/corelib/statemachine/qstatemachine_p.h
@@ -61,6 +61,7 @@
#include <QtCore/qlist.h>
#include <QtCore/qpair.h>
#include <QtCore/qset.h>
+#include <QtCore/qvector.h>
#include "qstate.h"
#include "qstate_p.h"
@@ -202,7 +203,7 @@ public:
#ifndef QT_STATEMACHINE_SOLUTION
QSignalEventGenerator *signalEventGenerator;
#endif
- QHash<const QObject*, QList<int> > connections;
+ QHash<const QObject*, QVector<int> > connections;
#ifndef QT_NO_STATEMACHINE_EVENTFILTER
QHash<QObject*, QSet<QEvent::Type> > qobjectEvents;
#endif