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

QmlDebug: Unify QPacket and QmlDebugStream and remove unused code

Browse Source 
There is no point in having both as they serve the same purpose. Also,
most of the packet protocol API was never used or tested, and wrapping
each byte to be sent into a QPacket is wasteful and unnecessary.

Change-Id: Ia421eae33b644fe86a53bcd04092a84ea3000f0d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2015-11-16 16:46:51 +01:00
parent 55afbb59e1
commit a3e4a28bee
8 changed files with 115 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,6 +57,7 @@
#include <qmljseditor/qmljseditorconstants.h>
#include <qmljs/qmljsmodelmanagerinterface.h>
#include <qmljs/consolemanagerinterface.h>
#include <qmldebug/qpacketprotocol.h>
#include <texteditor/textdocument.h>
#include <texteditor/texteditor.h>
@@ -1504,11 +1505,10 @@ void QmlEnginePrivate::setBreakpoint(const QString type, const QString target,
// }
// }
if (type == _(EVENT)) {
QByteArray params;
QmlDebugStream rs(&params, QIODevice::WriteOnly);
QPacket rs(connection->currentDataStreamVersion());
rs << target.toUtf8() << enabled;
engine->showMessage(QString(_("%1 %2 %3")).arg(_(BREAKONSIGNAL), target, enabled ? _("enabled") : _("disabled")), LogInput);
runDirectCommand(BREAKONSIGNAL, params);
runDirectCommand(BREAKONSIGNAL, rs.data());
} else {
DebuggerCommand cmd(SETBREAKPOINT);
@@ -1704,14 +1704,13 @@ void QmlEnginePrivate::runDirectCommand(const QByteArray &type, const QByteArray
engine->showMessage(QString::fromLatin1("%1 %2").arg(_(type), _(msg)), LogInput);
QByteArray request;
QmlDebugStream rs(&request, QIODevice::WriteOnly);
QPacket rs(connection->currentDataStreamVersion());
rs << cmd << type << msg;
if (state() == Enabled)
sendMessage(request);
sendMessage(rs.data());
else
sendBuffer.append(request);
sendBuffer.append(rs.data());
}
void QmlEnginePrivate::memorizeRefs(const QVariant &refs)
@@ -1727,7 +1726,7 @@ void QmlEnginePrivate::memorizeRefs(const QVariant &refs)
void QmlEnginePrivate::messageReceived(const QByteArray &data)
{
QmlDebugStream ds(data);
QPacket ds(connection->currentDataStreamVersion(), data);
QByteArray command;
ds >> command;