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

Fixes: debugger: display quotes around strings in locals view

Browse Source
This commit is contained in:
hjk
2009-01-28 15:17:55 +01:00
parent 0ac615a101
commit 2dac5e6447
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/gdbmacros/gdbmacros.cpp
View File

@@ -555,7 +555,7 @@ void QDumper::addCommaIfNeeded()
put(','); put(',');
} }
void QDumper::putBase64Encoded(const char *buf, int n) void QDumper::putBase64Encoded(const char *buf, int n, char delim)
{ {
const char alphabet[] = "ABCDEFGH" "IJKLMNOP" "QRSTUVWX" "YZabcdef" const char alphabet[] = "ABCDEFGH" "IJKLMNOP" "QRSTUVWX" "YZabcdef"
"ghijklmn" "opqrstuv" "wxyz0123" "456789+/"; "ghijklmn" "opqrstuv" "wxyz0123" "456789+/";

9
src/plugins/debugger/gdbengine.cpp
View File

@@ -2761,14 +2761,17 @@ static void setWatchDataValue(WatchData &data, const GdbMi &mi,
break; break;
case 1: // base64 encoded 8 bit data case 1: // base64 encoded 8 bit data
ba = QByteArray::fromBase64(mi.data()); ba = QByteArray::fromBase64(mi.data());
ba = '"' + ba + '"';
break; break;
case 2: // base64 encoded 16 bit data case 2: // base64 encoded 16 bit data
ba = QByteArray::fromBase64(mi.data()); ba = QByteArray::fromBase64(mi.data());
ba = QString::fromUtf16((ushort *)ba.data(), ba.size() / 2).toUtf8(); ba = QString::fromUtf16((ushort *)ba.data(), ba.size() / 2).toUtf8();
ba = '"' + ba + '"';
break; break;
case 3: // base64 encoded 32 bit data case 3: // base64 encoded 32 bit data
ba = QByteArray::fromBase64(mi.data()); ba = QByteArray::fromBase64(mi.data());
ba = QString::fromUcs4((uint *)ba.data(), ba.size() / 4).toUtf8(); ba = QString::fromUcs4((uint *)ba.data(), ba.size() / 4).toUtf8();
ba = '"' + ba + '"';
break; break;
} }
data.setValue(ba); data.setValue(ba);
@@ -3550,14 +3553,10 @@ void GdbEngine::handleDumpCustomValue2(const GdbResultRecord &record,
data1.iname = data.iname + "." + data1.name; data1.iname = data.iname + "." + data1.name;
if (!data1.name.isEmpty() && data1.name.at(0).isDigit()) if (!data1.name.isEmpty() && data1.name.at(0).isDigit())
data1.name = '[' + data1.name + ']'; data1.name = '[' + data1.name + ']';
//qDebug() << "NAMEENCODED: " << item.findChild("nameencoded").data()
// << item.findChild("nameencoded").data()[1];
if (item.findChild("nameencoded").data()[0] == '1')
data1.name = QByteArray::fromBase64(data1.name.toUtf8());
QString key = item.findChild("key").data(); QString key = item.findChild("key").data();
if (!key.isEmpty()) { if (!key.isEmpty()) {
if (item.findChild("keyencoded").data()[0] == '1') if (item.findChild("keyencoded").data()[0] == '1')
key = QByteArray::fromBase64(key.toUtf8()); key = '"' + QByteArray::fromBase64(key.toUtf8()) + '"';
data1.name += " (" + key + ")"; data1.name += " (" + key + ")";
} }
setWatchDataType(data1, item.findChild("type")); setWatchDataType(data1, item.findChild("type"));