diff options
author | hjk <[email protected]> | 2009-10-06 10:17:36 +0200 |
---|---|---|
committer | hjk <[email protected]> | 2009-10-06 10:17:52 +0200 |
commit | 2eed41b6dfb49e7d24d92503203370b7e9053f19 (patch) | |
tree | a7dea00224ab62185899cd87cc456c689c43a4bd /src/shared/trk/trkutils.cpp | |
parent | 751f2f6993b9d00597599b2fce7f01a3fa82d5df (diff) |
debugger: make stringFromByte local
Diffstat (limited to 'src/shared/trk/trkutils.cpp')
-rw-r--r-- | src/shared/trk/trkutils.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/shared/trk/trkutils.cpp b/src/shared/trk/trkutils.cpp index a45084bb8cd..7d31f586ff4 100644 --- a/src/shared/trk/trkutils.cpp +++ b/src/shared/trk/trkutils.cpp @@ -36,6 +36,32 @@ namespace trk { +// FIXME: Use the QByteArray based version below? +QString stringFromByte(byte c) +{ + return QString("%1 ").arg(c, 2, 16, QChar('0')); +} + +QString stringFromArray(const QByteArray &ba, int maxLen) +{ + QString str; + QString ascii; + const int size = maxLen == -1 ? ba.size() : qMin(ba.size(), maxLen); + for (int i = 0; i < size; ++i) { + //if (i == 5 || i == ba.size() - 2) + // str += " "; + int c = byte(ba.at(i)); + str += QString("%1 ").arg(c, 2, 16, QChar('0')); + if (i >= 8 && i < ba.size() - 2) + ascii += QChar(c).isPrint() ? QChar(c) : QChar('.'); + } + if (size != ba.size()) { + str += "..."; + ascii += "..."; + } + return str + " " + ascii; +} + QByteArray hexNumber(uint n, int digits) { QByteArray ba = QByteArray::number(n, 16); @@ -235,32 +261,6 @@ QByteArray encode7d(const QByteArray &ba) return res; } -// FIXME: Use the QByteArray based version below? -QString stringFromByte(byte c) -{ - return QString("%1 ").arg(c, 2, 16, QChar('0')); -} - -QString stringFromArray(const QByteArray &ba, int maxLen) -{ - QString str; - QString ascii; - const int size = maxLen == -1 ? ba.size() : qMin(ba.size(), maxLen); - for (int i = 0; i < size; ++i) { - //if (i == 5 || i == ba.size() - 2) - // str += " "; - int c = byte(ba.at(i)); - str += QString("%1 ").arg(c, 2, 16, QChar('0')); - if (i >= 8 && i < ba.size() - 2) - ascii += QChar(c).isPrint() ? QChar(c) : QChar('.'); - } - if (size != ba.size()) { - str += "..."; - ascii += "..."; - } - return str + " " + ascii; -} - void appendByte(QByteArray *ba, byte b) { ba->append(b); |