From ffbe6148e8fb0a63b74e0226ab09bb31cf58da23 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 16 Dec 2016 14:10:18 +0100 Subject: [PATCH] Debugger: Inline putStringValueByAddress into its only user Change-Id: I858f113507ad5712962dc6568e28230ff6dc2916 Reviewed-by: Christian Stenger --- share/qtcreator/debugger/dumper.py | 4 ---- share/qtcreator/debugger/qttypes.py | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py index cfb19f44f39..5c802eea335 100644 --- a/share/qtcreator/debugger/dumper.py +++ b/share/qtcreator/debugger/dumper.py @@ -747,10 +747,6 @@ class DumperBase: inner = inner[p+3:] return inner - def putStringValueByAddress(self, addr): - elided, data = self.encodeStringHelper(addr, self.displayStringLimit) - self.putValue(data, 'utf16', elided=elided) - def putStringValue(self, value): addr = self.extractPointer(value) elided, data = self.encodeStringHelper(addr, self.displayStringLimit) diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py index 8e32a19c811..4e4307f1cfc 100644 --- a/share/qtcreator/debugger/qttypes.py +++ b/share/qtcreator/debugger/qttypes.py @@ -2650,7 +2650,8 @@ def qdump__QJsonValue(d, value): return if t == 3: d.putType('QJsonValue (String)') - d.putStringValueByAddress(data) + elided, base = d.encodeStringHelper(data, d.displayStringLimit) + d.putValue(base, 'utf16', elided=elided) d.putNumChild(0) return if t == 4: