From 62f5c3124b991abe9b9423a4908ca076079d5327 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 2 Aug 2020 14:09:03 +0200
Subject: Use auto with pointer casts to remove redundancy

---
 src/client/BlockModel.cpp   |  6 +++---
 src/client/ClientStore.cpp  | 24 ++++++++++++------------
 src/client/GraphModel.cpp   | 12 ++++++------
 src/client/PortModel.cpp    |  2 +-
 src/gui/App.cpp             |  2 +-
 src/gui/ConnectWindow.cpp   |  4 ++--
 src/gui/GraphBox.cpp        |  4 ++--
 src/gui/GraphCanvas.cpp     |  6 +++---
 src/gui/GraphTreeWindow.cpp |  2 +-
 src/gui/NodeModule.cpp      |  2 +-
 src/gui/Port.cpp            | 22 +++++++++++-----------
 src/gui/PortMenu.cpp        | 22 +++++++++++-----------
 src/gui/SubgraphModule.cpp  |  4 ++--
 src/gui/ingen_gui_lv2.cpp   |  6 +++---
 src/server/GraphImpl.cpp    |  4 ++--
 src/server/events/Copy.cpp  |  2 +-
 src/server/ingen_lv2.cpp    | 18 +++++++++---------
 17 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/src/client/BlockModel.cpp b/src/client/BlockModel.cpp
index a4318f4e..636b3a85 100644
--- a/src/client/BlockModel.cpp
+++ b/src/client/BlockModel.cpp
@@ -108,7 +108,7 @@ BlockModel::add_child(const SPtr<ObjectModel>& c)
 
 	//ObjectModel::add_child(c);
 
-	SPtr<PortModel> pm = std::dynamic_pointer_cast<PortModel>(c);
+	auto pm = std::dynamic_pointer_cast<PortModel>(c);
 	assert(pm);
 	add_port(pm);
 }
@@ -121,7 +121,7 @@ BlockModel::remove_child(const SPtr<ObjectModel>& c)
 
 	//bool ret = ObjectModel::remove_child(c);
 
-	SPtr<PortModel> pm = std::dynamic_pointer_cast<PortModel>(c);
+	auto pm = std::dynamic_pointer_cast<PortModel>(c);
 	assert(pm);
 	remove_port(pm);
 
