From 6886dcb787aa0cd94dc1057b3e5be678f8516e04 Mon Sep 17 00:00:00 2001 From: Aurindam Jana Date: Fri, 25 May 2012 17:47:24 +0200 Subject: [PATCH] DeclarativeToolsClient: Debugger Log Log the debugIds of selected objects. Change-Id: Id146ccfb39639d0e8550817d61101c82cce1fa9c Reviewed-by: Christiaan Janssen --- src/libs/qmldebug/declarativetoolsclient.cpp | 4 ++-- src/libs/qmldebug/qmltoolsclient.cpp | 14 +++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/libs/qmldebug/declarativetoolsclient.cpp b/src/libs/qmldebug/declarativetoolsclient.cpp index 5d8b0ec94f3..19a5367acbc 100644 --- a/src/libs/qmldebug/declarativetoolsclient.cpp +++ b/src/libs/qmldebug/declarativetoolsclient.cpp @@ -529,9 +529,9 @@ void DeclarativeToolsClient::log(LogDirection direction, { QString msg; if (direction == LogSend) - msg += QLatin1String(" sending "); + msg += QLatin1String("sending "); else - msg += QLatin1String(" receiving "); + msg += QLatin1String("receiving "); InspectorProtocol::Message msgType = static_cast(message); diff --git a/src/libs/qmldebug/qmltoolsclient.cpp b/src/libs/qmldebug/qmltoolsclient.cpp index 746569ca7be..2e9d7b5df4c 100644 --- a/src/libs/qmldebug/qmltoolsclient.cpp +++ b/src/libs/qmldebug/qmltoolsclient.cpp @@ -105,12 +105,16 @@ void QmlToolsClient::messageReceived(const QByteArray &message) m_currentDebugIds.clear(); QList debugIds; ds >> debugIds; - log(LogReceive, type + ':' + event, - QString("%1 [list of debug ids]").arg(debugIds.count())); + + QStringList debugIdStrings; foreach (int debugId, debugIds) { - if (debugId != -1) + if (debugId != -1) { m_currentDebugIds << debugId; + debugIdStrings << QString::number(debugId); + } } + log(LogReceive, type + ':' + event, + QString("[%1]").arg(debugIdStrings.join(QLatin1String(",")))); emit currentObjectsChanged(m_currentDebugIds); } } else { @@ -333,9 +337,9 @@ void QmlToolsClient::log(LogDirection direction, { QString msg; if (direction == LogSend) - msg += QLatin1String(" sending "); + msg += QLatin1String("sending "); else - msg += QLatin1String(" receiving "); + msg += QLatin1String("receiving "); msg += message; msg += QLatin1Char(' ');