6 files changed, 9 insertions, 11 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 4be4bbd5..c5727617 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -202,7 +202,7 @@ App::detach()
 		_loader.reset();
 		_store.reset();
 		_client.reset();
-		_world.set_interface(SPtr<Interface>());
+		_world.set_interface(nullptr);
 	}
 }
 
diff --git a/src/gui/BreadCrumbs.cpp b/src/gui/BreadCrumbs.cpp
index 5dbdab17..b75c8670 100644
--- a/src/gui/BreadCrumbs.cpp
+++ b/src/gui/BreadCrumbs.cpp
@@ -49,7 +49,7 @@ BreadCrumbs::view(const Raul::Path& path)
 		}
 	}
 
-	return SPtr<GraphView>();
+	return nullptr;
 }
 
 /** Sets up the crumbs to display `path`.
@@ -158,10 +158,8 @@ BreadCrumbs::build(const Raul::Path& path, const SPtr<GraphView>& view)
 BreadCrumbs::BreadCrumb*
 BreadCrumbs::create_crumb(const Raul::Path& path, const SPtr<GraphView>& view)
 {
-	BreadCrumb* but = manage(
-		new BreadCrumb(path,
-		               ((view && path == view->graph()->path())
-		                ? view : SPtr<GraphView>())));
+	BreadCrumb* but = manage(new BreadCrumb(
+	    path, ((view && path == view->graph()->path()) ? view : nullptr)));
 
 	but->signal_toggled().connect(
 		sigc::bind(sigc::mem_fun(this, &BreadCrumbs::breadcrumb_clicked),
diff --git a/src/gui/BreadCrumbs.hpp b/src/gui/BreadCrumbs.hpp
index d62a7ee0..6f42e573 100644
--- a/src/gui/BreadCrumbs.hpp
+++ b/src/gui/BreadCrumbs.hpp
@@ -65,7 +65,7 @@ private:
 	{
 	public:
 		BreadCrumb(const Raul::Path&      path,
-		           const SPtr<GraphView>& view = SPtr<GraphView>())
+		           const SPtr<GraphView>& view = nullptr)
 		    : _path(path)
 		    , _view(view)
 		{
@@ -103,7 +103,7 @@ private:
 	};
 
 	BreadCrumb* create_crumb(const Raul::Path&      path,
-	                         const SPtr<GraphView>& view = SPtr<GraphView>());
+	                         const SPtr<GraphView>& view = nullptr);
 
 	void breadcrumb_clicked(BreadCrumb* crumb);
 
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 16e88235..3e5e5d7c 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -292,7 +292,7 @@ ConnectWindow::disconnect()
 	_attached = false;
 
 	_app->detach();
-	set_connected_to(SPtr<ingen::Interface>());
+	set_connected_to(nullptr);
 
 	if (!_widgets_loaded) {
 		return;
diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp
index 56bb45d2..571bc61a 100644
--- a/src/gui/GraphBox.cpp
+++ b/src/gui/GraphBox.cpp
@@ -197,7 +197,7 @@ GraphBox::create(App& app, const SPtr<const GraphModel>& graph)
 	Glib::RefPtr<Gtk::Builder> xml = WidgetFactory::create("graph_win");
 	xml->get_widget_derived("graph_win_vbox", result);
 	result->init_box(app);
-	result->set_graph(graph, SPtr<GraphView>());
+	result->set_graph(graph, nullptr);
 
 	if (app.is_plugin()) {
 		result->_menu_close->set_sensitive(false);
diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp
index 77d84ac6..5b1a6984 100644
--- a/src/gui/WindowFactory.hpp
+++ b/src/gui/WindowFactory.hpp
@@ -63,7 +63,7 @@ public:
 	void present_graph(
 		SPtr<const client::GraphModel> graph,
 		GraphWindow*                   preferred = nullptr,
-		SPtr<GraphView>                view      = SPtr<GraphView>());
+		SPtr<GraphView>                view      = nullptr);
 
 	void present_load_plugin(SPtr<const client::GraphModel> graph, Properties data=Properties());
 	void present_load_graph(SPtr<const client::GraphModel> graph, Properties data=Properties());