summaryrefslogtreecommitdiffstats
path: root/src/corelib/statemachine/qsignaltransition.cpp
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2009-09-02 14:23:44 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2009-09-02 14:24:35 (GMT)
commit0f06310ad141fb3705cb5180db700aa82a155287 (patch)
treedbd32a3abecbe2189b1cb6271a8730f0f2e5c204 /src/corelib/statemachine/qsignaltransition.cpp
parent9b7b54f72278249984565d67ebac6b2700c3d002 (diff)
downloadQt-0f06310ad141fb3705cb5180db700aa82a155287.zip
Qt-0f06310ad141fb3705cb5180db700aa82a155287.tar.gz
Qt-0f06310ad141fb3705cb5180db700aa82a155287.tar.bz2
fix warnings on mingw
Diffstat (limited to 'src/corelib/statemachine/qsignaltransition.cpp')
-rw-r--r--src/corelib/statemachine/qsignaltransition.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/corelib/statemachine/qsignaltransition.cpp b/src/corelib/statemachine/qsignaltransition.cpp
index ac2aac8..2fc6a58 100644
--- a/src/corelib/statemachine/qsignaltransition.cpp
+++ b/src/corelib/statemachine/qsignaltransition.cpp
@@ -249,17 +249,15 @@ void QSignalTransitionPrivate::callOnTransition(QEvent *e)
{
Q_Q(QSignalTransition);
- QSignalEvent *se = static_cast<QSignalEvent *>(e);
- int savedSignalIndex;
if (e->type() == QEvent::Signal) {
- savedSignalIndex = se->m_signalIndex;
+ QSignalEvent *se = static_cast<QSignalEvent *>(e);
+ int savedSignalIndex = se->m_signalIndex;
se->m_signalIndex = originalSignalIndex;
- }
-
- q->onTransition(e);
-
- if (e->type() == QEvent::Signal)
+ q->onTransition(e);
se->m_signalIndex = savedSignalIndex;
+ } else {
+ q->onTransition(e);
+ }
}
QT_END_NAMESPACE