From de02da5fda14b46aef3442979f04db46045e9c4d Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Sun, 5 Mar 2023 13:45:05 +0100 Subject: [PATCH] Register more metatypes -- more work needed --- libraries/script-engine/src/ScriptException.h | 11 ++++++++++- .../src/ScriptManagerScriptingInterface.cpp | 12 ++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/libraries/script-engine/src/ScriptException.h b/libraries/script-engine/src/ScriptException.h index 92ae09617b..f533d7a4f0 100644 --- a/libraries/script-engine/src/ScriptException.h +++ b/libraries/script-engine/src/ScriptException.h @@ -174,4 +174,13 @@ inline QDebug operator<<(QDebug debug, std::shared_ptr e) { debug << *e.get(); return debug; -} \ No newline at end of file +} + +Q_DECLARE_METATYPE(ScriptException) +Q_DECLARE_METATYPE(ScriptEngineException) +Q_DECLARE_METATYPE(ScriptRuntimeException) + +Q_DECLARE_METATYPE(std::shared_ptr) +Q_DECLARE_METATYPE(std::shared_ptr) +Q_DECLARE_METATYPE(std::shared_ptr) + diff --git a/libraries/script-engine/src/ScriptManagerScriptingInterface.cpp b/libraries/script-engine/src/ScriptManagerScriptingInterface.cpp index 31b536b197..8c7a2d75b0 100644 --- a/libraries/script-engine/src/ScriptManagerScriptingInterface.cpp +++ b/libraries/script-engine/src/ScriptManagerScriptingInterface.cpp @@ -12,9 +12,21 @@ #include "ScriptManager.h" #include "ScriptManagerScriptingInterface.h" +#include + ScriptManagerScriptingInterface::ScriptManagerScriptingInterface(ScriptManager *parent): QObject(parent), _manager(parent) { + + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + + qRegisterMetaType>(); + qRegisterMetaType>(); + qRegisterMetaType>(); + + connect(_manager, &ScriptManager::scriptLoaded, this, &ScriptManagerScriptingInterface::scriptLoaded); connect(_manager, &ScriptManager::errorLoadingScript, this, &ScriptManagerScriptingInterface::errorLoadingScript); connect(_manager, &ScriptManager::update, this, &ScriptManagerScriptingInterface::update);