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

Debugger: Limit QByteArray and QString display length

Browse Source 
Also add '...' for cut-off std::strings.

Change-Id: Ib6129eb43c723f2a863086a0142312c669b65665
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
hjk
2014-05-16 00:18:17 +02:00
parent b8df93134d
commit 1398480f3a
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -433,14 +433,14 @@ class DumperBase:
data = self.extractBlob(addr, size).toBytes()
return self.hexencode(data)
def encodeByteArray(self, value):
return self.encodeByteArrayHelper(self.extractPointer(value))
def encodeByteArray(self, value, limit = 0):
return self.encodeByteArrayHelper(self.extractPointer(value), limit)
def byteArrayData(self, value):
return self.byteArrayDataHelper(self.extractPointer(value))
def putByteArrayValue(self, value):
return self.putValue(self.encodeByteArray(value), Hex2EncodedLatin1)
return self.putValue(self.encodeByteArray(value, self.stringCutOff), Hex2EncodedLatin1)
def putByteArrayValueByAddress(self, addr):
self.putValue(self.encodeByteArrayHelper(self.extractPointer(addr)),
@@ -450,8 +450,8 @@ class DumperBase:
self.putValue(self.encodeStringHelper(self.extractPointer(addr)),
Hex4EncodedLittleEndian)
def encodeString(self, value):
return self.encodeStringHelper(self.extractPointer(value))
def encodeString(self, value, limit = 0):
return self.encodeStringHelper(self.extractPointer(value), limit)
def stringData(self, value):
return self.byteArrayDataHelper(self.extractPointer(value))
@@ -485,7 +485,7 @@ class DumperBase:
return inner.strip()
def putStringValue(self, value):
return self.putValue(self.encodeString(value), Hex4EncodedLittleEndian)
return self.putValue(self.encodeString(value, self.stringCutOff), Hex4EncodedLittleEndian)
def putAddressItem(self, name, value, type = ""):
with SubItem(self, name):

2
share/qtcreator/debugger/stdtypes.py
View File

@@ -430,6 +430,8 @@ def qdump__std__stringHelper1__QNX(d, value, charSize):
def qdump_stringHelper(d, data, size, charSize):
cutoff = min(size, d.stringCutOff)
mem = d.readMemory(data, cutoff)
if size > d.stringCutOff:
mem += "2e2e2e"
if charSize == 1:
encodingType = Hex2EncodedLatin1
displayType = DisplayLatin1String