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

Unified · Split

 static const bool HIFI_AUTOREFRESH_FILE_SCRIPTS { true };
-Q_DECLARE_METATYPE(ScriptEngine::FunctionSignature)
-int functionSignatureMetaID = qRegisterMetaType<ScriptEngine::FunctionSignature>();
 int scriptManagerPointerMetaID = qRegisterMetaType<ScriptManagerPointer>();
 Q_DECLARE_METATYPE(ExternalResource::Bucket);
     }
 }
-QObject* ScriptManager::setupTimerWithInterval(const ScriptValue& function, int intervalMS, bool isSingleShot) {
+QTimer* ScriptManager::setupTimerWithInterval(const ScriptValue& function, int intervalMS, bool isSingleShot) {
     // create the timer, add it to the map, and start it
     QTimer* newTimer = new QTimer(this);
     newTimer->setSingleShot(isSingleShot);
     return newTimer;
 }
-QObject* ScriptManager::setInterval(const ScriptValue& function, int intervalMS) {
+QTimer* ScriptManager::setInterval(const ScriptValue& function, int intervalMS) {
     if (isStopped()) {
         scriptWarningMessage("Script.setInterval() while shutting down is ignored... parent script:" + getFilename());
         return NULL; // bail early
     return setupTimerWithInterval(function, intervalMS, false);
 }
-QObject* ScriptManager::setTimeout(const ScriptValue& function, int timeoutMS) {
+QTimer* ScriptManager::setTimeout(const ScriptValue& function, int timeoutMS) {
     if (isStopped()) {
         scriptWarningMessage("Script.setTimeout() while shutting down is ignored... parent script:" + getFilename());
         return NULL; // bail early