summaryrefslogtreecommitdiffstats
path: root/src/corelib/statemachine/qstate.cpp
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-06-22 12:44:55 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-06-22 12:50:11 (GMT)
commitdb92a780ceb130b6fa91ad866e521237c4b255b8 (patch)
tree01d7e77c82f652799cdfac86aadc6d8cf3e317b4 /src/corelib/statemachine/qstate.cpp
parent24146ce4ad076fb6337b591d24e5a8c6a290fe41 (diff)
downloadQt-db92a780ceb130b6fa91ad866e521237c4b255b8.zip
Qt-db92a780ceb130b6fa91ad866e521237c4b255b8.tar.gz
Qt-db92a780ceb130b6fa91ad866e521237c4b255b8.tar.bz2
perform normalization of signatures for signal transitions
Make state->addTransition(foo, SIGNAL( bar( ) ), ...) work.
Diffstat (limited to 'src/corelib/statemachine/qstate.cpp')
-rw-r--r--src/corelib/statemachine/qstate.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp
index c42c9c9..fd7ddef 100644
--- a/src/corelib/statemachine/qstate.cpp
+++ b/src/corelib/statemachine/qstate.cpp
@@ -333,10 +333,13 @@ QSignalTransition *QState::addTransition(QObject *sender, const char *signal,
return 0;
}
int offset = (*signal == '0'+QSIGNAL_CODE) ? 1 : 0;
- if (sender->metaObject()->indexOfSignal(signal+offset) == -1) {
- qWarning("QState::addTransition: no such signal %s::%s",
- sender->metaObject()->className(), signal+offset);
- return 0;
+ const QMetaObject *meta = sender->metaObject();
+ if (meta->indexOfSignal(signal+offset) == -1) {
+ if (meta->indexOfSignal(QMetaObject::normalizedSignature(signal+offset)) == -1) {
+ qWarning("QState::addTransition: no such signal %s::%s",
+ meta->className(), signal+offset);
+ return 0;
+ }
}
QSignalTransition *trans = new QSignalTransition(sender, signal, QList<QAbstractState*>() << target);
addTransition(trans);