1 files changed, 11 insertions, 15 deletions

diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp
index 7b284902..62653752 100644
--- a/src/server/events/Delete.cpp
+++ b/src/server/events/Delete.cpp
@@ -38,7 +38,6 @@
 #include "ingen/URI.hpp"
 #include "ingen/URIs.hpp"
 #include "ingen/World.hpp"
-#include "ingen/memory.hpp"
 #include "ingen/paths.hpp"
 #include "raul/Array.hpp"
 #include "raul/Maid.hpp"
@@ -49,9 +48,9 @@
 #include <memory>
 #include <mutex>
 #include <string>
+#include <string_view>
 
-namespace ingen {
-namespace server {
+namespace ingen::server {
 
 class RunContext;
 
@@ -63,8 +62,6 @@ Delete::Delete(Engine&                           engine,
                const ingen::Del&                 msg)
 	: Event(engine, client, msg.seq, timestamp)
 	, _msg(msg)
-	, _engine_port(nullptr)
-	, _disconnect_event(nullptr)
 {
 	if (uri_is_path(msg.uri)) {
 		_path = uri_to_path(msg.uri);
@@ -73,7 +70,7 @@ Delete::Delete(Engine&                           engine,
 
 Delete::~Delete()
 {
-	for (ControlBindings::Binding* b : _removed_bindings) {
+	for (auto* b : _removed_bindings) {
 		delete b;
 	}
 }
@@ -107,23 +104,23 @@ Delete::pre_process(PreProcessContext& ctx)
 	}
 
 	// Take a writer lock while we modify the store
-	std::lock_guard<Store::Mutex> lock(_engine.store()->mutex());
+	const std::lock_guard<Store::Mutex> lock{_engine.store()->mutex()};
 
 	_engine.store()->remove(iter, _removed_objects);
 
 	if (_block) {
 		parent->remove_block(*_block);
 		_disconnect_event =
-			make_unique<DisconnectAll>(_engine, parent, _block.get());
+			std::make_unique<DisconnectAll>(_engine, parent, _block.get());
 		_disconnect_event->pre_process(ctx);
-		_compiled_graph = ctx.maybe_compile(*_engine.maid(), *parent);
+		_compiled_graph = ctx.maybe_compile(*parent);
 	} else if (_port) {
 		parent->remove_port(*_port);
 		_disconnect_event =
-			make_unique<DisconnectAll>(_engine, parent, _port.get());
+			std::make_unique<DisconnectAll>(_engine, parent, _port.get());
 		_disconnect_event->pre_process(ctx);
 
-		_compiled_graph = ctx.maybe_compile(*_engine.maid(), *parent);
+		_compiled_graph = ctx.maybe_compile(*parent);
 		if (parent->enabled()) {
 			_ports_array = parent->build_ports_array(*_engine.maid());
 			assert(_ports_array->size() == parent->num_ports_non_rt());
@@ -185,14 +182,14 @@ Delete::execute(RunContext& ctx)
 	}
 
 	if (parent && _compiled_graph) {
-		parent->set_compiled_graph(std::move(_compiled_graph));
+		_compiled_graph = parent->swap_compiled_graph(std::move(_compiled_graph));
 	}
 }
 
 void
 Delete::post_process()
 {
-	Broadcaster::Transfer t(*_engine.broadcaster());
+	const Broadcaster::Transfer t{*_engine.broadcaster()};
 	if (respond() == Status::SUCCESS && (_block || _port)) {
 		if (_block) {
 			_block->deactivate();
@@ -235,5 +232,4 @@ Delete::undo(Interface& target)
 }
 
 } // namespace events
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server