Simplify the QObject::dumpObjectInfo() implementation
authorKent Hansen <kent.hansen@nokia.com>
Thu, 31 May 2012 18:46:28 +0000 (20:46 +0200)
committerQt by Nokia <qt-info@nokia.com>
Fri, 1 Jun 2012 18:34:31 +0000 (20:34 +0200)
Use the new signal index-based API.

Change-Id: If44e02e71b718bca5c18c486ca9ab95f836cd0f1
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
src/corelib/kernel/qobject.cpp

index 0e8f5cb..2b03771 100644 (file)
@@ -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