From 3ba4176568867cb146c2b758cd39461367ad22d1 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 16 Aug 2017 12:24:45 +0200
Subject: Cleanup JS includes, remove unneeded code

Change-Id: Ic24fed82ecd57cfee91372915b61e43c2a2dca22
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
---
 src/scxml/qscxmlcompiler.cpp                     | 2 --
 src/scxml/qscxmlecmascriptdatamodel.h            | 2 --
 src/scxml/qscxmlecmascriptplatformproperties_p.h | 4 +++-
 src/scxml/qscxmlstatemachine.cpp                 | 7 +------
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/scxml/qscxmlcompiler.cpp b/src/scxml/qscxmlcompiler.cpp
index 626015b..4256c72 100644
--- a/src/scxml/qscxmlcompiler.cpp
+++ b/src/scxml/qscxmlcompiler.cpp
@@ -42,8 +42,6 @@
 
 #include <qxmlstream.h>
 #include <qloggingcategory.h>
-#include <qjsondocument.h>
-#include <qjsonobject.h>
 #include <qfile.h>
 #include <qvector.h>
 #include <qstring.h>
diff --git a/src/scxml/qscxmlecmascriptdatamodel.h b/src/scxml/qscxmlecmascriptdatamodel.h
index 7c22044..2e105ea 100644
--- a/src/scxml/qscxmlecmascriptdatamodel.h
+++ b/src/scxml/qscxmlecmascriptdatamodel.h
@@ -42,8 +42,6 @@
 
 #include <QtScxml/qscxmldatamodel.h>
 
-QT_FORWARD_DECLARE_CLASS(QJSEngine)
-
 QT_BEGIN_NAMESPACE
 class QScxmlEcmaScriptDataModelPrivate;
 class Q_SCXML_EXPORT QScxmlEcmaScriptDataModel: public QScxmlDataModel
diff --git a/src/scxml/qscxmlecmascriptplatformproperties_p.h b/src/scxml/qscxmlecmascriptplatformproperties_p.h
index 53babeb..b751bda 100644
--- a/src/scxml/qscxmlecmascriptplatformproperties_p.h
+++ b/src/scxml/qscxmlecmascriptplatformproperties_p.h
@@ -53,9 +53,11 @@
 
 #include "qscxmlglobals.h"
 
-#include <QtQml/qjsvalue.h>
 #include <QtCore/qobject.h>
 
+QT_FORWARD_DECLARE_CLASS(QJSEngine)
+QT_FORWARD_DECLARE_CLASS(QJSValue)
+
 QT_BEGIN_NAMESPACE
 
 class QScxmlStateMachine;
diff --git a/src/scxml/qscxmlstatemachine.cpp b/src/scxml/qscxmlstatemachine.cpp
index cc190fb..7cbabc7 100644
--- a/src/scxml/qscxmlstatemachine.cpp
+++ b/src/scxml/qscxmlstatemachine.cpp
@@ -45,7 +45,6 @@
 
 #include <qfile.h>
 #include <qhash.h>
-#include <qjsengine.h>
 #include <qloggingcategory.h>
 #include <qstring.h>
 #include <qtimer.h>
@@ -2117,14 +2116,10 @@ void QScxmlStateMachine::submitEvent(const QString &eventName)
  */
 void QScxmlStateMachine::submitEvent(const QString &eventName, const QVariant &data)
 {
-    QVariant incomingData = data;
-    if (incomingData.canConvert<QJSValue>())
-        incomingData = incomingData.value<QJSValue>().toVariant();
-
     QScxmlEvent *e = new QScxmlEvent;
     e->setName(eventName);
     e->setEventType(QScxmlEvent::ExternalEvent);
-    e->setData(incomingData);
+    e->setData(data);
     submitEvent(e);
 }
 
-- 
cgit v1.2.3