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

Debugger: Remove virtual layer of sendMessage() calls in QmlEngine

Browse Source 
Change-Id: I7a5f335e8401d01bb3085b9512a878b67109feae
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
This commit is contained in:
hjk
2015-09-17 12:52:50 +02:00
parent 76ffbbd43c
commit eb4d98e178
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -139,7 +139,6 @@ public:
connection(connection_) connection(connection_)
{} {}
void sendMessage(const QByteArray &msg);
void messageReceived(const QByteArray &data); void messageReceived(const QByteArray &data);
void stateChanged(State state); void stateChanged(State state);
@@ -1754,7 +1753,11 @@ void QmlEnginePrivate::runDirectCommand(const QByteArray &type, const QByteArray
QByteArray request; QByteArray request;
QmlDebugStream rs(&request, QIODevice::WriteOnly); QmlDebugStream rs(&request, QIODevice::WriteOnly);
rs << cmd << type << msg; rs << cmd << type << msg;
sendMessage(request);
if (state() == Enabled)
sendMessage(request);
else
sendBuffer.append(request);
} }
void QmlEnginePrivate::memorizeRefs(const QVariant &refs) void QmlEnginePrivate::memorizeRefs(const QVariant &refs)
@@ -2558,19 +2561,11 @@ void QmlEnginePrivate::handleVersion(const QVariantMap &response)
value(_("V8Version")).toString()), LogOutput); value(_("V8Version")).toString()), LogOutput);
} }
void QmlEnginePrivate::sendMessage(const QByteArray &msg)
{
if (state() == Enabled)
QmlDebugClient::sendMessage(msg);
else
sendBuffer.append(msg);
}
void QmlEnginePrivate::flushSendBuffer() void QmlEnginePrivate::flushSendBuffer()
{ {
QTC_ASSERT(state() == Enabled, return); QTC_ASSERT(state() == Enabled, return);
foreach (const QByteArray &msg, sendBuffer) foreach (const QByteArray &msg, sendBuffer)
QmlDebugClient::sendMessage(msg); sendMessage(msg);
sendBuffer.clear(); sendBuffer.clear();
} }