Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 16 files). Show all
Unified · Split
| @@ -153,11 +153,11 @@ QString ScriptEngine::logException(const QScriptValue& exception) { · 152 unmodified lines | |||
| 153 | return message; | 153 | return message; |
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | QSharedPointer<ScriptEngine> scriptEngineFactory(ScriptEngine::Context context, | 156 | ScriptEnginePointer scriptEngineFactory(ScriptEngine::Context context, |
| 157 | const QString& scriptContents, | 157 | const QString& scriptContents, |
| 158 | const QString& fileNameString) { | 158 | const QString& fileNameString) { |
| 159 | ScriptEngine* engine = new ScriptEngine(context, scriptContents, fileNameString); | 159 | ScriptEngine* engine = new ScriptEngine(context, scriptContents, fileNameString); |
| 160 | QSharedPointer<ScriptEngine> engineSP = QSharedPointer<ScriptEngine>(engine); | 160 | ScriptEnginePointer engineSP = ScriptEnginePointer(engine); |
| 161 | DependencyManager::get<ScriptEngines>()->addScriptEngine(qSharedPointerCast<ScriptEngine>(engineSP)); | 161 | DependencyManager::get<ScriptEngines>()->addScriptEngine(qSharedPointerCast<ScriptEngine>(engineSP)); |
| 162 | return engineSP; | 162 | return engineSP; |
| 163 | } | 163 | } |
| @@ -537,7 +537,7 @@ static void scriptableResourceFromScriptValue(const QScriptValue& value, Scripta · 373 unmodified lines | |||
| 537 | resource = static_cast<ScriptableResourceRawPtr>(value.toQObject()); | 537 | resource = static_cast<ScriptableResourceRawPtr>(value.toQObject()); |
| 538 | } | 538 | } |
| 539 | 539 | ||
| 540 | static QScriptValue createScriptableResourcePrototype(QSharedPointer<ScriptEngine> engine) { | 540 | static QScriptValue createScriptableResourcePrototype(ScriptEnginePointer engine) { |
| 541 | auto prototype = engine->newObject(); | 541 | auto prototype = engine->newObject(); |
| 542 | 542 | ||
| 543 | // Expose enum State to JS/QML via properties | 543 | // Expose enum State to JS/QML via properties |