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

debugger: make stringFromByte local

Browse Source
This commit is contained in:
hjk
2009-10-06 10:17:36 +02:00
parent 751f2f6993
commit 2eed41b6df
2 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/shared/trk/trkutils.cpp
View File

@@ -36,6 +36,32 @@
namespace trk { 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 hexNumber(uint n, int digits)
{ {
QByteArray ba = QByteArray::number(n, 16); QByteArray ba = QByteArray::number(n, 16);
@@ -235,32 +261,6 @@ QByteArray encode7d(const QByteArray &ba)
return res; 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) void appendByte(QByteArray *ba, byte b)
{ {
ba->append(b); ba->append(b);

2
src/shared/trk/trkutils.h
View File

@@ -78,8 +78,6 @@ uint extractInt(const char *data);
QString quoteUnprintableLatin1(const QByteArray &ba); QString quoteUnprintableLatin1(const QByteArray &ba);
// produces "xx "
QString stringFromByte(byte c);
// produces "xx xx xx " // produces "xx xx xx "
QString stringFromArray(const QByteArray &ba, int maxLen = - 1); QString stringFromArray(const QByteArray &ba, int maxLen = - 1);