feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

debugger: small fixes in the QObject dumper and autotest

Browse Source
This commit is contained in:
hjk
2009-08-20 15:11:12 +02:00
parent 698b5ff253
commit d79e8dc342
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
share/qtcreator/gdbmacros/gdbmacros.cpp
View File

@@ -2294,7 +2294,7 @@ static void qDumpQObjectMethodList(QDumper &d)
static const char *qConnectionType(uint type) static const char *qConnectionType(uint type)
{ {
Qt::ConnectionType connType = static_cast<Qt::ConnectionType>(type); Qt::ConnectionType connType = static_cast<Qt::ConnectionType>(type);
const char *output; const char *output = "unknown";
switch (connType) { switch (connType) {
case Qt::AutoConnection: output = "auto"; break; case Qt::AutoConnection: output = "auto"; break;
case Qt::DirectConnection: output = "direct"; break; case Qt::DirectConnection: output = "direct"; break;
@@ -2337,8 +2337,7 @@ static inline void qDumpQObjectConnectionPart(QDumper &d,
d.put(number).put(namePostfix); d.put(number).put(namePostfix);
d.endItem(); d.endItem();
if (partner == owner) { if (partner == owner) {
d.putItem("value", QLatin1String("<this>")); d.putItem("value", "<this>");
d.putItem("valueencoded", "2");
d.putItem("type", owner->metaObject()->className()); d.putItem("type", owner->metaObject()->className());
d.putItem("numchild", 0); d.putItem("numchild", 0);
d.putItem("addr", owner); d.putItem("addr", owner);

6
tests/auto/debugger/main.cpp
View File

@@ -1788,7 +1788,7 @@ void tst_Debugger::dumpQObjectSignalHelper(QObject &o, int sigNum)
const QString iStr = QString::number(i); const QString iStr = QString::number(i);
expected.append("{name='").append(iStr).append(" receiver',"); expected.append("{name='").append(iStr).append(" receiver',");
if (conn->receiver == &o) if (conn->receiver == &o)
expected.append("value='").append(utfToBase64("<this>")). expected.append("value='").append("<this>").
append("',valueencoded='2',type='").append(o.metaObject()->className()). append("',valueencoded='2',type='").append(o.metaObject()->className()).
append("',numchild='0',addr='").append(ptrToBa(&o)).append("'"); append("',numchild='0',addr='").append(ptrToBa(&o)).append("'");
else if (conn->receiver == 0) else if (conn->receiver == 0)
@@ -1954,11 +1954,9 @@ void tst_Debugger::dumpQObjectSlotHelper(QObject &o, int slot)
if (conn->receiver == &o && conn->method == slot) { if (conn->receiver == &o && conn->method == slot) {
++numChild; ++numChild;
const QMetaMethod &method = sender->metaObject()->method(signal); const QMetaMethod &method = sender->metaObject()->method(signal);
if (numChild > 0)
expected.append(",");
expected.append("{name='").append(senderNumStr).append(" sender',"); expected.append("{name='").append(senderNumStr).append(" sender',");
if (sender == &o) { if (sender == &o) {
expected.append("value='").append(utfToBase64("<this>")). expected.append("value='").append("<this>").
append("',type='").append(o.metaObject()->className()). append("',type='").append(o.metaObject()->className()).
append("',numchild='0',addr='").append(ptrToBa(&o)).append("'"); append("',numchild='0',addr='").append(ptrToBa(&o)).append("'");
} else if (sender != 0) { } else if (sender != 0) {