Continued tightening and testing of the scripting engine "glue" logic - QObject wrappers will now be reused when asked to wrap the same QObject multiple times - improved error reporting when we can't form a native call from script - dropped support for having the existing QtScript logic handle Qt object transformations - assuming that our code will handle all calls into native objects - changing timer functions to use CTimer* publicly rather than casted QObject*

Heather Anderson committed 4 years ago

Commit 55b5a2c1 parent 742fa2211 files · +262 −382Browse files

Showing the changes to libraries/script-engine/src/qtscript/ScriptEngineQtScript.cpp (1 of 11 files). Show all

Unified · Split

libraries/script-engine/src/qtscript/ScriptEngineQtScript.cpp+4−17

 #include "ScriptObjectQtProxy.h"
 #include "ScriptProgramQtWrapper.h"
 #include "ScriptValueQtWrapper.h"
-#include "ScriptContextQtAgent.h"
 static const int MAX_DEBUG_VALUE_LENGTH { 80 };
-Q_DECLARE_METATYPE(QScriptEngine::FunctionSignature)
-int qfunctionSignatureMetaID = qRegisterMetaType<QScriptEngine::FunctionSignature>();
-int scriptEnginePointerMetaID = qRegisterMetaType<ScriptEngineQtScriptPointer>();
 bool ScriptEngineQtScript::IS_THREADSAFE_INVOCATION(const QThread* thread, const QString& method) {
     const QThread* currentThread = QThread::currentThread();
     if (currentThread == thread) {
     _undefinedValue = ScriptValue(new ScriptValueQtWrapper(this, std::move(undefined)));
     QScriptEngine::setProcessEventsInterval(MSECS_PER_SECOND);
-    _contextAgent = new ScriptContextQtAgent(this, agent());
-    setAgent(_contextAgent);
-}
-ScriptEngineQtScript::~ScriptEngineQtScript() {
-    delete _contextAgent;
 }
 void ScriptEngineQtScript::registerEnum(const QString& enumName, QMetaEnum newEnum) {
     return ScriptValue(new ScriptValueQtWrapper(this, std::move(scriptValue)));
 }
-QVariant ScriptEngineQtScript::convert(const ScriptValue& value, int type) {
+QVariant ScriptEngineQtScript::convert(const ScriptValue& value, int typeId) {
     ScriptValueQtWrapper* unwrapped = ScriptValueQtWrapper::unwrap(value);
     if (unwrapped == nullptr) {
         return QVariant();
     }
     QVariant var;
-    if (!castValueToVariant(unwrapped->toQtValue(), var, type)) {
+    if (!castValueToVariant(unwrapped->toQtValue(), var, typeId)) {
         return QVariant();
     }
     int destType = var.userType();
-    if (destType != type) {
+    if (destType != typeId) {
-        var.convert(type); // if conversion fails then var is set to QVariant()
+        var.convert(typeId);  // if conversion fails then var is set to QVariant()
     }
     return var;