feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: cdbext: Unify QByteArray output.

Browse Source 
Change-Id: Iea2a5f581da28dc393d918a9b428d2cbe44474df
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
David Schulz
2013-03-13 13:13:17 +01:00
parent 6efb61d7c0
commit 8e40e629e7
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
View File

@@ -1713,12 +1713,12 @@ static inline bool dumpQByteArray(const SymbolGroupValue &v, std::wostream &str,
const char c = *p; const char c = *p;
display.push_back(c >= 0 && isprint(c) ? wchar_t(c) : L'.'); display.push_back(c >= 0 && isprint(c) ? wchar_t(c) : L'.');
} }
str << fullSize << L" bytes \"" << display; str << "\"" << display;
if (fullSize > size) if (fullSize > size)
str << L"..."; str << L"...";
str << L'"'; str << L'"';
} else { } else {
str << L"<empty>"; str << L"\"\"";
} }
if (memoryHandle) if (memoryHandle)
*memoryHandle = new MemoryHandle(reinterpret_cast<unsigned char *>(memory), size); *memoryHandle = new MemoryHandle(reinterpret_cast<unsigned char *>(memory), size);
@@ -2782,7 +2782,8 @@ static inline std::vector<AbstractSymbolGroupNode *>
unsigned size = 0; unsigned size = 0;
ULONG64 address = 0; ULONG64 address = 0;
if (QtInfo::get(ctx).version > 4) { if (QtInfo::get(ctx).version > 4) {
const QtStringAddressData data = readQtStringAddressData(dV, 5); const SymbolGroupValue adV = dV["QArrayData"];
const QtStringAddressData data = readQtStringAddressData(adV, 5);
size = data.size; size = data.size;
address = data.address; address = data.address;
} else { } else {
@@ -2796,7 +2797,7 @@ static inline std::vector<AbstractSymbolGroupNode *>
if (size > 200) if (size > 200)
size = 200; size = 200;
rc.reserve(size); rc.reserve(size);
const std::string charType = "unsigned char"; const std::string charType = "char";
std::string errorMessage; std::string errorMessage;
SymbolGroup *sg = n->symbolGroup(); SymbolGroup *sg = n->symbolGroup();
for (int i = 0; i < (int)size; ++i, ++address) { for (int i = 0; i < (int)size; ++i, ++address) {