From c63a2c9cda223f8eeba2ed13c3dbf778ba57cd2b Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 16 Mar 2017 15:07:54 -0700
Subject: [PATCH] remove requirement of ScriptEngine in ScriptEngines slots

---
 libraries/script-engine/src/ScriptEngine.cpp  |  8 ++++----
 libraries/script-engine/src/ScriptEngine.h    |  8 ++++----
 libraries/script-engine/src/ScriptEngines.cpp | 20 +++++--------------
 libraries/script-engine/src/ScriptEngines.h   | 10 +++++-----
 4 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index 1b3d5057f5..a5c94c1bb4 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -464,17 +464,17 @@ void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) {
 
 void ScriptEngine::scriptErrorMessage(const QString& message) {
     qCCritical(scriptengine) << qPrintable(message);
-    emit errorMessage(message);
+    emit errorMessage(message, getFilename());
 }
 
 void ScriptEngine::scriptWarningMessage(const QString& message) {
     qCWarning(scriptengine) << message;
-    emit warningMessage(message);
+    emit warningMessage(message, getFilename());
 }
 
 void ScriptEngine::scriptInfoMessage(const QString& message) {
     qCInfo(scriptengine) << message;
-    emit infoMessage(message);
+    emit infoMessage(message, getFilename());
 }
 
 // Even though we never pass AnimVariantMap directly to and from javascript, the queued invokeMethod of
@@ -1351,7 +1351,7 @@ QUrl ScriptEngine::resourcesPath() const {
 }
 
 void ScriptEngine::print(const QString& message) {
-    emit printedMessage(message);
+    emit printedMessage(message, getFilename());
 }
 
 // Script.require.resolve -- like resolvePath, but performs more validation and throws exceptions on invalid module identifiers (for consistency with Node.js)
diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h
index 95f377d92b..5ea8d052e9 100644
--- a/libraries/script-engine/src/ScriptEngine.h
+++ b/libraries/script-engine/src/ScriptEngine.h
@@ -236,10 +236,10 @@ signals:
     void scriptEnding();
     void finished(const QString& fileNameString, ScriptEngine* engine);
     void cleanupMenuItem(const QString& menuItemString);
-    void printedMessage(const QString& message);
-    void errorMessage(const QString& message);
-    void warningMessage(const QString& message);
-    void infoMessage(const QString& message);
+    void printedMessage(const QString& message, const QString& scriptName);
+    void errorMessage(const QString& message, const QString& scriptName);
+    void warningMessage(const QString& message, const QString& scriptName);
+    void infoMessage(const QString& message, const QString& scriptName);
     void runningStateChanged();
     void loadScript(const QString& scriptName, bool isUserLoaded);
     void reloadScript(const QString& scriptName, bool isUserLoaded);
diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp
index 57887d2d96..88b0e0b7b5 100644
--- a/libraries/script-engine/src/ScriptEngines.cpp
+++ b/libraries/script-engine/src/ScriptEngines.cpp
@@ -34,34 +34,24 @@ ScriptsModel& getScriptsModel() {
     return scriptsModel;
 }
 
-void ScriptEngines::onPrintedMessage(const QString& message) {
-    auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
-    auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
+void ScriptEngines::onPrintedMessage(const QString& message, const QString& scriptName) {
     emit printedMessage(message, scriptName);
 }
 
-void ScriptEngines::onErrorMessage(const QString& message) {
-    auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
-    auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
+void ScriptEngines::onErrorMessage(const QString& message, const QString& scriptName) {
     emit errorMessage(message, scriptName);
 }
 
-void ScriptEngines::onWarningMessage(const QString& message) {
-    auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
-    auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
+void ScriptEngines::onWarningMessage(const QString& message, const QString& scriptName) {
     emit warningMessage(message, scriptName);
 }
 
-void ScriptEngines::onInfoMessage(const QString& message) {
-    auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
-    auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
+void ScriptEngines::onInfoMessage(const QString& message, const QString& scriptName) {
     emit infoMessage(message, scriptName);
 }
 
 void ScriptEngines::onErrorLoadingScript(const QString& url) {
-    auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
-    auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
-    emit errorLoadingScript(url, scriptName);
+    emit errorLoadingScript(url);
 }
 
 ScriptEngines::ScriptEngines(ScriptEngine::Context context)
diff --git a/libraries/script-engine/src/ScriptEngines.h b/libraries/script-engine/src/ScriptEngines.h
index 2fadfc81f8..63b7e8f11c 100644
--- a/libraries/script-engine/src/ScriptEngines.h
+++ b/libraries/script-engine/src/ScriptEngines.h
@@ -79,13 +79,13 @@ signals:
     void errorMessage(const QString& message, const QString& engineName);
     void warningMessage(const QString& message, const QString& engineName);
     void infoMessage(const QString& message, const QString& engineName);
-    void errorLoadingScript(const QString& url, const QString& engineName);
+    void errorLoadingScript(const QString& url);
 
 public slots:
-    void onPrintedMessage(const QString& message);
-    void onErrorMessage(const QString& message);
-    void onWarningMessage(const QString& message);
-    void onInfoMessage(const QString& message);
+    void onPrintedMessage(const QString& message, const QString& scriptName);
+    void onErrorMessage(const QString& message, const QString& scriptName);
+    void onWarningMessage(const QString& message, const QString& scriptName);
+    void onInfoMessage(const QString& message, const QString& scriptName);
     void onErrorLoadingScript(const QString& url);
 
 protected slots: