From 726b907cc356995b7a9c28ee8dc8b2f2314e9103 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 7 Jun 2016 17:04:53 +0200 Subject: Debugger: Remove debuggerstringutils.h With QT_RESTRICTED_CAST_FROM_ASCII making GdbMi etc operate on QString is feasible again. Take this as opportunity to move debugger encoding handling closer to a 'conversion on input and output if needed, storage in QString only' scheme. Change-Id: I2f10c9fa8a6c62c44f4e6682efe3769e9fba30f7 Reviewed-by: Christian Stenger --- share/qtcreator/debugger/creatortypes.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'share') diff --git a/share/qtcreator/debugger/creatortypes.py b/share/qtcreator/debugger/creatortypes.py index 85abfd23d6..3dfaff03c8 100644 --- a/share/qtcreator/debugger/creatortypes.py +++ b/share/qtcreator/debugger/creatortypes.py @@ -97,9 +97,9 @@ def qdump__Core__Id(d, value): d.putPlainChildren(value) def qdump__Debugger__Internal__GdbMi(d, value): - str = d.encodeByteArray(value["m_name"]) + "3a20" \ - + d.encodeByteArray(value["m_data"]) - d.putValue(str, "latin1") + val = d.encodeString(value["m_name"]) + "3a002000" \ + + d.encodeString(value["m_data"]) + d.putValue(val, "utf16") d.putPlainChildren(value) def qdump__Debugger__Internal__DisassemblerLine(d, value): @@ -107,11 +107,11 @@ def qdump__Debugger__Internal__DisassemblerLine(d, value): d.putPlainChildren(value) def qdump__Debugger__Internal__WatchData(d, value): - d.putByteArrayValue(value["iname"]) + d.putStringValue(value["iname"]) d.putPlainChildren(value) def qdump__Debugger__Internal__WatchItem(d, value): - d.putByteArrayValue(value["iname"]) + d.putStringValue(value["iname"]) d.putPlainChildren(value) def qdump__Debugger__Internal__BreakpointModelId(d, value): -- cgit v1.2.1