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

Debugger: Updated QObjectSlot dumper for Qt 4.6.

Browse Source 
The format of QObjectPrivate's senders list changed in version 4.6.
This change is now taken into account by the QObjectSlot and
QObjectSlotList dumpers.

Reviewed-by: hjk
This commit is contained in:
ck
2009-07-24 10:50:18 +02:00
parent eeb737c512
commit fb2f3860fa
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,17 +203,14 @@ const char *stdWideStringTypeUShortC = "std::basic_string<unsigned short,std::ch
uint connectionType : 3; // 0 == auto, 1 == direct, 2 == queued, 4 == blocking
QBasicAtomicPointer<int> argumentTypes;
//senders linked list
//Connection *next;
//Connection **prev;
Connection *next;
Connection **prev;
};
typedef QList<Connection *> ConnectionList;
typedef ConnectionList SenderList;
typedef Connection *SenderList;
const Connection &connectionAt(const ConnectionList &l, int i) { return *l.at(i); }
const QObject *senderAt(const SenderList &l, int i) { return l.at(i)->sender; }
// FIXME: 'method' is wrong
int signalAt(const SenderList &l, int i) { return l.at(i)->method; }
#endif
class ObjectPrivate : public QObjectData
@@ -2470,9 +2467,17 @@ static void qDumpQObjectSlot(QDumper &d)
int numchild = 0;
const QObject *ob = reinterpret_cast<const QObject *>(d.data);
const ObjectPrivate *p = reinterpret_cast<const ObjectPrivate *>(dfunc(ob));
#if QT_VERSION >= 0x040600
int s = 0;
for (SenderList senderList = p->senders; senderList != 0;
senderList = senderList->next, ++s) {
const QObject *sender = senderList->sender;
int signal = senderList->method; // FIXME: 'method' is wrong.
#else
for (int s = 0; s != p->senders.size(); ++s) {
const QObject *sender = senderAt(p->senders, s);
int signal = signalAt(p->senders, s);
#endif
const ConnectionList &connList = qConnectionList(sender, signal);
for (int i = 0; i != connList.size(); ++i) {
const Connection &conn = connectionAt(connList, i);
@@ -2538,9 +2543,17 @@ static void qDumpQObjectSlotList(QDumper &d)
// count senders. expensive...
int numchild = 0;
#if QT_VERSION >= 0x040600
int s = 0;
for (SenderList senderList = p->senders; senderList != 0;
senderList = senderList->next, ++s) {
const QObject *sender = senderList->sender;
int signal = senderList->method; // FIXME: 'method' is wrong.
#else
for (int s = 0; s != p->senders.size(); ++s) {
const QObject *sender = senderAt(p->senders, s);
int signal = signalAt(p->senders, s);
#endif
const ConnectionList &connList = qConnectionList(sender, signal);
for (int c = 0; c != connList.size(); ++c) {
const Connection &conn = connectionAt(connList, c);