diff --git a/src/libs/qtcreatorcdbext/gdbmihelpers.cpp b/src/libs/qtcreatorcdbext/gdbmihelpers.cpp index 0fc845869e5..17ac20790bd 100644 --- a/src/libs/qtcreatorcdbext/gdbmihelpers.cpp +++ b/src/libs/qtcreatorcdbext/gdbmihelpers.cpp @@ -580,12 +580,12 @@ std::string gdbmiRegisters(CIDebugRegisters *regs, return str.str(); } -std::string memoryToBase64(CIDebugDataSpaces *ds, ULONG64 address, ULONG length, +std::string memoryToHex(CIDebugDataSpaces *ds, ULONG64 address, ULONG length, std::string *errorMessage /* = 0 */) { if (const unsigned char *buffer = SymbolGroupValue::readMemory(ds, address, length, errorMessage)) { std::ostringstream str; - base64Encode(str, buffer, length); + hexEncode(str, buffer, length); delete [] buffer; return str.str(); } diff --git a/src/libs/qtcreatorcdbext/gdbmihelpers.h b/src/libs/qtcreatorcdbext/gdbmihelpers.h index c4af590bfe9..7b313bbf59b 100644 --- a/src/libs/qtcreatorcdbext/gdbmihelpers.h +++ b/src/libs/qtcreatorcdbext/gdbmihelpers.h @@ -162,8 +162,8 @@ std::string gdbmiRegisters(CIDebugRegisters *regs, unsigned flags, std::string *errorMessage); -std::string memoryToBase64(CIDebugDataSpaces *ds, ULONG64 address, ULONG length, - std::string *errorMessage = 0); +std::string memoryToHex(CIDebugDataSpaces *ds, ULONG64 address, ULONG length, + std::string *errorMessage = 0); std::wstring memoryToHexW(CIDebugDataSpaces *ds, ULONG64 address, ULONG length, std::string *errorMessage = 0); // Stack helpers diff --git a/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp b/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp index 0f0aea6e07d..b5ef6f5cbe6 100644 --- a/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp +++ b/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp @@ -959,7 +959,7 @@ extern "C" HRESULT CALLBACK help(CIDebugClient *, PCSTR) } // Extension command 'memory': -// Display memory as base64 +// Display memory as hex extern "C" HRESULT CALLBACK memory(CIDebugClient *Client, PCSTR argsIn) { @@ -975,7 +975,7 @@ extern "C" HRESULT CALLBACK memory(CIDebugClient *Client, PCSTR argsIn) if (tokens.size() == 2 && integerFromString(tokens.front(), &address) && integerFromString(tokens.at(1), &length)) { - memory = memoryToBase64(exc.dataSpaces(), address, length, &errorMessage); + memory = memoryToHex(exc.dataSpaces(), address, length, &errorMessage); } else { errorMessage = singleLineUsage(commandDescriptions[CmdMemory]); } diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index 327bff8d213..736cb963ff0 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -1541,7 +1541,7 @@ void CdbEngine::postFetchMemory(const MemoryViewCookie &cookie) cmd.args = QLatin1String(args); cmd.callback = [this, cookie](const DebuggerResponse &response) { if (response.resultClass == ResultDone && cookie.agent) { - const QByteArray data = QByteArray::fromBase64(response.data.data()); + const QByteArray data = QByteArray::fromHex(response.data.data()); if (unsigned(data.size()) == cookie.length) cookie.agent->addLazyData(cookie.editorToken, cookie.address, data); } else {