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

debugger: provide support for .toHex() encoded string data.

Browse Source 
more verbose than base64 but also less work on the dumper side
This commit is contained in:
hjk
2009-10-12 09:30:28 +02:00
parent f7263f2333
commit 982347dda5
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/debugger/watchutils.cpp
View File

@@ -409,7 +409,8 @@ QString decodeData(const QByteArray &ba, int encoding)
const QChar doubleQuote(QLatin1Char('"')); const QChar doubleQuote(QLatin1Char('"'));
const QByteArray decodedBa = QByteArray::fromBase64(ba); const QByteArray decodedBa = QByteArray::fromBase64(ba);
QString rc = doubleQuote; QString rc = doubleQuote;
rc += QString::fromUtf16(reinterpret_cast<const ushort *>(decodedBa.data()), decodedBa.size() / 2); rc += QString::fromUtf16(reinterpret_cast<const ushort *>
(decodedBa.data()), decodedBa.size() / 2);
rc += doubleQuote; rc += doubleQuote;
return rc; return rc;
} }
@@ -417,17 +418,25 @@ QString decodeData(const QByteArray &ba, int encoding)
const QByteArray decodedBa = QByteArray::fromBase64(ba); const QByteArray decodedBa = QByteArray::fromBase64(ba);
const QChar doubleQuote(QLatin1Char('"')); const QChar doubleQuote(QLatin1Char('"'));
QString rc = doubleQuote; QString rc = doubleQuote;
rc += QString::fromUcs4(reinterpret_cast<const uint *>(decodedBa.data()), decodedBa.size() / 4); rc += QString::fromUcs4(reinterpret_cast<const uint *>
(decodedBa.data()), decodedBa.size() / 4);
rc += doubleQuote; rc += doubleQuote;
return rc; return rc;
} }
case 4: { // base64 encoded 16 bit data, without quotes (see 2) case 4: { // base64 encoded 16 bit data, without quotes (see 2)
const QByteArray decodedBa = QByteArray::fromBase64(ba); const QByteArray decodedBa = QByteArray::fromBase64(ba);
return QString::fromUtf16(reinterpret_cast<const ushort *>(decodedBa.data()), decodedBa.size() / 2); return QString::fromUtf16(reinterpret_cast<const ushort *>
(decodedBa.data()), decodedBa.size() / 2);
} }
case 5: { // base64 encoded 8 bit data, without quotes (see 1) case 5: { // base64 encoded 8 bit data, without quotes (see 1)
return quoteUnprintableLatin1(QByteArray::fromBase64(ba)); return quoteUnprintableLatin1(QByteArray::fromBase64(ba));
} }
case 7: { // %04x endoded 16 bit data
const QByteArray decodedBa = QByteArray::fromHex(ba);
qDebug() << quoteUnprintableLatin1(decodedBa) << "\n\n";
return QString::fromUtf16(reinterpret_cast<const ushort *>
(decodedBa.data()), decodedBa.size() / 2);
}
} }
return QCoreApplication::translate("Debugger", "<Encoding error>"); return QCoreApplication::translate("Debugger", "<Encoding error>");
} }