History

remove requirement of ScriptEngine in ScriptEngines slots

Stephen Birarda committed 9 years ago

Commit c63a2c91 parent a4d72c44 files · +18 −28Browse files

Showing the changes to libraries/script-engine/src/ScriptEngines.cpp (1 of 4 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngines.cpp+5−15
@@ -34,34 +34,24 @@ ScriptsModel& getScriptsModel() { · 33 unmodified lines
3434 return scriptsModel;
3535 }
3636
37−void ScriptEngines::onPrintedMessage(const QString& message) {
38− auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
39− auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
37+void ScriptEngines::onPrintedMessage(const QString& message, const QString& scriptName) {
4038 emit printedMessage(message, scriptName);
4139 }
4240
43−void ScriptEngines::onErrorMessage(const QString& message) {
44− auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
45− auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
41+void ScriptEngines::onErrorMessage(const QString& message, const QString& scriptName) {
4642 emit errorMessage(message, scriptName);
4743 }
4844
49−void ScriptEngines::onWarningMessage(const QString& message) {
50− auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
51− auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
45+void ScriptEngines::onWarningMessage(const QString& message, const QString& scriptName) {
5246 emit warningMessage(message, scriptName);
5347 }
5448
55−void ScriptEngines::onInfoMessage(const QString& message) {
56− auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
57− auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
49+void ScriptEngines::onInfoMessage(const QString& message, const QString& scriptName) {
5850 emit infoMessage(message, scriptName);
5951 }
6052
6153 void ScriptEngines::onErrorLoadingScript(const QString& url) {
62− auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
63− auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
64− emit errorLoadingScript(url, scriptName);
54+ emit errorLoadingScript(url);
6555 }
6656
6757 ScriptEngines::ScriptEngines(ScriptEngine::Context context)