Commit 658a2276 authored by hjk's avatar hjk
Browse files

debugger: remove special case for char * python dumpers.

This is handled by the generic pointer case nowadays and was (now) wrong
as it was impossible to see the 'bald pointer' version of it.
parent a25fd01a
...@@ -1314,16 +1314,6 @@ class Dumper: ...@@ -1314,16 +1314,6 @@ class Dumper:
self.putNumChild(0) self.putNumChild(0)
isHandled = True isHandled = True
#warn("TARGET: %s " % target)
if (not isHandled) and (target == "char"
or target == "signed char" or target == "unsigned char"):
# Display values up to given length directly
#warn("CHAR AUTODEREF: %s" % value.address)
self.putType(item.value.type)
self.putValue(encodeCharArray(value, 100), Hex2EncodedLatin1)
self.putNumChild(0)
isHandled = True
#warn("AUTODEREF: %s" % self.autoDerefPointers) #warn("AUTODEREF: %s" % self.autoDerefPointers)
#warn("IS HANDLED: %s" % isHandled) #warn("IS HANDLED: %s" % isHandled)
#warn("RES: %s" % (self.autoDerefPointers and not isHandled)) #warn("RES: %s" % (self.autoDerefPointers and not isHandled))
......
...@@ -420,11 +420,11 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev) ...@@ -420,11 +420,11 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
} else { } else {
for (int i = 0; i != typeFormatActions.size(); ++i) { for (int i = 0; i != typeFormatActions.size(); ++i) {
if (act == typeFormatActions.at(i)) if (act == typeFormatActions.at(i))
setModelData(LocalsTypeFormatRole, 1, mi1); setModelData(LocalsTypeFormatRole, i, mi1);
} }
for (int i = 0; i != individualFormatActions.size(); ++i) { for (int i = 0; i != individualFormatActions.size(); ++i) {
if (act == individualFormatActions.at(i)) if (act == individualFormatActions.at(i))
setModelData(LocalsIndividualFormatRole, 1, mi1); setModelData(LocalsIndividualFormatRole, i, mi1);
} }
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment