1 files changed, 33 insertions, 22 deletions

diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp
index 5f0e9a5e..8e7bfbbe 100644
--- a/src/server/events/DisconnectAll.cpp
+++ b/src/server/events/DisconnectAll.cpp
@@ -14,25 +14,29 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "events/DisconnectAll.hpp"
+#include "DisconnectAll.hpp"
 
 #include "ArcImpl.hpp"
 #include "BlockImpl.hpp"
 #include "Broadcaster.hpp"
 #include "CompiledGraph.hpp"
+#include "Disconnect.hpp"
 #include "Engine.hpp"
 #include "GraphImpl.hpp"
 #include "InputPort.hpp"
 #include "NodeImpl.hpp"
 #include "PortImpl.hpp"
 #include "PreProcessContext.hpp"
-#include "events/Disconnect.hpp"
 
-#include "ingen/Interface.hpp"
-#include "ingen/Node.hpp"
-#include "ingen/Status.hpp"
-#include "ingen/Store.hpp"
+#include <ingen/Interface.hpp>
+#include <ingen/Message.hpp>
+#include <ingen/Node.hpp>
+#include <ingen/Status.hpp>
+#include <ingen/Store.hpp>
+#include <raul/Path.hpp>
 
+#include <algorithm>
+#include <iterator>
 #include <memory>
 #include <mutex>
 #include <set>
@@ -67,7 +71,7 @@ DisconnectAll::DisconnectAll(Engine&    engine,
 
 DisconnectAll::~DisconnectAll()
 {
-	for (auto& i : _impls) {
+	for (auto* i : _impls) {
 		delete i;
 	}
 }
@@ -108,24 +112,31 @@ DisconnectAll::pre_process(PreProcessContext& ctx)
 	}
 
 	// Create disconnect events to erase adjacent arcs in parent
-	for (const auto& a : adjacent_arcs(_parent)) {
-		_impls.push_back(
-			new Disconnect::Impl(_engine,
-			                     _parent,
-			                     dynamic_cast<PortImpl*>(a->tail()),
-			                     dynamic_cast<InputPort*>(a->head())));
-	}
+	const auto& arcs = adjacent_arcs(_parent);
+	std::transform(arcs.begin(),
+	               arcs.end(),
+	               std::back_inserter(_impls),
+	               [this](const auto& a) {
+		               return new Disconnect::Impl(_engine,
+		                                           _parent,
+		                                           a->tail(),
+		                                           dynamic_cast<InputPort*>(a->head()));
+	               });
 
 	// Create disconnect events to erase adjacent arcs in parent's parent
 	if (_port && _parent->parent()) {
-		auto* const parent_parent = dynamic_cast<GraphImpl*>(_parent->parent());
-		for (const auto& a : adjacent_arcs(parent_parent)) {
-			_impls.push_back(
-				new Disconnect::Impl(_engine,
-				                     parent_parent,
-				                     dynamic_cast<PortImpl*>(a->tail()),
-				                     dynamic_cast<InputPort*>(a->head())));
-		}
+		auto* const grandparent = dynamic_cast<GraphImpl*>(_parent->parent());
+		const auto& parent_arcs = adjacent_arcs(grandparent);
+
+		std::transform(parent_arcs.begin(),
+		               parent_arcs.end(),
+		               std::back_inserter(_impls),
+		               [this, grandparent](const auto& a) {
+			               return new Disconnect::Impl(_engine,
+			                                           grandparent,
+			                                           a->tail(),
+			                                           dynamic_cast<InputPort*>(a->head()));
+		               });
 	}
 
 	if (!_deleting && ctx.must_compile(*_parent)) {