QmlDebug: Restructure QPacket and QPacketProtocol

We cannot use the same data stream version for the client and server
versions of QPacket and QPacketProtocol should not deal with QPackets
but with simple byte arrays because the underlying QDataStream is hard
to copy.

The new QQmlDebugPacket picks its data stream version from
QQmlDebugConnector now, which adjusts it when connecting. As there can
only ever be one QQmlDebugConnector, we can keep the version static.

The clients need to query the connection for the correct version. We
may connect to several different servers sequentially or we may have a
server running while using a client, and we don't want to confuse the
versions between those.

With this in place, all remaining occurrences of QDataStream are
replaced with QPacket or QQmlDebugPacket.

Change-Id: I3f6ba73fcbfad5e8df917c5feb9308116738a614
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
index 77503c5f06..3647a62682 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
@@ -35,11 +35,11 @@
 #include "qv4profileradapter.h"
 #include "qqmlprofileradapter.h"
 #include "qqmlprofilerservicefactory.h"
+#include "qqmldebugpacket.h"
+
 #include <private/qqmlengine_p.h>
-#include <private/qpacket_p.h>
 #include <private/qqmldebugpluginmanager_p.h>
 
-#include <QtCore/qdatastream.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qtimer.h>
 #include <QtCore/qthread.h>
@@ -212,7 +212,7 @@ void QQmlProfilerServiceImpl::startProfiling(QQmlEngine *engine, quint64 feature
 {
     QMutexLocker lock(&m_configMutex);
 
-    QPacket d;
+    QQmlDebugPacket d;
 
     d << m_timer.nsecsElapsed() << (int)Event << (int)StartTrace;
     bool startedAny = false;
@@ -308,7 +308,7 @@ void QQmlProfilerServiceImpl::sendMessages()
 {
     QList<QByteArray> messages;
 
-    QPacket traceEnd;
+    QQmlDebugPacket traceEnd;
     if (m_waitingForStop) {
         traceEnd << m_timer.nsecsElapsed() << (int)Event << (int)EndTrace;
 
@@ -340,7 +340,7 @@ void QQmlProfilerServiceImpl::sendMessages()
         //indicate completion
         messages << traceEnd.data();
 
-        QPacket ds;
+        QQmlDebugPacket ds;
         ds << (qint64)-1 << (int)Complete;
         messages << ds.data();
         m_waitingForStop = false;
@@ -375,7 +375,7 @@ void QQmlProfilerServiceImpl::messageReceived(const QByteArray &message)
 {
     QMutexLocker lock(&m_configMutex);
 
-    QPacket stream(message);
+    QQmlDebugPacket stream(message);
 
     int engineId = -1;
     quint64 features = std::numeric_limits<quint64>::max();