diff options
| -rw-r--r-- | src/libs/engine/InputPort.cpp | 2 | ||||
| -rw-r--r-- | src/libs/engine/JackAudioDriver.cpp | 2 | ||||
| -rw-r--r-- | src/libs/engine/JackMidiDriver.cpp | 4 | ||||
| -rw-r--r-- | src/libs/engine/Patch.cpp | 12 | ||||
| -rw-r--r-- | src/libs/engine/events/DisconnectionEvent.cpp | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/libs/engine/InputPort.cpp b/src/libs/engine/InputPort.cpp index cf0be342..1a792c32 100644 --- a/src/libs/engine/InputPort.cpp +++ b/src/libs/engine/InputPort.cpp @@ -97,7 +97,7 @@ InputPort<T>::remove_connection(const OutputPort<T>* const src_port) Raul::ListNode<TypedConnection<T>*>* connection = NULL; for (TypedConnectionListIterator i = _connections.begin(); i != _connections.end(); ++i) { if ((*i)->src_port()->path() == src_port->path()) { - connection = _connections.remove(i); + connection = _connections.erase(i); found = true; } } diff --git a/src/libs/engine/JackAudioDriver.cpp b/src/libs/engine/JackAudioDriver.cpp index da2c056a..df03dcb8 100644 --- a/src/libs/engine/JackAudioDriver.cpp +++ b/src/libs/engine/JackAudioDriver.cpp @@ -238,7 +238,7 @@ JackAudioDriver::remove_port(const Path& path) for (Raul::List<JackAudioPort*>::iterator i = _ports.begin(); i != _ports.end(); ++i) if ((*i)->patch_port()->path() == path) - return _ports.remove(i)->elem(); + return _ports.erase(i)->elem(); // FIXME: LEAK cerr << "[JackAudioDriver::remove_port] WARNING: Failed to find Jack port to remove!" << endl; return NULL; diff --git a/src/libs/engine/JackMidiDriver.cpp b/src/libs/engine/JackMidiDriver.cpp index 743d0fda..1fa2b1a6 100644 --- a/src/libs/engine/JackMidiDriver.cpp +++ b/src/libs/engine/JackMidiDriver.cpp @@ -188,11 +188,11 @@ JackMidiDriver::remove_port(const Path& path) for (Raul::List<JackMidiPort*>::iterator i = _in_ports.begin(); i != _in_ports.end(); ++i) if ((*i)->patch_port()->path() == path) - return _in_ports.remove(i)->elem(); + return _in_ports.erase(i)->elem(); // FIXME: LEAK for (Raul::List<JackMidiPort*>::iterator i = _out_ports.begin(); i != _out_ports.end(); ++i) if ((*i)->patch_port()->path() == path) - return _out_ports.remove(i)->elem(); + return _out_ports.erase(i)->elem(); // FIXME: LEAK cerr << "[JackMidiDriver::remove_input] WARNING: Failed to find Jack port to remove!" << endl; return NULL; diff --git a/src/libs/engine/Patch.cpp b/src/libs/engine/Patch.cpp index 8ebb35e6..9b32b74a 100644 --- a/src/libs/engine/Patch.cpp +++ b/src/libs/engine/Patch.cpp @@ -53,13 +53,13 @@ Patch::~Patch() for (Raul::List<Connection*>::iterator i = _connections.begin(); i != _connections.end(); ++i) { delete (*i); - delete _connections.remove(i); + delete _connections.erase(i); } for (Raul::List<Node*>::iterator i = _nodes.begin(); i != _nodes.end(); ++i) { assert(!(*i)->activated()); delete (*i); - delete _nodes.remove(i); + delete _nodes.erase(i); } delete _process_order; @@ -198,7 +198,7 @@ Patch::remove_node(const string& name) { for (Raul::List<Node*>::iterator i = _nodes.begin(); i != _nodes.end(); ++i) if ((*i)->name() == name) - return _nodes.remove(i); + return _nodes.erase(i); return NULL; } @@ -213,7 +213,7 @@ Patch::remove_connection(const Port* src_port, const Port* dst_port) Raul::ListNode<Connection*>* connection = NULL; for (Raul::List<Connection*>::iterator i = _connections.begin(); i != _connections.end(); ++i) { if ((*i)->src_port() == src_port && (*i)->dst_port() == dst_port) { - connection = _connections.remove(i); + connection = _connections.erase(i); found = true; } } @@ -297,7 +297,7 @@ Patch::remove_port(const string& name) Raul::ListNode<Port*>* ret = NULL; for (Raul::List<Port*>::iterator i = _input_ports.begin(); i != _input_ports.end(); ++i) { if ((*i)->name() == name) { - ret = _input_ports.remove(i); + ret = _input_ports.erase(i); found = true; } } @@ -305,7 +305,7 @@ Patch::remove_port(const string& name) if (!found) for (Raul::List<Port*>::iterator i = _output_ports.begin(); i != _output_ports.end(); ++i) { if ((*i)->name() == name) { - ret = _output_ports.remove(i); + ret = _output_ports.erase(i); found = true; } } diff --git a/src/libs/engine/events/DisconnectionEvent.cpp b/src/libs/engine/events/DisconnectionEvent.cpp index 84ca49ff..ccb156e5 100644 --- a/src/libs/engine/events/DisconnectionEvent.cpp +++ b/src/libs/engine/events/DisconnectionEvent.cpp @@ -216,13 +216,13 @@ TypedDisconnectionEvent<T>::pre_process() for (Raul::List<Node*>::iterator i = dst_node->providers()->begin(); i != dst_node->providers()->end(); ++i) if ((*i) == src_node) { - delete dst_node->providers()->remove(i); + delete dst_node->providers()->erase(i); break; } for (Raul::List<Node*>::iterator i = src_node->dependants()->begin(); i != src_node->dependants()->end(); ++i) if ((*i) == dst_node) { - delete src_node->dependants()->remove(i); + delete src_node->dependants()->erase(i); break; } |