changes from code review suggestions

interface/src/ui/JSConsole.cpp

@@ -318,7 +318,7 @@ void JSConsole::setScriptManager(const ScriptManagerPointer& scriptManager) {
     if (_scriptManager == scriptManager && scriptManager != nullptr) {
         return;
     }
-    if (scriptManager != nullptr) {
+    if (_scriptManager != nullptr) {
         disconnect(_scriptManager.get(), nullptr, this, nullptr);
         _scriptManager.reset();
     }

interface/src/ui/TestingDialog.cpp

@@ -24,12 +24,12 @@ TestingDialog::TestingDialog(QWidget* parent) :
 
     _console->setFixedHeight(TESTING_CONSOLE_HEIGHT);
 
-    _manager = DependencyManager::get<ScriptEngines>()->loadScript(qApp->applicationDirPath() + testRunnerRelativePath);
+    _scriptManager = DependencyManager::get<ScriptEngines>()->loadScript(qApp->applicationDirPath() + testRunnerRelativePath);
-    _console->setScriptManager(_manager);
+    _console->setScriptManager(_scriptManager);
-    connect(_manager.get(), &ScriptManager::finished, this, &TestingDialog::onTestingFinished);
+    connect(_scriptManager.get(), &ScriptManager::finished, this, &TestingDialog::onTestingFinished);
 }
 
 void TestingDialog::onTestingFinished(const QString& scriptPath) {
-    _manager.reset();
+    _scriptManager.reset();
     _console->setScriptManager();
 }

interface/src/ui/TestingDialog.h

@@ -33,7 +33,7 @@ public:
 
 private:
     std::unique_ptr<JSConsole> _console;
-    ScriptManagerPointer _manager;
+    ScriptManagerPointer _scriptManager;
 };
 
 #endif

libraries/entities/src/EntityScriptingInterface.cpp

