1 files changed, 24 insertions, 22 deletions
diff --git a/src/server/events/Move.cpp b/src/server/events/Move.cpp
index f6a39f1f..80ae5a11 100644
--- a/src/server/events/Move.cpp
+++ b/src/server/events/Move.cpp
@@ -14,42 +14,46 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/Store.hpp"
-#include "raul/Path.hpp"
+#include "Move.hpp"
 
-#include "BlockImpl.hpp"
 #include "Broadcaster.hpp"
 #include "Driver.hpp"
 #include "Engine.hpp"
-#include "EnginePort.hpp"
-#include "GraphImpl.hpp"
-#include "events/Move.hpp"
 
+#include <ingen/Interface.hpp>
+#include <ingen/Message.hpp>
+#include <ingen/Status.hpp>
+#include <ingen/Store.hpp>
+#include <raul/Path.hpp>
+
+#include <map>
+#include <memory>
 #include <mutex>
 
-namespace ingen {
-namespace server {
+namespace ingen::server {
+
+class EnginePort;
+
 namespace events {
 
-Move::Move(Engine&                engine,
-           const SPtr<Interface>& client,
-           SampleCount            timestamp,
-           const ingen::Move&     msg)
+Move::Move(Engine&                           engine,
+           const std::shared_ptr<Interface>& client,
+           SampleCount                       timestamp,
+           const ingen::Move&                msg)
 	: Event(engine, client, msg.seq, timestamp)
 	, _msg(msg)
-{
-}
+{}
 
 bool
 Move::pre_process(PreProcessContext&)
 {
-	std::lock_guard<Store::Mutex> lock(_engine.store()->mutex());
+	const std::lock_guard<Store::Mutex> lock{_engine.store()->mutex()};
 
 	if (!_msg.old_path.parent().is_parent_of(_msg.new_path)) {
 		return Event::pre_process_done(Status::PARENT_DIFFERS, _msg.new_path);
 	}
 
-	const Store::iterator i = _engine.store()->find(_msg.old_path);
+	const auto i = _engine.store()->find(_msg.old_path);
 	if (i == _engine.store()->end()) {
 		return Event::pre_process_done(Status::NOT_FOUND, _msg.old_path);
 	}
@@ -69,14 +73,13 @@ Move::pre_process(PreProcessContext&)
 }
 
 void
-Move::execute(RunContext& context)
-{
-}
+Move::execute(RunContext&)
+{}
 
 void
 Move::post_process()
 {
-	Broadcaster::Transfer t(*_engine.broadcaster());
+	const Broadcaster::Transfer t{*_engine.broadcaster()};
 	if (respond() == Status::SUCCESS) {
 		_engine.broadcaster()->message(_msg);
 	}
@@ -89,5 +92,4 @@ Move::undo(Interface& target)
 }
 
 } // namespace events
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server