summaryrefslogtreecommitdiffstats
path: root/src/gui/statemachine/qkeyeventtransition.cpp
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-04-29 10:20:11 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-04-29 10:20:11 (GMT)
commit6ca9c87235b057bc635576b0c414ca789afaf592 (patch)
tree3ba290fc3edabbb1372dba253cbe5d3526f80f14 /src/gui/statemachine/qkeyeventtransition.cpp
parent35f353f16f696a7362d3e899c9a7e2066dc09c65 (diff)
downloadQt-6ca9c87235b057bc635576b0c414ca789afaf592.zip
Qt-6ca9c87235b057bc635576b0c414ca789afaf592.tar.gz
Qt-6ca9c87235b057bc635576b0c414ca789afaf592.tar.bz2
rename QBoundEvent to QWrappedEvent and make it public
Result of API review.
Diffstat (limited to 'src/gui/statemachine/qkeyeventtransition.cpp')
-rw-r--r--src/gui/statemachine/qkeyeventtransition.cpp18
1 files changed, 7 insertions, 11 deletions
diff --git a/src/gui/statemachine/qkeyeventtransition.cpp b/src/gui/statemachine/qkeyeventtransition.cpp
index 7c1ae8a..37f4dd9 100644
--- a/src/gui/statemachine/qkeyeventtransition.cpp
+++ b/src/gui/statemachine/qkeyeventtransition.cpp
@@ -11,6 +11,7 @@
#include "qkeyeventtransition.h"
#include "qbasickeyeventtransition_p.h"
+#include <QtCore/qwrappedevent.h>
#if defined(QT_EXPERIMENTAL_SOLUTION)
# include "qeventtransition_p.h"
@@ -139,19 +140,14 @@ void QKeyEventTransition::setModifiersMask(Qt::KeyboardModifiers modifiersMask)
/*!
\reimp
*/
-bool QKeyEventTransition::testEventCondition(QEvent *event) const
-{
- Q_D(const QKeyEventTransition);
- d->transition->setEventType(event->type());
- return QAbstractTransitionPrivate::get(d->transition)->callEventTest(event);
-}
-
-/*!
- \reimp
-*/
bool QKeyEventTransition::eventTest(QEvent *event) const
{
- return QEventTransition::eventTest(event);
+ Q_D(const QKeyEventTransition);
+ if (!QEventTransition::eventTest(event))
+ return false;
+ QWrappedEvent *we = static_cast<QWrappedEvent*>(event);
+ d->transition->setEventType(we->event()->type());
+ return QAbstractTransitionPrivate::get(d->transition)->callEventTest(we->event());
}
/*!