8 files changed, 15 insertions, 14 deletions
diff --git a/src/server/CompiledGraph.cpp b/src/server/CompiledGraph.cpp
index ba4cc11e..3c6b6172 100644
--- a/src/server/CompiledGraph.cpp
+++ b/src/server/CompiledGraph.cpp
@@ -82,7 +82,7 @@ CompiledGraph::compile(Raul::Maid& maid, GraphImpl& graph)
 		} else {
 			log.error("Feedback compiling %1%\n", e.node->path());
 		}
-		return MPtr<CompiledGraph>();
+		return nullptr;
 	}
 }
 
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index ae5b297f..efc152d5 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -169,7 +169,7 @@ Engine::~Engine()
 		store->clear();
 	}
 
-	_world.set_store(SPtr<ingen::Store>());
+	_world.set_store(nullptr);
 }
 
 void
@@ -406,7 +406,7 @@ Engine::activate()
 
 		enqueue_event(
 			new events::CreateGraph(
-				*this, SPtr<Interface>(), -1, 0, Raul::Path("/"), properties));
+				*this, nullptr, -1, 0, Raul::Path("/"), properties));
 
 		flush_events(std::chrono::milliseconds(10));
 		if (!_root_graph) {
diff --git a/src/server/GraphImpl.cpp b/src/server/GraphImpl.cpp
index 08c8ccc6..4d1d7856 100644
--- a/src/server/GraphImpl.cpp
+++ b/src/server/GraphImpl.cpp
@@ -292,7 +292,7 @@ GraphImpl::remove_arc(const PortImpl* tail, const PortImpl* dst_port)
 		_arcs.erase(i);
 		return arc;
 	} else {
-		return SPtr<ArcImpl>();
+		return nullptr;
 	}
 }
 
diff --git a/src/server/LV2Block.cpp b/src/server/LV2Block.cpp
index c555ac4a..7855a0f1 100644
--- a/src/server/LV2Block.cpp
+++ b/src/server/LV2Block.cpp
@@ -90,7 +90,7 @@ LV2Block::make_instance(URIs&      uris,
 	if (!inst) {
 		engine.log().error("Failed to instantiate <%1%>\n",
 		                   _lv2_plugin->uri().c_str());
-		return SPtr<Instance>();
+		return nullptr;
 	}
 
 	const LV2_Options_Interface* options_iface = nullptr;
@@ -148,7 +148,7 @@ LV2Block::make_instance(URIs&      uris,
 							"%1% auto-morphed to unknown type %2%\n",
 							port->path().c_str(),
 							type);
-						return SPtr<Instance>();
+						return nullptr;
 					}
 				} else {
 					parent_graph()->engine().log().error(
@@ -178,7 +178,7 @@ LV2Block::prepare_poly(BufferFactory& bufs, uint32_t poly)
 	const SampleRate rate = bufs.engine().sample_rate();
 	assert(!_prepared_instances);
 	_prepared_instances = bufs.maid().make_managed<Instances>(
-		poly, *_instances, SPtr<Instance>());
+		poly, *_instances, nullptr);
 	for (uint32_t i = _polyphony; i < _prepared_instances->size(); ++i) {
 		SPtr<Instance> inst = make_instance(bufs.uris(), rate, i, true);
 		if (!inst) {
@@ -436,7 +436,7 @@ LV2Block::instantiate(BufferFactory& bufs, const LilvState* state)
 	// Actually create plugin instances and port buffers.
 	const SampleRate rate = bufs.engine().sample_rate();
 	_instances = bufs.maid().make_managed<Instances>(
-		_polyphony, SPtr<Instance>());
+		_polyphony, nullptr);
 	for (uint32_t i = 0; i < _polyphony; ++i) {
 		_instances->at(i) = make_instance(bufs.uris(), rate, i, false);
 		if (!_instances->at(i)) {
diff --git a/src/server/LV2ResizeFeature.hpp b/src/server/LV2ResizeFeature.hpp
index 1bd93ee0..322aacb8 100644
--- a/src/server/LV2ResizeFeature.hpp
+++ b/src/server/LV2ResizeFeature.hpp
@@ -46,8 +46,9 @@ struct ResizeFeature : public ingen::LV2Features::Feature {
 
 	SPtr<LV2_Feature> feature(World& w, Node* n) {
 		BlockImpl* block = dynamic_cast<BlockImpl*>(n);
-		if (!block)
-			return SPtr<LV2_Feature>();
+		if (!block) {
+			return nullptr;
+		}
 		LV2_Resize_Port_Resize* data
 			= (LV2_Resize_Port_Resize*)malloc(sizeof(LV2_Resize_Port_Resize));
 		data->data   = block;
diff --git a/src/server/PreProcessContext.hpp b/src/server/PreProcessContext.hpp
index 7579e1e2..a1bdbb5f 100644
--- a/src/server/PreProcessContext.hpp
+++ b/src/server/PreProcessContext.hpp
@@ -67,7 +67,7 @@ public:
 		if (must_compile(graph)) {
 			return compile(maid, graph);
 		}
-		return MPtr<CompiledGraph>();
+		return nullptr;
 	}
 
 	/** Return all graphs that require compilation after an atomic bundle. */
diff --git a/src/server/Worker.cpp b/src/server/Worker.cpp
index 69f9eec6..1180fa47 100644
--- a/src/server/Worker.cpp
+++ b/src/server/Worker.cpp
@@ -96,7 +96,7 @@ Worker::Schedule::feature(World&, Node* n)
 {
 	auto* block = dynamic_cast<LV2Block*>(n);
 	if (!block) {
-		return SPtr<LV2_Feature>();
+		return nullptr;
 	}
 
 	auto* data = static_cast<LV2_Worker_Schedule*>(malloc(sizeof(LV2_Worker_Schedule)));
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index a50b5859..e5abcc92 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -672,8 +672,8 @@ static void
 ingen_cleanup(LV2_Handle instance)
 {
 	auto* me = static_cast<IngenPlugin*>(instance);
-	me->world->set_engine(SPtr<ingen::server::Engine>());
-	me->world->set_interface(SPtr<ingen::Interface>());
+	me->world->set_engine(nullptr);
+	me->world->set_interface(nullptr);
 	if (me->main) {
 		me->main->join();
 		me->main.reset();