From 805b0a9cc165ef6cd596bd8f5e59f650cd0eebb2 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Mon, 1 Feb 2010 11:45:44 +0100
Subject: [PATCH] debugger: trk log output cosmetic
---
src/shared/trk/trkdevice.cpp | 11 ++++++++---
src/shared/trk/trkutils.cpp | 1 +
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/shared/trk/trkdevice.cpp b/src/shared/trk/trkdevice.cpp
index 8290a560979..1d23c77454f 100644
--- a/src/shared/trk/trkdevice.cpp
+++ b/src/shared/trk/trkdevice.cpp
@@ -504,7 +504,7 @@ static inline bool overlappedSyncWrite(HANDLE file,
bool WriterThread::write(const QByteArray &data, QString *errorMessage)
{
if (verboseTrk)
- qDebug() << "Write raw data: " << data.toHex();
+ qDebug() << "Write raw data: " << stringFromArray(data).toLatin1();
QMutexLocker locker(&m_context->mutex);
#ifdef Q_OS_WIN
DWORD charsWritten;
@@ -1049,8 +1049,13 @@ void TrkDevice::sendTrkMessage(byte code, TrkCallback callback,
const QByteArray &data, const QVariant &cookie)
{
if (!d->writerThread.isNull()) {
- if (d->verbose > 1)
- qDebug() << "Sending " << code << data.toHex();
+ if (d->verbose > 1) {
+ QByteArray msg = "Sending: ";
+ msg += QByteArray::number(code, 16);
+ msg += ": ";
+ msg += stringFromArray(data).toLatin1();
+ qDebug("%s", msg.data());
+ }
d->writerThread->queueTrkMessage(code, callback, data, cookie);
}
}
diff --git a/src/shared/trk/trkutils.cpp b/src/shared/trk/trkutils.cpp
index 024dea4c07c..ce5d5867000 100644
--- a/src/shared/trk/trkutils.cpp
+++ b/src/shared/trk/trkutils.cpp
@@ -192,6 +192,7 @@ QString TrkResult::toString() const
res += QLatin1String(" [");
res += stringFromByte(token);
res += QLatin1Char(']');
+ res += QLatin1Char(' ');
res += stringFromArray(data);
return res;
}
--
GitLab