diff options
author | be_ <be.0@gmx.com> | 2017-03-15 00:01:16 -0500 |
---|---|---|
committer | be_ <be.0@gmx.com> | 2017-03-15 00:01:16 -0500 |
commit | 667b4c62ee0170ea2ade696937e0c7a34d90c5ec (patch) | |
tree | 82f2360c57b54f7ea6b77d49e7fb3031089ec2a8 /src | |
parent | d88fc44368d65ce886f60f1b1623e0a25b85977e (diff) |
remove redundant warning
Diffstat (limited to 'src')
-rw-r--r-- | src/control/controlobjectscript.cpp | 3 | ||||
-rw-r--r-- | src/control/controlobjectscript.h | 2 | ||||
-rw-r--r-- | src/controllers/controllerengine.cpp | 5 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/control/controlobjectscript.cpp b/src/control/controlobjectscript.cpp index bcf016cf9e..a7ccdf63bc 100644 --- a/src/control/controlobjectscript.cpp +++ b/src/control/controlobjectscript.cpp @@ -35,7 +35,7 @@ bool ControlObjectScript::addScriptConnection(const ScriptConnection& conn) { return true; } -bool ControlObjectScript::removeScriptConnection(const ScriptConnection& conn) { +void ControlObjectScript::removeScriptConnection(const ScriptConnection& conn) { bool success = m_scriptConnections.removeOne(conn); if (success) { controllerDebug("Disconnected (" + @@ -53,7 +53,6 @@ bool ControlObjectScript::removeScriptConnection(const ScriptConnection& conn) { disconnect(this, SIGNAL(trigger(double, QObject*)), this, SLOT(slotValueChanged(double,QObject*))); } - return success; } void ControlObjectScript::disconnectAllConnectionsToFunction(const QScriptValue& function) { diff --git a/src/control/controlobjectscript.h b/src/control/controlobjectscript.h index 33cc6938bb..d53d9f806b 100644 --- a/src/control/controlobjectscript.h +++ b/src/control/controlobjectscript.h @@ -13,7 +13,7 @@ class ControlObjectScript : public ControlProxy { bool addScriptConnection(const ScriptConnection& conn); - bool removeScriptConnection(const ScriptConnection& conn); + void removeScriptConnection(const ScriptConnection& conn); inline int countConnections() { return m_scriptConnections.size(); }; diff --git a/src/controllers/controllerengine.cpp b/src/controllers/controllerengine.cpp index 98e867d0e9..b0d6a0aef9 100644 --- a/src/controllers/controllerengine.cpp +++ b/src/controllers/controllerengine.cpp @@ -831,10 +831,7 @@ void ControllerEngine::removeScriptConnection(const ScriptConnection connection) return; } - if (!coScript->removeScriptConnection(connection)) { - qWarning() << "Could not disconnect script connection " << connection.id.toString() - << "from (" + connection.key.group + ", " + connection.key.item + ")"; - } + coScript->removeScriptConnection(connection); } void ScriptConnectionInvokableWrapper::disconnect() { |