Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 19:22:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove requirement of ScriptEngine in ScriptEngines slots

Browse source
This commit is contained in:
Stephen Birarda 2017-03-16 15:07:54 -07:00
parent a4d72c4e67
commit c63a2c9cda
4 changed files with 18 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -464,17 +464,17 @@ void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) {
void ScriptEngine::scriptErrorMessage(const QString& message) { void ScriptEngine::scriptErrorMessage(const QString& message) {
qCCritical(scriptengine) << qPrintable(message); qCCritical(scriptengine) << qPrintable(message);
emit errorMessage(message); emit errorMessage(message, getFilename());
} }
void ScriptEngine::scriptWarningMessage(const QString& message) { void ScriptEngine::scriptWarningMessage(const QString& message) {
qCWarning(scriptengine) << message; qCWarning(scriptengine) << message;
emit warningMessage(message); emit warningMessage(message, getFilename());
} }
void ScriptEngine::scriptInfoMessage(const QString& message) { void ScriptEngine::scriptInfoMessage(const QString& message) {
qCInfo(scriptengine) << 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 // 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) { 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) // Script.require.resolve -- like resolvePath, but performs more validation and throws exceptions on invalid module identifiers (for consistency with Node.js)

8
libraries/script-engine/src/ScriptEngine.h
View file

@ -236,10 +236,10 @@ signals:
void scriptEnding(); void scriptEnding();
void finished(const QString& fileNameString, ScriptEngine* engine); void finished(const QString& fileNameString, ScriptEngine* engine);
void cleanupMenuItem(const QString& menuItemString); void cleanupMenuItem(const QString& menuItemString);
void printedMessage(const QString& message); void printedMessage(const QString& message, const QString& scriptName);
void errorMessage(const QString& message); void errorMessage(const QString& message, const QString& scriptName);
void warningMessage(const QString& message); void warningMessage(const QString& message, const QString& scriptName);
void infoMessage(const QString& message); void infoMessage(const QString& message, const QString& scriptName);
void runningStateChanged(); void runningStateChanged();
void loadScript(const QString& scriptName, bool isUserLoaded); void loadScript(const QString& scriptName, bool isUserLoaded);
void reloadScript(const QString& scriptName, bool isUserLoaded); void reloadScript(const QString& scriptName, bool isUserLoaded);

20
libraries/script-engine/src/ScriptEngines.cpp
View file

@ -34,34 +34,24 @@ ScriptsModel& getScriptsModel() {
return scriptsModel; return scriptsModel;
} }
void ScriptEngines::onPrintedMessage(const QString& message) { void ScriptEngines::onPrintedMessage(const QString& message, const QString& scriptName) {
auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
emit printedMessage(message, scriptName); emit printedMessage(message, scriptName);
} }
void ScriptEngines::onErrorMessage(const QString& message) { void ScriptEngines::onErrorMessage(const QString& message, const QString& scriptName) {
auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
emit errorMessage(message, scriptName); emit errorMessage(message, scriptName);
} }
void ScriptEngines::onWarningMessage(const QString& message) { void ScriptEngines::onWarningMessage(const QString& message, const QString& scriptName) {
auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
emit warningMessage(message, scriptName); emit warningMessage(message, scriptName);
} }
void ScriptEngines::onInfoMessage(const QString& message) { void ScriptEngines::onInfoMessage(const QString& message, const QString& scriptName) {
auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
emit infoMessage(message, scriptName); emit infoMessage(message, scriptName);
} }
void ScriptEngines::onErrorLoadingScript(const QString& url) { void ScriptEngines::onErrorLoadingScript(const QString& url) {
auto scriptEngine = qobject_cast<ScriptEngine*>(sender()); emit errorLoadingScript(url);
auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
emit errorLoadingScript(url, scriptName);
} }
ScriptEngines::ScriptEngines(ScriptEngine::Context context) ScriptEngines::ScriptEngines(ScriptEngine::Context context)

10
libraries/script-engine/src/ScriptEngines.h
View file

@ -79,13 +79,13 @@ signals:
void errorMessage(const QString& message, const QString& engineName); void errorMessage(const QString& message, const QString& engineName);
void warningMessage(const QString& message, const QString& engineName); void warningMessage(const QString& message, const QString& engineName);
void infoMessage(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: public slots:
void onPrintedMessage(const QString& message); void onPrintedMessage(const QString& message, const QString& scriptName);
void onErrorMessage(const QString& message); void onErrorMessage(const QString& message, const QString& scriptName);
void onWarningMessage(const QString& message); void onWarningMessage(const QString& message, const QString& scriptName);
void onInfoMessage(const QString& message); void onInfoMessage(const QString& message, const QString& scriptName);
void onErrorLoadingScript(const QString& url); void onErrorLoadingScript(const QString& url);
protected slots: protected slots: