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
34 return scriptsModel;34 return scriptsModel;
35}35}
36 36
37void ScriptEngines::onPrintedMessage(const QString& message) {37void ScriptEngines::onPrintedMessage(const QString& message, const QString& scriptName) {
38 auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
39 auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
40 emit printedMessage(message, scriptName);38 emit printedMessage(message, scriptName);
41}39}
42 40
43void ScriptEngines::onErrorMessage(const QString& message) {41void ScriptEngines::onErrorMessage(const QString& message, const QString& scriptName) {
44 auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
45 auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
46 emit errorMessage(message, scriptName);42 emit errorMessage(message, scriptName);
47}43}
48 44
49void ScriptEngines::onWarningMessage(const QString& message) {45void ScriptEngines::onWarningMessage(const QString& message, const QString& scriptName) {
50 auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
51 auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
52 emit warningMessage(message, scriptName);46 emit warningMessage(message, scriptName);
53}47}
54 48
55void ScriptEngines::onInfoMessage(const QString& message) {49void ScriptEngines::onInfoMessage(const QString& message, const QString& scriptName) {
56 auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
57 auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
58 emit infoMessage(message, scriptName);50 emit infoMessage(message, scriptName);
59}51}
60 52
61void ScriptEngines::onErrorLoadingScript(const QString& url) {53void ScriptEngines::onErrorLoadingScript(const QString& url) {
62 auto scriptEngine = qobject_cast<ScriptEngine*>(sender());54 emit errorLoadingScript(url);
63 auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
64 emit errorLoadingScript(url, scriptName);
65}55}
66 56
67ScriptEngines::ScriptEngines(ScriptEngine::Context context)57ScriptEngines::ScriptEngines(ScriptEngine::Context context)