diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-05-31 20:46:28 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-01 20:34:31 +0200 |
commit | 42a6fb40902be0a96a070197f9d973b1ae0231af (patch) | |
tree | 8654d9bf8e40bfff816e596afb370f83a2c10895 /src/corelib/kernel/qobject.cpp | |
parent | 3057c4173b00e079bb3e24550a36293506a2ae44 (diff) |
Simplify the QObject::dumpObjectInfo() implementation
Use the new signal index-based API.
Change-Id: If44e02e71b718bca5c18c486ca9ab95f836cd0f1
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/kernel/qobject.cpp')
-rw-r--r-- | src/corelib/kernel/qobject.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 0e8f5cbe74..2b03771b1a 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -3700,21 +3700,8 @@ void QObject::dumpObjectInfo() qDebug(" SIGNALS OUT"); if (d->connectionLists) { - int offset = 0; - int offsetToNextMetaObject = 0; for (int signal_index = 0; signal_index < d->connectionLists->count(); ++signal_index) { - if (signal_index >= offsetToNextMetaObject) { - const QMetaObject *mo = metaObject(); - int signalOffset, methodOffset; - computeOffsets(mo, &signalOffset, &methodOffset); - while (signalOffset > signal_index) { - mo = mo->superClass(); - offsetToNextMetaObject = signalOffset; - computeOffsets(mo, &signalOffset, &methodOffset); - } - offset = methodOffset - signalOffset; - } - const QMetaMethod signal = metaObject()->method(signal_index + offset); + const QMetaMethod signal = QMetaObjectPrivate::signal(metaObject(), signal_index); qDebug(" signal: %s", signal.methodSignature().constData()); // receivers |