diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-05-28 11:21:04 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-01 01:21:40 +0200 |
| commit | 87d7545cd0580795d1fbe3f7112bafcea29cc8b1 (patch) | |
| tree | af7d7458bf143915ca598b97b3475ab684ac2f34 /src/corelib | |
| parent | 3aac6768f837da5df4924280ba2856106e647837 (diff) | |
Fix To-Do in qstatemachine (use QObject::senderSignalIndex())
Change-Id: Id8a541878918f27a34595ff297d0f41b79275a96
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/statemachine/qstatemachine.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index fffe6de567..21c3ab50b5 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -2299,16 +2299,10 @@ int QSignalEventGenerator::qt_metacall(QMetaObject::Call _c, int _id, void **_a) void QSignalEventGenerator::execute(void **_a) { -// ### in Qt 4.6 we can use QObject::senderSignalIndex() - QObjectPrivate *d = static_cast<QObjectPrivate *>(d_ptr.data()); - int signalIndex = -1; - QObject *sender = this->sender(); - if (sender && d->currentSender) - signalIndex = d->currentSender->signal; - + int signalIndex = senderSignalIndex(); Q_ASSERT(signalIndex != -1); QStateMachine *machine = qobject_cast<QStateMachine*>(parent()); - QStateMachinePrivate::get(machine)->handleTransitionSignal(sender, signalIndex, _a); + QStateMachinePrivate::get(machine)->handleTransitionSignal(sender(), signalIndex, _a); } QSignalEventGenerator::QSignalEventGenerator(QStateMachine *parent) |