@@ -53,7 +53,7 @@ void staticEntityScriptInitializer(ScriptManager* manager) {
 
     auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
     entityScriptingInterface->init();
-    auto ifacePtr = entityScriptingInterface.data(); // using this when we don't want to leak a reference
+    auto interfacePtr = entityScriptingInterface.data();  // using this when we don't want to leak a reference
 
     registerMetaTypes(scriptEngine);
 
@@ -71,7 +71,7 @@ void staticEntityScriptInitializer(ScriptManager* manager) {
     // so... yay lambdas everywhere to get the sender
     manager->connect(
         manager, &ScriptManager::attachDefaultEventHandlers, entityScriptingInterface.data(),
-        [ifacePtr, manager] { ifacePtr->attachDefaultEventHandlers(manager); },
+        [interfacePtr, manager] { interfacePtr->attachDefaultEventHandlers(manager); },
         Qt::DirectConnection);
     manager->connect(manager, &ScriptManager::releaseEntityPacketSenderMessages, entityScriptingInterface.data(),
                      &EntityScriptingInterface::releaseEntityPacketSenderMessages, Qt::DirectConnection);
@@ -99,7 +99,7 @@ EntityScriptingInterface::EntityScriptingInterface(bool bidOnSimulationOwnership
 
 void EntityScriptingInterface::releaseEntityPacketSenderMessages(bool wait) {
     EntityEditPacketSender* entityPacketSender = getEntityPacketSender();
-    if (entityPacketSender->serversExist()) {
+    if (entityPacketSender && entityPacketSender->serversExist()) {
         // release the queue of edit entity messages.
         entityPacketSender->releaseQueuedMessages();
 
@@ -1513,17 +1513,17 @@ bool EntityPropertyMetadataRequest::script(EntityItemID entityID, const ScriptVa
     using LocalScriptStatusRequest = QFutureWatcher<QVariant>;
 
     LocalScriptStatusRequest* request = new LocalScriptStatusRequest;
-    QObject::connect(request, &LocalScriptStatusRequest::finished, _manager, [=]() mutable {
+    QObject::connect(request, &LocalScriptStatusRequest::finished, _scriptManager, [=]() mutable {
         auto details = request->result().toMap();
         ScriptValue err, result;
         if (details.contains("isError")) {
             if (!details.contains("message")) {
                 details["message"] = details["errorInfo"];
             }
-            err = _manager->engine()->makeError(_manager->engine()->toScriptValue(details));
+            err = _scriptManager->engine()->makeError(_scriptManager->engine()->toScriptValue(details));
         } else {
             details["success"] = true;
-            result = _manager->engine()->toScriptValue(details);
+            result = _scriptManager->engine()->toScriptValue(details);
         }
         callScopedHandlerObject(handler, err, result);
         request->deleteLater();
@@ -1546,9 +1546,9 @@ bool EntityPropertyMetadataRequest::script(EntityItemID entityID, const ScriptVa
 bool EntityPropertyMetadataRequest::serverScripts(EntityItemID entityID, const ScriptValue& handler) {
     auto client = DependencyManager::get<EntityScriptClient>();
     auto request = client->createScriptStatusRequest(entityID);
-    QPointer<ScriptManager> manager = _manager;
+    QPointer<ScriptManager> manager = _scriptManager;
-    QObject::connect(request, &GetScriptStatusRequest::finished, _manager, [=](GetScriptStatusRequest* request) mutable {
+    QObject::connect(request, &GetScriptStatusRequest::finished, _scriptManager, [=](GetScriptStatusRequest* request) mutable {
-        auto manager = _manager;
+        auto manager = _scriptManager;
         if (!manager) {
             qCDebug(entities) << __FUNCTION__ << " -- engine destroyed while inflight" << entityID;
             return;

libraries/entities/src/EntityScriptingInterface.h

@@ -56,11 +56,11 @@ extern const QString NOT_GRABBABLE_USER_DATA;
 // problems with their own Entity scripts.
 class EntityPropertyMetadataRequest {
 public:
-    EntityPropertyMetadataRequest(ScriptManager* manager) : _manager(manager == nullptr ? nullptr : manager){};
+    EntityPropertyMetadataRequest(ScriptManager* manager) : _scriptManager(manager){};
     bool script(EntityItemID entityID, const ScriptValue& handler);
     bool serverScripts(EntityItemID entityID, const ScriptValue& handler);
 private:
-    QPointer<ScriptManager> _manager;
+    QPointer<ScriptManager> _scriptManager;
 };
 
 /*@jsdoc

libraries/script-engine/src/ScriptEngine.h

@@ -61,7 +61,7 @@ public:
         //ExcludeChildObjects	= 0x0001,	// The script object will not expose child objects as properties.
         ExcludeSuperClassMethods = 0x0002,	// The script object will not expose signals and slots inherited from the superclass.
         ExcludeSuperClassProperties	= 0x0004,	// The script object will not expose properties inherited from the superclass.
-        ExcludeSuperClassContents = 0x0006,	// Shorthand form for ExcludeSuperClassMethods | ExcludeSuperClassProperties
+        ExcludeSuperClassContents = ExcludeSuperClassMethods | ExcludeSuperClassProperties,
         //ExcludeDeleteLater = 0x0010,	// The script object will not expose the QObject::deleteLater() slot.
         ExcludeSlots = 0x0020,	// The script object will not expose the QObject's slots.
         AutoCreateDynamicProperties = 0x0100,	// Properties that don't already exist in the QObject will be created as dynamic properties of that object, rather than as properties of the script object.

libraries/script-engine/src/Scriptable.cpp

@@ -11,12 +11,12 @@
 
 #include "Scriptable.h"
 
-static thread_local ScriptContext* ScriptContextStore;
+static thread_local ScriptContext* scriptContextStore;
 
 ScriptContext* Scriptable::context() {
-    return ScriptContextStore;
+    return scriptContextStore;
 }
 
 void Scriptable::setContext(ScriptContext* context) {
-    ScriptContextStore = context;
+    scriptContextStore = context;
 }

libraries/script-engine/src/Scriptable.h

@@ -37,26 +37,22 @@ public:
 
 ScriptEnginePointer Scriptable::engine() {
     ScriptContext* scriptContext = context();
-    if (!scriptContext) return nullptr;
+    return scriptContext ? scriptContext->engine() : nullptr;
-    return scriptContext->engine();
 }
 
 ScriptValue Scriptable::thisObject() {
     ScriptContext* scriptContext = context();
-    if (!scriptContext) return ScriptValue();
+    return scriptContext ? scriptContext->thisObject() : ScriptValue();
-    return scriptContext->thisObject();
 }
 
 int Scriptable::argumentCount() {
     ScriptContext* scriptContext = context();
-    if (!scriptContext) return 0;
+    return scriptContext ? scriptContext->argumentCount() : 0;
-    return scriptContext->argumentCount();
 }
 
 ScriptValue Scriptable::argument(int index) {
     ScriptContext* scriptContext = context();
-    if (!scriptContext) return ScriptValue();
+    return scriptContext ? scriptContext->argument(index) : ScriptValue();
-    return scriptContext->argument(index);
 }
 
 #endif // hifi_Scriptable_h

libraries/script-engine/src/qtscript/ScriptContextQtAgent.h

@@ -38,7 +38,7 @@ public: // QScriptEngineAgent implementation
     virtual void functionExit(qint64 scriptId, const QScriptValue& returnValue) override;
 
 private: // storage
-    bool _contextActive = false;
+    bool _contextActive{ false };
     QList<ScriptContextQtPointer> _contextStack;
     ScriptContextQtPointer _currContext;
     ScriptEngineQtScript* _engine;

libraries/script-engine/src/qtscript/ScriptEngineQtScript.cpp

@@ -229,11 +229,11 @@ bool ScriptEngineQtScript::raiseException(const QScriptValue& exception) {
         // we have an active context / JS stack frame so throw the exception per usual
         QScriptEngine::currentContext()->throwValue(makeError(exception));
         return true;
-    } else if(_manager) {
+    } else if (_scriptManager) {
         // we are within a pure C++ stack frame (ie: being called directly by other C++ code)
         // in this case no context information is available so just emit the exception for reporting
         QScriptValue thrown = makeError(exception);
-        emit _manager->unhandledException(ScriptValue(new ScriptValueQtWrapper(this, std::move(thrown))));
+        emit _scriptManager->unhandledException(ScriptValue(new ScriptValueQtWrapper(this, std::move(thrown))));
     }
     return false;
 }
@@ -242,8 +242,8 @@ bool ScriptEngineQtScript::maybeEmitUncaughtException(const QString& debugHint)
     if (!IS_THREADSAFE_INVOCATION(thread(), __FUNCTION__)) {
         return false;
     }
-    if (!isEvaluating() && hasUncaughtException() && _manager) {
+    if (!isEvaluating() && hasUncaughtException() && _scriptManager) {
-        emit _manager->unhandledException(cloneUncaughtException(debugHint));
+        emit _scriptManager->unhandledException(cloneUncaughtException(debugHint));
         clearExceptions();
         return true;
     }
@@ -322,21 +322,21 @@ static void ScriptValueFromQScriptValue(const QScriptValue& src, ScriptValue& de
 
 ScriptEngineQtScript::ScriptEngineQtScript(ScriptManager* scriptManager) :
     QScriptEngine(),
-    _manager(scriptManager),
+    _scriptManager(scriptManager),
     _arrayBufferClass(new ArrayBufferClass(this))
 {
     qScriptRegisterMetaType(this, ScriptValueToQScriptValue, ScriptValueFromQScriptValue);
 
-    if (_manager) {
+    if (_scriptManager) {
         connect(this, &QScriptEngine::signalHandlerException, this, [this](const QScriptValue& exception) {
             if (hasUncaughtException()) {
                 // the engine's uncaughtException() seems to produce much better stack traces here
-                emit _manager->unhandledException(cloneUncaughtException("signalHandlerException"));
+                emit _scriptManager->unhandledException(cloneUncaughtException("signalHandlerException"));
                 clearExceptions();
             } else {
                 // ... but may not always be available -- so if needed we fallback to the passed exception
                 QScriptValue thrown = makeError(exception);
-                emit _manager->unhandledException(ScriptValue(new ScriptValueQtWrapper(this, std::move(thrown))));
+                emit _scriptManager->unhandledException(ScriptValue(new ScriptValueQtWrapper(this, std::move(thrown))));
             }
         }, Qt::DirectConnection);
         moveToThread(scriptManager->thread());
@@ -649,7 +649,7 @@ ScriptValue ScriptEngineQtScript::evaluateInClosure(const ScriptValue& _closure,
 }
 
 ScriptValue ScriptEngineQtScript::evaluate(const QString& sourceCode, const QString& fileName) {
-    if (_manager && _manager->isStopped()) {
+    if (_scriptManager && _scriptManager->isStopped()) {
         return undefinedValue(); // bail early
     }
 
@@ -692,7 +692,7 @@ ScriptValue ScriptEngineQtScript::evaluate(const QString& sourceCode, const QStr
 }
 
 Q_INVOKABLE ScriptValue ScriptEngineQtScript::evaluate(const ScriptProgramPointer& program) {
-    if (_manager && _manager->isStopped()) {
+    if (_scriptManager && _scriptManager->isStopped()) {
         return undefinedValue(); // bail early
     }
 
@@ -751,7 +751,7 @@ ScriptValue ScriptEngineQtScript::globalObject() const {
 }
 
 ScriptManager* ScriptEngineQtScript::manager() const {
-    return _manager;
+    return _scriptManager;
 }
 
 ScriptValue ScriptEngineQtScript::newArray(uint length) {

libraries/script-engine/src/qtscript/ScriptEngineQtScript.h

@@ -163,7 +163,7 @@ protected:
                                    const QScriptEngine::ValueOwnership& ownership = QScriptEngine::AutoOwnership);
 
 protected:
-    QPointer<ScriptManager> _manager;
+    QPointer<ScriptManager> _scriptManager;
 
     int _nextCustomType = 0;
     ScriptValue _nullValue;