Revert "ControllerScriptEngineBase::executeFunction: Pass function as…

… pointer" This reverts commit 8e80cf1.
Swiftb0y · Jul 7, 2023 · 5081e07 · 5081e07
1 parent 3081a0d
commit 5081e07
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/src/controllers/midi/midicontroller.cpp b/src/controllers/midi/midicontroller.cpp
@@ -280,7 +280,7 @@ void MidiController::processInputMapping(const MidiInputMapping& mapping,
                 status,
                 mapping.control.group,
         };
-        if (!pEngine->executeFunction(&function, args)) {
+        if (!pEngine->executeFunction(function, args)) {
             qCWarning(m_logBase) << "MidiController: Invalid script function"
                                  << mapping.control.item;
         }

diff --git a/src/controllers/scripting/controllerscriptenginebase.cpp b/src/controllers/scripting/controllerscriptenginebase.cpp
@@ -70,28 +70,28 @@ void ControllerScriptEngineBase::reload() {
 }
 
 bool ControllerScriptEngineBase::executeFunction(
-        QJSValue* pFunctionObject, const QJSValueList& args) {
+        QJSValue functionObject, const QJSValueList& args) {
     // This function is called from outside the controller engine, so we can't
     // use VERIFY_OR_DEBUG_ASSERT here
     if (!m_pJSEngine) {
         return false;
     }
 
-    if (pFunctionObject->isError()) {
+    if (functionObject.isError()) {
         qDebug() << "ControllerScriptHandlerBase::executeFunction:"
-                 << pFunctionObject->toString();
+                 << functionObject.toString();
         return false;
     }
 
     // If it's not a function, we're done.
-    if (!pFunctionObject->isCallable()) {
+    if (!functionObject.isCallable()) {
         qDebug() << "ControllerScriptHandlerBase::executeFunction:"
-                 << pFunctionObject->toVariant() << "Not a function";
+                 << functionObject.toVariant() << "Not a function";
         return false;
     }
 
     // If it does happen to be a function, call it.
-    QJSValue returnValue = pFunctionObject->call(args);
+    QJSValue returnValue = functionObject.call(args);
     if (returnValue.isError()) {
         showScriptExceptionDialog(returnValue);
         return false;

diff --git a/src/controllers/scripting/controllerscriptenginebase.h b/src/controllers/scripting/controllerscriptenginebase.h
@@ -25,7 +25,7 @@ class ControllerScriptEngineBase : public QObject {
 
     virtual bool initialize();
 
-    bool executeFunction(QJSValue* pFunctionObject, const QJSValueList& arguments = {});
+    bool executeFunction(QJSValue functionObject, const QJSValueList& arguments = {});
 
     /// Shows a UI dialog notifying of a script evaluation error.
     /// Precondition: QJSValue.isError() == true

diff --git a/src/controllers/scripting/controllerscriptmoduleengine.cpp b/src/controllers/scripting/controllerscriptmoduleengine.cpp
@@ -32,7 +32,7 @@ bool ControllerScriptModuleEngine::initialize() {
     }
 
     QJSValue initFunction = mod.property("init");
-    if (!executeFunction(&initFunction)) {
+    if (!executeFunction(initFunction)) {
         shutdown();
         return false;
     }
@@ -47,6 +47,6 @@ bool ControllerScriptModuleEngine::initialize() {
 }
 
 void ControllerScriptModuleEngine::shutdown() {
-    executeFunction(&m_shutdownFunction);
+    executeFunction(m_shutdownFunction);
     ControllerScriptEngineBase::shutdown();
 }
diff --git a/src/controllers/scripting/legacy/controllerscriptenginelegacy.cpp b/src/controllers/scripting/legacy/controllerscriptenginelegacy.cpp
@@ -192,8 +192,8 @@ bool ControllerScriptEngineLegacy::handleIncomingData(const QByteArray& data) {
             static_cast<uint>(data.size()),
     };
 
-    for (auto&& function : m_incomingDataFunctions) {
-        ControllerScriptEngineBase::executeFunction(&function, args);
+    for (const QJSValue& function : std::as_const(m_incomingDataFunctions)) {
+        ControllerScriptEngineBase::executeFunction(function, args);
     }
 
     return true;

diff --git a/src/controllers/scripting/legacy/controllerscriptinterfacelegacy.cpp b/src/controllers/scripting/legacy/controllerscriptinterfacelegacy.cpp
@@ -541,12 +541,12 @@ void ControllerScriptInterfaceLegacy::timerEvent(QTimerEvent* event) {
     // why but this causes segfaults in ~QScriptValue while scratching if we
     // don't copy here -- even though internalExecute passes the QScriptValues
     // by value. *boggle*
-    TimerInfo timerTarget = it.value();
+    const TimerInfo timerTarget = it.value();
     if (timerTarget.oneShot) {
         stopTimer(timerId);
     }
 
-    m_pScriptEngineLegacy->executeFunction(&timerTarget.callback);
+    m_pScriptEngineLegacy->executeFunction(timerTarget.callback);
 }
 
 void ControllerScriptInterfaceLegacy::softTakeover(