Commit fa2ae04b authored by hjk's avatar hjk
Browse files

debugger: fix QMultiMap dumper

Task-number: QTCREATORBUG-3122
parent df12df8c
...@@ -579,7 +579,7 @@ def qdump__QMapNode(d, item): ...@@ -579,7 +579,7 @@ def qdump__QMapNode(d, item):
d.putItem(Item(item.value["value"], item.iname, "value")) d.putItem(Item(item.value["value"], item.iname, "value"))
def qdump__QMap(d, item): def qdumpHelper__QMap(d, item, forceLong):
d_ptr = item.value["d"].dereference() d_ptr = item.value["d"].dereference()
e_ptr = item.value["e"].dereference() e_ptr = item.value["e"].dereference()
n = d_ptr["size"] n = d_ptr["size"]
...@@ -620,15 +620,21 @@ def qdump__QMap(d, item): ...@@ -620,15 +620,21 @@ def qdump__QMap(d, item):
#if isSimpleType(item.value.type): # or isStringType(d, item.value.type): #if isSimpleType(item.value.type): # or isStringType(d, item.value.type):
if isSimpleKey and isSimpleValue: if isSimpleKey and isSimpleValue:
#d.putType(valueType) #d.putType(valueType)
d.putName(key) if forceLong:
d.putName("[%s] %s" % (i, key))
else:
d.putName(key)
d.putItem(Item(value, item.iname, i)) d.putItem(Item(value, item.iname, i))
else: else:
d.putItem(Item(node, item.iname, i)) d.putItem(Item(node, item.iname, i))
it = it.dereference()["forward"].dereference() it = it.dereference()["forward"].dereference()
def qdump__MultiMap(d, item): def qdump__QMap(d, item):
qdump__Map(d, item) qdumpHelper__QMap(d, item, False)
def qdump__QMultiMap(d, item):
qdumpHelper__QMap(d, item, True)
def extractCString(table, offset): def extractCString(table, offset):
......
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