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

Debugger: Use proper item count for signals and methods

Browse Source 
Change-Id: I2dd795b3731b30e2af6f4d0e5da71dbde8996649
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2014-04-10 12:10:15 +02:00
parent a0e3c97bf4
commit c7701e8164
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1038,12 +1038,21 @@ class DumperBase:
return items return items
def staticQObjectPropertyCount(self, metaobject):
return self.extractInt(self.extractPointer(metaobject["d"]["data"]) + 24)
def staticQObjectPropertyNames(self, metaobject): def staticQObjectPropertyNames(self, metaobject):
return self.staticQObjectMetaData(metaobject, 24, 28, 3) return self.staticQObjectMetaData(metaobject, 24, 28, 3)
def staticQObjectMethodCount(self, metaobject):
return self.extractInt(self.extractPointer(metaobject["d"]["data"]) + 16)
def staticQObjectMethodNames(self, metaobject): def staticQObjectMethodNames(self, metaobject):
return self.staticQObjectMetaData(metaobject, 16, 20, 5) return self.staticQObjectMetaData(metaobject, 16, 20, 5)
def staticQObjectSignalCount(self, metaobject):
return self.extractInt(self.extractPointer(metaobject["d"]["data"]) + 52)
def staticQObjectSignalNames(self, metaobject): def staticQObjectSignalNames(self, metaobject):
return self.staticQObjectMetaData(metaobject, 52, -14, 5) return self.staticQObjectMetaData(metaobject, 52, -14, 5)
@@ -1125,20 +1134,21 @@ class DumperBase:
self.putNumChild(1) self.putNumChild(1)
with SubItem(self, "[methods]"): with SubItem(self, "[methods]"):
methodCount = 0 methodCount = self.staticQObjectMethodCount(smo)
self.putItemCount(methodCount)
self.putNumChild(methodCount)
if self.isExpanded(): if self.isExpanded():
methodNames = self.staticQObjectMethodNames(smo) methodNames = self.staticQObjectMethodNames(smo)
methodCount = len(methodNames)
with Children(self): with Children(self):
for i in range(methodCount): for i in range(methodCount):
k = methodNames[i] k = methodNames[i]
with SubItem(self, k): with SubItem(self, k):
self.putEmptyValue() self.putEmptyValue()
self.putValue('<%s items>' % methodCount if methodCount else ' ')
self.putNumChild(1)
with SubItem(self, "[signals]"): with SubItem(self, "[signals]"):
signalCount = 0 signalCount = self.staticQObjectSignalCount(smo)
self.putItemCount(signalCount)
self.putNumChild(signalCount)
if self.isExpanded(): if self.isExpanded():
signalNames = self.staticQObjectSignalNames(smo) signalNames = self.staticQObjectSignalNames(smo)
signalCount = len(signalNames) signalCount = len(signalNames)
@@ -1147,8 +1157,6 @@ class DumperBase:
k = signalNames[i] k = signalNames[i]
with SubItem(self, k): with SubItem(self, k):
self.putEmptyValue() self.putEmptyValue()
self.putValue('<%s items>' % signalCount if signalCount else ' ')
self.putNumChild(1)
with SubItem(self, "[connections]"): with SubItem(self, "[connections]"):
self.putNoType() self.putNoType()