diff options
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp')
-rw-r--r-- | src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp index fa6dca7aca..d1bba54969 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp @@ -40,6 +40,7 @@ #include <QtCore/private/qabstractanimation_p.h> #include <QtQml/private/qqmldebugconnector_p.h> #include <QtQml/private/qqmlcontext_p.h> +#include <QtQml/private/qpacket_p.h> #include <QtGui/QMouseEvent> #include <QtGui/QTouchEvent> @@ -262,18 +263,16 @@ void AbstractViewInspector::onQmlObjectDestroyed(QObject *object) QPair<int, int> ids = m_hashObjectsTobeDestroyed.take(object); - QByteArray response; - - QQmlDebugStream rs(&response, QIODevice::WriteOnly); + QPacket rs; rs << QByteArray(RESPONSE) << ids.first << true << ids.second; - emit m_debugService->messageToClient(m_debugService->name(), response); + emit m_debugService->messageToClient(m_debugService->name(), rs.data()); } void AbstractViewInspector::handleMessage(const QByteArray &message) { bool success = true; - QQmlDebugStream ds(message); + QPacket ds(message); QByteArray type; ds >> type; @@ -358,16 +357,14 @@ void AbstractViewInspector::handleMessage(const QByteArray &message) } - QByteArray response; - QQmlDebugStream rs(&response, QIODevice::WriteOnly); + QPacket rs; rs << QByteArray(RESPONSE) << requestId << success; - emit m_debugService->messageToClient(m_debugService->name(), response); + emit m_debugService->messageToClient(m_debugService->name(), rs.data()); } void AbstractViewInspector::sendCurrentObjects(const QList<QObject*> &objects) { - QByteArray message; - QQmlDebugStream ds(&message, QIODevice::WriteOnly); + QPacket ds; ds << QByteArray(EVENT) << m_eventId++ << QByteArray(SELECT); @@ -377,7 +374,7 @@ void AbstractViewInspector::sendCurrentObjects(const QList<QObject*> &objects) debugIds << QQmlDebugService::idForObject(object); ds << debugIds; - emit m_debugService->messageToClient(m_debugService->name(), message); + emit m_debugService->messageToClient(m_debugService->name(), ds.data()); } void AbstractViewInspector::sendQmlFileReloaded(bool success) @@ -387,10 +384,10 @@ void AbstractViewInspector::sendQmlFileReloaded(bool success) QByteArray response; - QQmlDebugStream rs(&response, QIODevice::WriteOnly); + QPacket rs; rs << QByteArray(RESPONSE) << m_reloadEventId << success; - emit m_debugService->messageToClient(m_debugService->name(), response); + emit m_debugService->messageToClient(m_debugService->name(), rs.data()); } QString AbstractViewInspector::idStringForObject(QObject *obj) const |