From 9c8768e752de83b3c0b8655c90e180b46fd4acdc Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 10 Dec 2020 11:02:47 +0100 Subject: [PATCH] Dumper: Remove some fallback code ..and unused or unknown variables. Change-Id: I13d1d03fa09ef3952fe2cb3f4b257fb2882709f2 Reviewed-by: hjk --- share/qtcreator/debugger/dumper.py | 31 ++++-------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py index da599fd7155..07ce1d0ebfe 100644 --- a/share/qtcreator/debugger/dumper.py +++ b/share/qtcreator/debugger/dumper.py @@ -1841,7 +1841,6 @@ class DumperBase(): # handle is what's store in QMetaMethod etc, pass -1 for QObject/QMetaObject # itself metaObjectPtr needs to point to a valid QMetaObject. def putQObjectGutsHelper(self, qobject, qobjectPtr, handle, metaObjectPtr, origType): - intSize = 4 ptrSize = self.ptrSize() def putt(name, value, typeName=' '): @@ -1886,13 +1885,13 @@ class DumperBase(): dynMetaObjectPtr, # Up to here QObjectData. extraData, threadDataPtr, connectionListsPtr, sendersPtr, currentSenderPtr) \ - = self.split('pp{@QObject*}{@QList<@QObject*>}IIp' + 'ppppp', dd) + = self.split('pp{@QObject*}{@QList<@QObject *>}IIp' + 'ppppp', dd) else: (dvtablePtr, qptr, parent, children, flags, postedEvents, dynMetaObjectPtr, # Up to here QObjectData objectName, extraData, threadDataPtr, connectionListsPtr, sendersPtr, currentSenderPtr) \ - = self.split('pp{@QObject*}{@QList<@QObject*>}IIp' + 'pppppp', dd) + = self.split('pp{@QObject*}{@QList<@QObject *>}IIp' + 'pppppp', dd) with SubItem(self, '[parent]'): if not self.isCli: @@ -1903,30 +1902,8 @@ class DumperBase(): if not self.isCli: self.putSortGroup(8) - if self.qtVersion() >= 0x60000: - dvtablePtr, qptr, parentPtr, children \ - = self.split('ppp{QList}', dd) - self.putItem(children) - else: - base = self.extractPointer(dd + 3 * ptrSize) # It's a QList - begin = self.extractInt(base + 8) - end = self.extractInt(base + 12) - array = base + 16 - if self.qtVersion() < 0x50000: - array += ptrSize - self.check(begin >= 0 and end >= 0 and end <= 1000 * 1000 * 1000) - size = end - begin - self.check(size >= 0) - self.putItemCount(size) - if size > 0: - self.putExpandable() - if self.isExpanded(): - addrBase = array + begin * ptrSize - with Children(self, size): - for i in self.childRange(): - with SubItem(self, i): - childPtr = self.extractPointer(addrBase + i * ptrSize) - self.putItem(self.createValue(childPtr, qobjectType)) + dvtablePtr, qptr, parentPtr, children = self.split('ppp{QList}', dd) + self.putItem(children) if isQMetaObject: with SubItem(self, '[strings]'):