1 files changed, 38 insertions, 34 deletions
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.cpp
index 4f131ac481..6b653d5a54 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.cpp
@@ -1,56 +1,61 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtQml module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
 #include "qqmlenginecontrolservice.h"
-#include <QQmlEngine>
+#include "qqmldebugpacket.h"
+#include <QJSEngine>
 
 QT_BEGIN_NAMESPACE
 
-const QString QQmlEngineControlService::s_key = QStringLiteral("EngineControl");
-
-QQmlEngineControlService::QQmlEngineControlService(QObject *parent) :
-    QQmlDebugService(s_key, 1, parent)
+QQmlEngineControlServiceImpl::QQmlEngineControlServiceImpl(QObject *parent) :
+    QQmlEngineControlService(1, parent)
 {
 }
 
-void QQmlEngineControlService::messageReceived(const QByteArray &message)
+void QQmlEngineControlServiceImpl::messageReceived(const QByteArray &message)
 {
     QMutexLocker lock(&dataMutex);
-    QQmlDebugStream d(message);
+    QQmlDebugPacket d(message);
     int command;
     int engineId;
     d >> command >> engineId;
-    QQmlEngine *engine = qobject_cast<QQmlEngine *>(objectForId(engineId));
+    QJSEngine *engine = qobject_cast<QJSEngine *>(objectForId(engineId));
     if (command == StartWaitingEngine && startingEngines.contains(engine)) {
         startingEngines.removeOne(engine);
         emit attachedToEngine(engine);
@@ -60,7 +65,7 @@ void QQmlEngineControlService::messageReceived(const QByteArray &message)
     }
 }
 
-void QQmlEngineControlService::engineAboutToBeAdded(QQmlEngine *engine)
+void QQmlEngineControlServiceImpl::engineAboutToBeAdded(QJSEngine *engine)
 {
     QMutexLocker lock(&dataMutex);
     if (state() == Enabled) {
@@ -73,7 +78,7 @@ void QQmlEngineControlService::engineAboutToBeAdded(QQmlEngine *engine)
     }
 }
 
-void QQmlEngineControlService::engineAboutToBeRemoved(QQmlEngine *engine)
+void QQmlEngineControlServiceImpl::engineAboutToBeRemoved(QJSEngine *engine)
 {
     QMutexLocker lock(&dataMutex);
     if (state() == Enabled) {
@@ -86,7 +91,7 @@ void QQmlEngineControlService::engineAboutToBeRemoved(QQmlEngine *engine)
     }
 }
 
-void QQmlEngineControlService::engineAdded(QQmlEngine *engine)
+void QQmlEngineControlServiceImpl::engineAdded(QJSEngine *engine)
 {
     if (state() == Enabled) {
         QMutexLocker lock(&dataMutex);
@@ -96,7 +101,7 @@ void QQmlEngineControlService::engineAdded(QQmlEngine *engine)
     }
 }
 
-void QQmlEngineControlService::engineRemoved(QQmlEngine *engine)
+void QQmlEngineControlServiceImpl::engineRemoved(QJSEngine *engine)
 {
     if (state() == Enabled) {
         QMutexLocker lock(&dataMutex);
@@ -106,22 +111,21 @@ void QQmlEngineControlService::engineRemoved(QQmlEngine *engine)
     }
 }
 
-void QQmlEngineControlService::sendMessage(QQmlEngineControlService::MessageType type, QQmlEngine *engine)
+void QQmlEngineControlServiceImpl::sendMessage(QQmlEngineControlServiceImpl::MessageType type, QJSEngine *engine)
 {
-    QByteArray message;
-    QQmlDebugStream d(&message, QIODevice::WriteOnly);
-    d << type << idForObject(engine);
-    emit messageToClient(name(), message);
+    QQmlDebugPacket d;
+    d << int(type) << idForObject(engine);
+    emit messageToClient(name(), d.data());
 }
 
-void QQmlEngineControlService::stateChanged(State)
+void QQmlEngineControlServiceImpl::stateChanged(State)
 {
     // We flush everything for any kind of state change, to avoid complicated timing issues.
     QMutexLocker lock(&dataMutex);
-    foreach (QQmlEngine *engine, startingEngines)
+    foreach (QJSEngine *engine, startingEngines)
         emit attachedToEngine(engine);
     startingEngines.clear();
-    foreach (QQmlEngine *engine, stoppingEngines)
+    foreach (QJSEngine *engine, stoppingEngines)
         emit detachedFromEngine(engine);
     stoppingEngines.clear();
 }