From eb4d98e178b6e264862619e7f9fdab7f44f21a3c Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 17 Sep 2015 12:52:50 +0200 Subject: [PATCH] Debugger: Remove virtual layer of sendMessage() calls in QmlEngine Change-Id: I7a5f335e8401d01bb3085b9512a878b67109feae Reviewed-by: Ulf Hermann --- src/plugins/debugger/qml/qmlengine.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 59e0e8ed683..b0b2179c8d4 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -139,7 +139,6 @@ public: connection(connection_) {} - void sendMessage(const QByteArray &msg); void messageReceived(const QByteArray &data); void stateChanged(State state); @@ -1754,7 +1753,11 @@ void QmlEnginePrivate::runDirectCommand(const QByteArray &type, const QByteArray QByteArray request; QmlDebugStream rs(&request, QIODevice::WriteOnly); rs << cmd << type << msg; - sendMessage(request); + + if (state() == Enabled) + sendMessage(request); + else + sendBuffer.append(request); } void QmlEnginePrivate::memorizeRefs(const QVariant &refs) @@ -2558,19 +2561,11 @@ void QmlEnginePrivate::handleVersion(const QVariantMap &response) value(_("V8Version")).toString()), LogOutput); } -void QmlEnginePrivate::sendMessage(const QByteArray &msg) -{ - if (state() == Enabled) - QmlDebugClient::sendMessage(msg); - else - sendBuffer.append(msg); -} - void QmlEnginePrivate::flushSendBuffer() { QTC_ASSERT(state() == Enabled, return); foreach (const QByteArray &msg, sendBuffer) - QmlDebugClient::sendMessage(msg); + sendMessage(msg); sendBuffer.clear(); }