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

Trk: Fix source code scanning tool issues.

Browse Source 
showing up in Qt.
This commit is contained in:
Friedemann Kleint
2010-01-28 17:04:05 +01:00
parent 7360976861
commit 4ec51219ed
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/shared/trk/launcher.cpp
View File

@@ -583,17 +583,19 @@ void Launcher::handleSupportMask(const TrkResult &result)
return; return;
const char *data = result.data.data() + 1; const char *data = result.data.data() + 1;
QByteArray str; QString str = QLatin1String("SUPPORTED: ");
for (int i = 0; i < 32; ++i) { for (int i = 0; i < 32; ++i) {
//str.append(" [" + formatByte(data[i]) + "]: "); //str.append(" [" + formatByte(data[i]) + "]: ");
for (int j = 0; j < 8; ++j) for (int j = 0; j < 8; ++j) {
if (data[i] & (1 << j)) if (data[i] & (1 << j)) {
str.append(QByteArray::number(i * 8 + j, 16) + " "); str.append(QString::number(i * 8 + j, 16));
str.append(QLatin1Char(' '));
}
}
} }
logMessage("SUPPORTED: " + str); logMessage(str);
} }
void Launcher::cleanUp() void Launcher::cleanUp()
{ {
// //

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

@@ -133,9 +133,9 @@ QString Session::deviceDescription(unsigned verbose) const
// FIXME: Use the QByteArray based version below? // FIXME: Use the QByteArray based version below?
QString stringFromByte(byte c) static inline QString stringFromByte(byte c)
{ {
return QString("%1 ").arg(c, 2, 16, QChar('0')); return QString::fromLatin1("%1").arg(c, 2, 16, QChar('0'));
} }
QString stringFromArray(const QByteArray &ba, int maxLen) QString stringFromArray(const QByteArray &ba, int maxLen)
@@ -188,9 +188,12 @@ void TrkResult::clear()
QString TrkResult::toString() const QString TrkResult::toString() const
{ {
QString res = stringFromByte(code) + "[" + stringFromByte(token); QString res = stringFromByte(code);
res.chop(1); res += QLatin1String(" [");
return res + "] " + stringFromArray(data); res += stringFromByte(token);
res += QLatin1Char(']');
res += stringFromArray(data);
return res;
} }
QByteArray frameMessage(byte command, byte token, const QByteArray &data, bool serialFrame) QByteArray frameMessage(byte command, byte token, const QByteArray &data, bool serialFrame)