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.h (1 of 11 files). Show all

Unified · Split

libraries/script-engine/src/qtscript/ScriptEngineQtScript.h+10−9

 #include <QtCore/QMutex>
 #include <QtCore/QObject>
 #include <QtCore/QPointer>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QString>
 #include <QtScript/QScriptEngine>
 #include "ArrayBufferClass.h"
 class ScriptContextQtWrapper;
-class ScriptContextQtAgent;
 class ScriptEngineQtScript;
 class ScriptManager;
-using ScriptEngineQtScriptPointer = std::shared_ptr<ScriptEngineQtScript>;
+class ScriptObjectQtProxy;
 using ScriptContextQtPointer = std::shared_ptr<ScriptContextQtWrapper>;
-Q_DECLARE_METATYPE(ScriptEngineQtScriptPointer);
+Q_DECLARE_METATYPE(ScriptEngine::FunctionSignature)
 /// [QtScript] Implements ScriptEngine for QtScript and translates calls for QScriptEngine
 class ScriptEngineQtScript final : public QScriptEngine,
 public:  // construction
     ScriptEngineQtScript(ScriptManager* scriptManager = nullptr);
-    ~ScriptEngineQtScript();
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // NOTE - these are NOT intended to be public interfaces available to scripts, the are only Q_INVOKABLE so we can
 public: // not for public use, but I don't like how Qt strings this along with private friend functions
     virtual ScriptValue create(int type, const void* ptr) override;
-    virtual QVariant convert(const ScriptValue& value, int type) override;
+    virtual QVariant convert(const ScriptValue& value, int typeId) override;
     virtual void registerCustomType(int type, ScriptEngine::MarshalFunction marshalFunc,
                                     ScriptEngine::DemarshalFunction demarshalFunc) override;
-    bool castValueToVariant(const QScriptValue& val, QVariant& dest, int destType);
+    bool castValueToVariant(const QScriptValue& val, QVariant& dest, int destTypeId);
     QScriptValue castVariantToValue(const QVariant& val);
+    static QString valueType(const QScriptValue& val);
+    using ObjectWrapperMap = QMap<QObject*, QWeakPointer<ScriptObjectQtProxy>>;
+    mutable QMutex _qobjectWrapperMapProtect;
+    ObjectWrapperMap _qobjectWrapperMap;
 protected:
     // like `newFunction`, but allows mapping inline C++ lambdas with captures as callable QScriptValues
     mutable QMutex _customTypeProtect;
     CustomMarshalMap _customTypes;
     CustomPrototypeMap _customPrototypes;
-    int _nextCustomType = 0;
     ScriptValue _nullValue;
     ScriptValue _undefinedValue;
     mutable ScriptContextQtPointer _currContext;
     ArrayBufferClass* _arrayBufferClass;
-    ScriptContextQtAgent* _contextAgent{ nullptr };
 };
 // Lambda helps create callable QScriptValues out of std::functions:

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code