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

Dumper: Remove some fallback code

Browse Source 
..and unused or unknown variables.

Change-Id: I13d1d03fa09ef3952fe2cb3f4b257fb2882709f2
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2020-12-10 11:02:47 +01:00
parent ad2699773d
commit 9c8768e752
1 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
share/qtcreator/debugger/dumper.py
View File

@@ -1841,7 +1841,6 @@ class DumperBase():
# handle is what's store in QMetaMethod etc, pass -1 for QObject/QMetaObject # handle is what's store in QMetaMethod etc, pass -1 for QObject/QMetaObject
# itself metaObjectPtr needs to point to a valid QMetaObject. # itself metaObjectPtr needs to point to a valid QMetaObject.
def putQObjectGutsHelper(self, qobject, qobjectPtr, handle, metaObjectPtr, origType): def putQObjectGutsHelper(self, qobject, qobjectPtr, handle, metaObjectPtr, origType):
intSize = 4
ptrSize = self.ptrSize() ptrSize = self.ptrSize()
def putt(name, value, typeName=' '): def putt(name, value, typeName=' '):
@@ -1886,13 +1885,13 @@ class DumperBase():
dynMetaObjectPtr, # Up to here QObjectData. dynMetaObjectPtr, # Up to here QObjectData.
extraData, threadDataPtr, connectionListsPtr, extraData, threadDataPtr, connectionListsPtr,
sendersPtr, currentSenderPtr) \ sendersPtr, currentSenderPtr) \
= self.split('pp{@QObject*}{@QList<@QObject*>}IIp' + 'ppppp', dd) = self.split('pp{@QObject*}{@QList<@QObject *>}IIp' + 'ppppp', dd)
else: else:
(dvtablePtr, qptr, parent, children, flags, postedEvents, (dvtablePtr, qptr, parent, children, flags, postedEvents,
dynMetaObjectPtr, # Up to here QObjectData dynMetaObjectPtr, # Up to here QObjectData
objectName, extraData, threadDataPtr, connectionListsPtr, objectName, extraData, threadDataPtr, connectionListsPtr,
sendersPtr, currentSenderPtr) \ sendersPtr, currentSenderPtr) \
= self.split('pp{@QObject*}{@QList<@QObject*>}IIp' + 'pppppp', dd) = self.split('pp{@QObject*}{@QList<@QObject *>}IIp' + 'pppppp', dd)
with SubItem(self, '[parent]'): with SubItem(self, '[parent]'):
if not self.isCli: if not self.isCli:
@@ -1903,30 +1902,8 @@ class DumperBase():
if not self.isCli: if not self.isCli:
self.putSortGroup(8) self.putSortGroup(8)
if self.qtVersion() >= 0x60000: dvtablePtr, qptr, parentPtr, children = self.split('ppp{QList<QObject *>}', dd)
dvtablePtr, qptr, parentPtr, children \ self.putItem(children)
= self.split('ppp{QList<QObject*>}', dd)
self.putItem(children)
else:
base = self.extractPointer(dd + 3 * ptrSize) # It's a QList<QObject *>
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))
if isQMetaObject: if isQMetaObject:
with SubItem(self, '[strings]'): with SubItem(self, '[strings]'):