From b2bbf21fb004fac6652351a9b7d7bb111fa0dd1f Mon Sep 17 00:00:00 2001 From: Liv Date: Tue, 23 May 2017 15:21:21 -0700 Subject: [PATCH] style fixes --- libraries/script-engine/src/ScriptEngine.cpp | 14 +++++++------- libraries/script-engine/src/ScriptEngine.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index 80ded52122..8a53d0300f 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -426,9 +426,9 @@ QString ScriptEngine::getFilename() const { } bool ScriptEngine::hasValidScriptSuffix(const QString& scriptFileName) { - QFileInfo fileInfo(scriptFileName); - QString scriptSuffixToLower = fileInfo.completeSuffix().toLower(); - return scriptSuffixToLower.contains(QString("js"), Qt::CaseInsensitive); + QFileInfo fileInfo(scriptFileName); + QString scriptSuffixToLower = fileInfo.completeSuffix().toLower(); + return scriptSuffixToLower.contains(QString("js"), Qt::CaseInsensitive); } void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) { @@ -441,10 +441,10 @@ void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) { _isReloading = reload; // Check that script has a supported file extension - if (!hasValidScriptSuffix(_fileNameString)) { - scriptErrorMessage("File extension of file: " + _fileNameString + " is not a currently supported script type"); - emit errorLoadingScript(_fileNameString); - return; + if (!hasValidScriptSuffix(_fileNameString)) { + scriptErrorMessage("File extension of file: " + _fileNameString + " is not a currently supported script type"); + emit errorLoadingScript(_fileNameString); + return; } const auto maxRetries = 0; // for consistency with previous scriptCache->getScript() behavior diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h index 0323ff19e5..010cdfbc75 100644 --- a/libraries/script-engine/src/ScriptEngine.h +++ b/libraries/script-engine/src/ScriptEngine.h @@ -146,7 +146,7 @@ public: /// to run... NOTE - this is used by Application currently to load the url. We don't really want it to be exposed /// to scripts. we may not need this to be invokable void loadURL(const QUrl& scriptURL, bool reload); - bool hasValidScriptSuffix(const QString& scriptFileName); + bool hasValidScriptSuffix(const QString& scriptFileName); Q_INVOKABLE QString getContext() const; Q_INVOKABLE bool isClientScript() const { return _context == CLIENT_SCRIPT; }