diff options
Diffstat (limited to 'src/testlib/qsignaldumper.cpp')
| -rw-r--r-- | src/testlib/qsignaldumper.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/testlib/qsignaldumper.cpp b/src/testlib/qsignaldumper.cpp index 4fd870b644..2da4174e3a 100644 --- a/src/testlib/qsignaldumper.cpp +++ b/src/testlib/qsignaldumper.cpp @@ -64,12 +64,6 @@ static int iLevel = 0; static int ignoreLevel = 0; enum { IndentSpacesCount = 4 }; -static QByteArray memberName(const QMetaMethod &member) -{ - QByteArray ba = member.signature(); - return ba.left(ba.indexOf('(')); -} - static void qSignalDumperCallback(QObject *caller, int method_index, void **argv) { Q_ASSERT(caller); Q_ASSERT(argv); Q_UNUSED(argv); @@ -96,7 +90,7 @@ static void qSignalDumperCallback(QObject *caller, int method_index, void **argv str += QByteArray::number(quintptr(caller), 16); str += ") "; - str += QTest::memberName(member); + str += member.name(); str += " ("; QList<QByteArray> args = member.parameterTypes(); @@ -112,7 +106,8 @@ static void qSignalDumperCallback(QObject *caller, int method_index, void **argv quintptr addr = quintptr(*reinterpret_cast<void **>(argv[i + 1])); str.append(QByteArray::number(addr, 16)); - } else if (typeId != QMetaType::Void) { + } else if (typeId != QMetaType::UnknownType) { + Q_ASSERT(typeId != QMetaType::Void); // void parameter => metaobject is corrupt str.append(arg) .append('(') .append(QVariant(typeId, argv[i + 1]).toString().toLocal8Bit()) @@ -152,7 +147,7 @@ static void qSignalDumperCallbackSlot(QObject *caller, int method_index, void ** str += QByteArray::number(quintptr(caller), 16); str += ") "; - str += member.signature(); + str += member.methodSignature(); qPrintMessage(str); } |