@@ -275,7 +275,7 @@ BlockModel::port_label(const SPtr<const PortModel>& port) const
 void
 BlockModel::set(const SPtr<ObjectModel>& model)
 {
-	SPtr<BlockModel> block = std::dynamic_pointer_cast<BlockModel>(model);
+	auto block = std::dynamic_pointer_cast<BlockModel>(model);
 	if (block) {
 		_plugin_uri = block->_plugin_uri;
 		_plugin     = block->_plugin;
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 1320de27..a02a3227 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -99,11 +99,11 @@ ClientStore::remove_object(const Raul::Path& path)
 		return SPtr<ObjectModel>();
 	}
 
-	SPtr<ObjectModel> object = std::dynamic_pointer_cast<ObjectModel>(top->second);
+	auto object = std::dynamic_pointer_cast<ObjectModel>(top->second);
 
 	// Remove object and any adjacent arcs from parent if applicable
 	if (object && object->parent()) {
-		SPtr<PortModel> port = std::dynamic_pointer_cast<PortModel>(object);
+		auto port = std::dynamic_pointer_cast<PortModel>(object);
 		if (port && std::dynamic_pointer_cast<GraphModel>(port->parent())) {
 			disconnect_all(port->parent()->path(), path);
 			if (port->parent()->parent()) {
@@ -160,7 +160,7 @@ ClientStore::_object(const Raul::Path& path)
 	if (i == end()) {
 		return SPtr<ObjectModel>();
 	} else {
-		SPtr<ObjectModel> model = std::dynamic_pointer_cast<ObjectModel>(i->second);
+		auto model = std::dynamic_pointer_cast<ObjectModel>(i->second);
 		assert(model);
 		assert(model->path().is_root() || model->parent());
 		return model;
@@ -290,7 +290,7 @@ ClientStore::operator()(const Put& msg)
 
 	const Raul::Path path(uri_to_path(uri));
 
-	SPtr<ObjectModel> obj = std::dynamic_pointer_cast<ObjectModel>(_object(path));
+	auto obj = std::dynamic_pointer_cast<ObjectModel>(_object(path));
 	if (obj) {
 		obj->set_properties(properties);
 		return;
@@ -437,8 +437,8 @@ bool
 ClientStore::attempt_connection(const Raul::Path& tail_path,
                                 const Raul::Path& head_path)
 {
-	SPtr<PortModel> tail = std::dynamic_pointer_cast<PortModel>(_object(tail_path));
-	SPtr<PortModel> head = std::dynamic_pointer_cast<PortModel>(_object(head_path));
+	auto tail = std::dynamic_pointer_cast<PortModel>(_object(tail_path));
+	auto head = std::dynamic_pointer_cast<PortModel>(_object(head_path));
 
 	if (tail && head) {
 		SPtr<GraphModel> graph = connection_graph(tail_path, head_path);
@@ -460,9 +460,9 @@ ClientStore::operator()(const Connect& msg)
 void
 ClientStore::operator()(const Disconnect& msg)
 {
-	SPtr<PortModel>  tail  = std::dynamic_pointer_cast<PortModel>(_object(msg.tail));
-	SPtr<PortModel>  head  = std::dynamic_pointer_cast<PortModel>(_object(msg.head));
-	SPtr<GraphModel> graph = connection_graph(msg.tail, msg.head);
+	auto tail  = std::dynamic_pointer_cast<PortModel>(_object(msg.tail));
+	auto head  = std::dynamic_pointer_cast<PortModel>(_object(msg.head));
+	auto graph = connection_graph(msg.tail, msg.head);
 	if (graph) {
 		graph->remove_arc(tail.get(), head.get());
 	}
@@ -471,8 +471,8 @@ ClientStore::operator()(const Disconnect& msg)
 void
 ClientStore::operator()(const DisconnectAll& msg)
 {
-	SPtr<GraphModel>  graph  = std::dynamic_pointer_cast<GraphModel>(_object(msg.graph));
-	SPtr<ObjectModel> object = _object(msg.path);
+	auto graph  = std::dynamic_pointer_cast<GraphModel>(_object(msg.graph));
+	auto object = _object(msg.path);
 
 	if (!graph || !object) {
 		_log.error("Bad disconnect all notification %1% in %2%\n",
@@ -482,7 +482,7 @@ ClientStore::operator()(const DisconnectAll& msg)
 
 	const GraphModel::Arcs arcs = graph->arcs();
 	for (const auto& a : arcs) {
-		SPtr<ArcModel> arc = std::dynamic_pointer_cast<ArcModel>(a.second);
+		auto arc = std::dynamic_pointer_cast<ArcModel>(a.second);
 		if (arc->tail()->parent() == object
 		    || arc->head()->parent() == object
 		    || arc->tail()->path() == msg.path
diff --git a/src/client/GraphModel.cpp b/src/client/GraphModel.cpp
index a2d50a20..4de2cb53 100644
--- a/src/client/GraphModel.cpp
+++ b/src/client/GraphModel.cpp
@@ -34,13 +34,13 @@ GraphModel::add_child(const SPtr<ObjectModel>& c)
 {
 	assert(c->parent().get() == this);
 
-	SPtr<PortModel> pm = std::dynamic_pointer_cast<PortModel>(c);
+	auto pm = std::dynamic_pointer_cast<PortModel>(c);
 	if (pm) {
 		add_port(pm);
 		return;
 	}
 
-	SPtr<BlockModel> bm = std::dynamic_pointer_cast<BlockModel>(c);
+	auto bm = std::dynamic_pointer_cast<BlockModel>(c);
 	if (bm) {
 		_signal_new_block.emit(bm);
 	}
@@ -52,13 +52,13 @@ GraphModel::remove_child(const SPtr<ObjectModel>& o)
 	assert(o->path().is_child_of(path()));
 	assert(o->parent().get() == this);
 
-	SPtr<PortModel> pm = std::dynamic_pointer_cast<PortModel>(o);
+	auto pm = std::dynamic_pointer_cast<PortModel>(o);
 	if (pm) {
 		remove_arcs_on(pm);
 		remove_port(pm);
 	}
 
-	SPtr<BlockModel> bm = std::dynamic_pointer_cast<BlockModel>(o);
+	auto bm = std::dynamic_pointer_cast<BlockModel>(o);
 	if (bm) {
 		_signal_removed_block.emit(bm);
 	}
@@ -75,7 +75,7 @@ GraphModel::remove_arcs_on(const SPtr<PortModel>& p)
 		auto next = j;
 		++next;
 
-		SPtr<ArcModel> arc = std::dynamic_pointer_cast<ArcModel>(j->second);
+		auto arc = std::dynamic_pointer_cast<ArcModel>(j->second);
 		if (arc->tail_path().parent() == p->path()
 		    || arc->tail_path() == p->path()
 		    || arc->head_path().parent() == p->path()
@@ -149,7 +149,7 @@ GraphModel::remove_arc(const Node* tail, const Node* head)
 {
 	auto i = _arcs.find(std::make_pair(tail, head));
 	if (i != _arcs.end()) {
-		SPtr<ArcModel> arc = std::dynamic_pointer_cast<ArcModel>(i->second);
+		auto arc = std::dynamic_pointer_cast<ArcModel>(i->second);
 		_signal_removed_arc.emit(arc);
 		_arcs.erase(i);
 	}
diff --git a/src/client/PortModel.cpp b/src/client/PortModel.cpp
index b3562f77..fe9bef2c 100644
--- a/src/client/PortModel.cpp
+++ b/src/client/PortModel.cpp
@@ -70,7 +70,7 @@ PortModel::set(const SPtr<ObjectModel>& model)
 {
 	ObjectModel::set(model);
 
-	SPtr<PortModel> port = std::dynamic_pointer_cast<PortModel>(model);
+	auto port = std::dynamic_pointer_cast<PortModel>(model);
 	if (port) {
 		_index = port->_index;
 		_direction = port->_direction;
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 49e3bb67..4be4bbd5 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -218,7 +218,7 @@ App::request_plugins_if_necessary()
 SPtr<SigClientInterface>
 App::sig_client()
 {
-	SPtr<QueuedInterface> qi = std::dynamic_pointer_cast<QueuedInterface>(_client);
+	auto qi = std::dynamic_pointer_cast<QueuedInterface>(_client);
 	if (qi) {
 		return std::dynamic_pointer_cast<SigClientInterface>(qi->sink());
 	}
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 2f13e522..16e88235 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -231,7 +231,7 @@ ConnectWindow::connect(bool existing)
 		if (existing) {
 			uri_str = world.interface()->uri();
 			_connect_stage = 1;
-			SPtr<client::SocketClient> client = std::dynamic_pointer_cast<client::SocketClient>(
+			auto client = std::dynamic_pointer_cast<client::SocketClient>(
 				world.interface());
 			if (client) {
 				_app->attach(client->respondee());
@@ -528,7 +528,7 @@ ConnectWindow::gtk_callback()
 		next_stage();
 	} else if (_connect_stage == 4) {
 		if (!_app->store()->empty()) {
-			SPtr<const GraphModel> root = std::dynamic_pointer_cast<const GraphModel>(
+			auto root = std::dynamic_pointer_cast<const GraphModel>(
 				_app->store()->object(Raul::Path("/")));
 			if (root) {
 				set_connected_to(_app->interface());
diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp
index e245fb0a..56bb45d2 100644
--- a/src/gui/GraphBox.cpp
+++ b/src/gui/GraphBox.cpp
@@ -251,7 +251,7 @@ GraphBox::set_graph_from_path(const Raul::Path&      path,
 		assert(view->graph()->path() == path);
 		_app->window_factory()->present_graph(view->graph(), _window, view);
 	} else {
-		SPtr<const GraphModel> model = std::dynamic_pointer_cast<const GraphModel>(
+		auto model = std::dynamic_pointer_cast<const GraphModel>(
 			_app->store()->object(path));
 		if (model) {
 			_app->window_factory()->present_graph(model, _window);
@@ -810,7 +810,7 @@ GraphBox::event_arrange()
 void
 GraphBox::event_parent_activated()
 {
-	SPtr<client::GraphModel> parent =
+	auto parent =
 	    std::dynamic_pointer_cast<client::GraphModel>(_graph->parent());
 
 	if (parent) {
diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp
index f923e3bb..30c67326 100644
--- a/src/gui/GraphCanvas.cpp
+++ b/src/gui/GraphCanvas.cpp
@@ -237,7 +237,7 @@ GraphCanvas::build()
 
 	// Create modules for blocks
 	for (Store::const_iterator i = kids.first; i != kids.second; ++i) {
-		SPtr<BlockModel> block = std::dynamic_pointer_cast<BlockModel>(i->second);
+		auto block = std::dynamic_pointer_cast<BlockModel>(i->second);
 		if (block && block->parent() == _graph) {
 			add_block(block);
 		}
@@ -325,8 +325,8 @@ GraphCanvas::remove_plugin(const URI& uri)
 void
 GraphCanvas::add_block(const SPtr<const BlockModel>& bm)
 {
-	SPtr<const GraphModel> pm     = std::dynamic_pointer_cast<const GraphModel>(bm);
-	NodeModule*            module = nullptr;
+	auto        pm     = std::dynamic_pointer_cast<const GraphModel>(bm);
+	NodeModule* module = nullptr;
 	if (pm) {
 		module = SubgraphModule::create(*this, pm, _human_names);
 	} else {
diff --git a/src/gui/GraphTreeWindow.cpp b/src/gui/GraphTreeWindow.cpp
index f4b1a0df..4242c69e 100644
--- a/src/gui/GraphTreeWindow.cpp
+++ b/src/gui/GraphTreeWindow.cpp
@@ -77,7 +77,7 @@ GraphTreeWindow::init(App& app, ClientStore& store)
 void
 GraphTreeWindow::new_object(const SPtr<ObjectModel>& object)
 {
-	SPtr<GraphModel> graph = std::dynamic_pointer_cast<GraphModel>(object);
+	auto graph = std::dynamic_pointer_cast<GraphModel>(object);
 	if (graph) {
 		add_graph(graph);
 	}
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index c5015a39..8e6dc0cf 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -138,7 +138,7 @@ NodeModule::create(GraphCanvas&           canvas,
                    SPtr<const BlockModel> block,
                    bool                   human)
 {
-	SPtr<const GraphModel> graph = std::dynamic_pointer_cast<const GraphModel>(block);
+	auto graph = std::dynamic_pointer_cast<const GraphModel>(block);
 
 	NodeModule* ret = (graph)
 		? new SubgraphModule(canvas, graph)
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index 643cca5f..3da9cf46 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -125,8 +125,8 @@ Port::port_label(App& app, SPtr<const PortModel> pm)
 			if (name.type() == app.forge().String) {
 				label = name.ptr<char>();
 			} else {
-				const SPtr<const BlockModel> parent(
-					std::dynamic_pointer_cast<const BlockModel>(pm->parent()));
+				const auto parent =
+				    std::dynamic_pointer_cast<const BlockModel>(pm->parent());
 				if (parent && parent->plugin_model()) {
 					label = parent->plugin_model()->port_human_name(pm->index());
 				}
@@ -151,7 +151,7 @@ Port::update_metadata()
 {
 	SPtr<const PortModel> pm = _port_model.lock();
 	if (pm && _app.can_control(pm.get()) && pm->is_numeric()) {
-		SPtr<const BlockModel> parent = std::dynamic_pointer_cast<const BlockModel>(pm->parent());
+		auto parent = std::dynamic_pointer_cast<const BlockModel>(pm->parent());
 		if (parent) {
 			float min = 0.0f;
 			float max = 1.0f;
@@ -231,8 +231,8 @@ Port::on_scale_point_activated(float f)
 Gtk::Menu*
 Port::build_enum_menu()
 {
-	SPtr<const BlockModel> block = std::dynamic_pointer_cast<BlockModel>(model()->parent());
-	Gtk::Menu*             menu  = Gtk::manage(new Gtk::Menu());
+	auto       block = std::dynamic_pointer_cast<BlockModel>(model()->parent());
+	Gtk::Menu* menu  = Gtk::manage(new Gtk::Menu());
 
 	PluginModel::ScalePoints points = block->plugin_model()->port_scale_points(
 		model()->index());
@@ -259,9 +259,9 @@ Port::on_uri_activated(const URI& uri)
 Gtk::Menu*
 Port::build_uri_menu()
 {
-	World&                 world = _app.world();
-	SPtr<const BlockModel> block = std::dynamic_pointer_cast<BlockModel>(model()->parent());
-	Gtk::Menu*             menu  = Gtk::manage(new Gtk::Menu());
+	World&     world = _app.world();
+	auto       block = std::dynamic_pointer_cast<BlockModel>(model()->parent());
+	Gtk::Menu* menu  = Gtk::manage(new Gtk::Menu());
 
 	// Get the port designation, which should be a rdf:Property
 	const Atom& designation_atom = model()->get_property(
@@ -374,8 +374,8 @@ Port::activity(const Atom& value)
 GraphBox*
 Port::get_graph_box() const
 {
-	SPtr<const GraphModel> graph = std::dynamic_pointer_cast<const GraphModel>(model()->parent());
-	GraphBox*              box   = _app.window_factory()->graph_box(graph);
+	auto      graph = std::dynamic_pointer_cast<const GraphModel>(model()->parent());
+	GraphBox* box   = _app.window_factory()->graph_box(graph);
 	if (!box) {
 		graph = std::dynamic_pointer_cast<const GraphModel>(model()->parent()->parent());
 		box   = _app.window_factory()->graph_box(graph);
@@ -515,7 +515,7 @@ Port::on_selected(gboolean b)
 	if (b) {
 		SPtr<const PortModel> pm = _port_model.lock();
 		if (pm) {
-			SPtr<const BlockModel> block =
+			auto block =
 			    std::dynamic_pointer_cast<const BlockModel>(pm->parent());
 
 			GraphWindow* win = _app.window_factory()->parent_graph_window(block);
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index fc25e1c1..fb706c9b 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -108,9 +108,9 @@ PortMenu::on_menu_disconnect()
 void
 PortMenu::on_menu_set_min()
 {
-	const URIs&           uris  = _app->uris();
-	SPtr<const PortModel> model = std::dynamic_pointer_cast<const PortModel>(_object);
-	const Atom&           value = model->get_property(uris.ingen_value);
+	const URIs& uris  = _app->uris();
+	auto        model = std::dynamic_pointer_cast<const PortModel>(_object);
+	const Atom& value = model->get_property(uris.ingen_value);
 	if (value.is_valid()) {
 		_app->set_property(_object->uri(), uris.lv2_minimum, value);
 	}
@@ -119,9 +119,9 @@ PortMenu::on_menu_set_min()
 void
 PortMenu::on_menu_set_max()
 {
-	const URIs&           uris  = _app->uris();
-	SPtr<const PortModel> model = std::dynamic_pointer_cast<const PortModel>(_object);
-	const Atom&           value = model->get_property(uris.ingen_value);
+	const URIs& uris  = _app->uris();
+	auto        model = std::dynamic_pointer_cast<const PortModel>(_object);
+	const Atom& value = model->get_property(uris.ingen_value);
 	if (value.is_valid()) {
 		_app->set_property(_object->uri(), uris.lv2_maximum, value);
 	}
@@ -130,8 +130,8 @@ PortMenu::on_menu_set_max()
 void
 PortMenu::on_menu_reset_range()
 {
-	const URIs&           uris  = _app->uris();
-	SPtr<const PortModel> model = std::dynamic_pointer_cast<const PortModel>(_object);
+	const URIs& uris  = _app->uris();
+	auto        model = std::dynamic_pointer_cast<const PortModel>(_object);
 
 	// Remove lv2:minimum and lv2:maximum properties
 	Properties remove;
@@ -143,9 +143,9 @@ PortMenu::on_menu_reset_range()
 void
 PortMenu::on_menu_expose()
 {
-	const URIs&            uris  = _app->uris();
-	SPtr<const PortModel>  port  = std::dynamic_pointer_cast<const PortModel>(_object);
-	SPtr<const BlockModel> block = std::dynamic_pointer_cast<const BlockModel>(port->parent());
+	const URIs& uris = _app->uris();
+	auto        port = std::dynamic_pointer_cast<const PortModel>(_object);
+	auto block = std::dynamic_pointer_cast<const BlockModel>(port->parent());
 
 	const std::string label = block->label() + " " + block->port_label(port);
 	const Raul::Path  path  = Raul::Path(block->path() + Raul::Symbol("_" + port->symbol()));
diff --git a/src/gui/SubgraphModule.cpp b/src/gui/SubgraphModule.cpp
index 999e06a2..1c89d564 100644
--- a/src/gui/SubgraphModule.cpp
+++ b/src/gui/SubgraphModule.cpp
@@ -49,7 +49,7 @@ SubgraphModule::on_double_click(GdkEventButton* event)
 {
 	assert(_graph);
 
-	SPtr<GraphModel> parent = std::dynamic_pointer_cast<GraphModel>(_graph->parent());
+	auto parent = std::dynamic_pointer_cast<GraphModel>(_graph->parent());
 
 	GraphWindow* const preferred = ( (parent && (event->state & GDK_SHIFT_MASK))
 	                                 ? nullptr
@@ -85,7 +85,7 @@ SubgraphModule::browse_to_graph()
 {
 	assert(_graph->parent());
 
-	SPtr<GraphModel> parent = std::dynamic_pointer_cast<GraphModel>(_graph->parent());
+	auto parent = std::dynamic_pointer_cast<GraphModel>(_graph->parent());
 
 	GraphWindow* const preferred = (parent)
 		? app().window_factory()->graph_window(parent)
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp
index c90efa4b..72d3fc66 100644
--- a/src/gui/ingen_gui_lv2.cpp
+++ b/src/gui/ingen_gui_lv2.cpp
@@ -168,9 +168,9 @@ instantiate(const LV2UI_Descriptor*   descriptor,
 	ui->app->store()->put(ingen::main_uri(), props);
 
 	// Create a GraphBox for the root and set as the UI widget
-	SPtr<const ingen::client::GraphModel> root =
-		std::dynamic_pointer_cast<const ingen::client::GraphModel>(
-			ui->app->store()->object(Raul::Path("/")));
+	auto root = std::dynamic_pointer_cast<const ingen::client::GraphModel>(
+	    ui->app->store()->object(Raul::Path("/")));
+
 	ui->view = ingen::gui::GraphBox::create(*ui->app, root);
 	ui->view->unparent();
 	*widget = ui->view->gobj();
diff --git a/src/server/GraphImpl.cpp b/src/server/GraphImpl.cpp
index a494293d..08c8ccc6 100644
--- a/src/server/GraphImpl.cpp
+++ b/src/server/GraphImpl.cpp
@@ -117,7 +117,7 @@ GraphImpl::duplicate(Engine&             engine,
 
 	// Add duplicates of all arcs
 	for (const auto& a : _arcs) {
-		SPtr<ArcImpl> arc = std::dynamic_pointer_cast<ArcImpl>(a.second);
+		auto arc = std::dynamic_pointer_cast<ArcImpl>(a.second);
 		if (arc) {
 			auto t = port_map.find(arc->tail());
 			auto h = port_map.find(arc->head());
@@ -288,7 +288,7 @@ GraphImpl::remove_arc(const PortImpl* tail, const PortImpl* dst_port)
 	ThreadManager::assert_thread(THREAD_PRE_PROCESS);
 	auto i = _arcs.find(std::make_pair(tail, dst_port));
 	if (i != _arcs.end()) {
-		SPtr<ArcImpl> arc = std::dynamic_pointer_cast<ArcImpl>(i->second);
+		auto arc = std::dynamic_pointer_cast<ArcImpl>(i->second);
 		_arcs.erase(i);
 		return arc;
 	} else {
diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp
index a49fa3e4..dbe57dc0 100644
--- a/src/server/events/Copy.cpp
+++ b/src/server/events/Copy.cpp
@@ -144,7 +144,7 @@ bool
 Copy::engine_to_filesystem(PreProcessContext&)
 {
 	// Ensure source is a graph
-	SPtr<GraphImpl> graph = std::dynamic_pointer_cast<GraphImpl>(_old_block);
+	auto graph = std::dynamic_pointer_cast<GraphImpl>(_old_block);
 	if (!graph) {
 		return Event::pre_process_done(Status::BAD_OBJECT_TYPE, _msg.old_uri);
 	}
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index cc42b3ac..a50b5859 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -624,9 +624,9 @@ ingen_connect_port(LV2_Handle instance, uint32_t port, void* data)
 {
 	using namespace ingen::server;
 
-	auto*                  me     = static_cast<IngenPlugin*>(instance);
-	server::Engine*        engine = static_cast<server::Engine*>(me->world->engine().get());
-	const SPtr<LV2Driver>& driver = std::static_pointer_cast<LV2Driver>(engine->driver());
+	auto*           me     = static_cast<IngenPlugin*>(instance);
+	server::Engine* engine = static_cast<server::Engine*>(me->world->engine().get());
+	const auto      driver = std::static_pointer_cast<LV2Driver>(engine->driver());
 	if (port < driver->ports().size()) {
 		driver->ports().at(port)->set_buffer(data);
 	} else {
@@ -637,9 +637,9 @@ ingen_connect_port(LV2_Handle instance, uint32_t port, void* data)
 static void
 ingen_activate(LV2_Handle instance)
 {
-	auto*                  me     = static_cast<IngenPlugin*>(instance);
-	SPtr<server::Engine>   engine = std::static_pointer_cast<server::Engine>(me->world->engine());
-	const SPtr<LV2Driver>& driver = std::static_pointer_cast<LV2Driver>(engine->driver());
+	auto*      me     = static_cast<IngenPlugin*>(instance);
+	auto       engine = std::static_pointer_cast<server::Engine>(me->world->engine());
+	const auto driver = std::static_pointer_cast<LV2Driver>(engine->driver());
 	engine->activate();
 	me->main = make_unique<std::thread>(ingen_lv2_main, engine, driver);
 }
@@ -647,9 +647,9 @@ ingen_activate(LV2_Handle instance)
 static void
 ingen_run(LV2_Handle instance, uint32_t sample_count)
 {
-	auto*                  me     = static_cast<IngenPlugin*>(instance);
-	SPtr<server::Engine>   engine = std::static_pointer_cast<server::Engine>(me->world->engine());
-	const SPtr<LV2Driver>& driver = std::static_pointer_cast<LV2Driver>(engine->driver());
+	auto*      me     = static_cast<IngenPlugin*>(instance);
+	auto       engine = std::static_pointer_cast<server::Engine>(me->world->engine());
+	const auto driver = std::static_pointer_cast<LV2Driver>(engine->driver());
 
 	server::ThreadManager::set_flag(ingen::server::THREAD_PROCESS);
 	server::ThreadManager::set_flag(ingen::server::THREAD_IS_REAL_TIME);
-- 
cgit v1.2.1