summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
Diffstat (limited to 'src/control')
-rw-r--r--src/control/controlobjectscript.cpp5
-rw-r--r--src/control/controlobjectscript.h5
2 files changed, 5 insertions, 5 deletions
diff --git a/src/control/controlobjectscript.cpp b/src/control/controlobjectscript.cpp
index 501967b4b3..3c6a649573 100644
--- a/src/control/controlobjectscript.cpp
+++ b/src/control/controlobjectscript.cpp
@@ -2,10 +2,11 @@
#include <QtDebug>
+#include "controllers/controllerdebug.h"
#include "moc_controlobjectscript.cpp"
ControlObjectScript::ControlObjectScript(const ConfigKey& key, QObject* pParent)
- : ControlProxy(key, pParent, ControlFlag::NoAssertIfMissing) {
+ : ControlProxy(key, pParent, ControllerDebug::controlFlags()) {
}
bool ControlObjectScript::addScriptConnection(const ScriptConnection& conn) {
@@ -66,7 +67,7 @@ bool ControlObjectScript::removeScriptConnection(const ScriptConnection& conn) {
return success;
}
-void ControlObjectScript::disconnectAllConnectionsToFunction(const QScriptValue& function) {
+void ControlObjectScript::disconnectAllConnectionsToFunction(const QJSValue& function) {
// Make a local copy of m_scriptConnections because items are removed within the loop.
const QVector<ScriptConnection> connections = m_scriptConnections;
for (const auto& conn: connections) {
diff --git a/src/control/controlobjectscript.h b/src/control/controlobjectscript.h
index 2aac51ae62..219a4b0a99 100644
--- a/src/control/controlobjectscript.h
+++ b/src/control/controlobjectscript.h
@@ -2,9 +2,8 @@
#include <QVector>
-#include "controllers/controllerengine.h"
-#include "controllers/controllerdebug.h"
#include "control/controlproxy.h"
+#include "controllers/scripting/legacy/scriptconnection.h"
// this is used for communicate with controller scripts
class ControlObjectScript : public ControlProxy {
@@ -21,7 +20,7 @@ class ControlObjectScript : public ControlProxy {
return m_scriptConnections.size(); };
inline ScriptConnection firstConnection() {
return m_scriptConnections.first(); };
- void disconnectAllConnectionsToFunction(const QScriptValue& function);
+ void disconnectAllConnectionsToFunction(const QJSValue& function);
// Called from update();
void emitValueChanged() override {