1 files changed, 45 insertions, 41 deletions

diff --git a/src/gui/BreadCrumbs.cpp b/src/gui/BreadCrumbs.cpp
index 4e257d88..5bd4d30a 100644
--- a/src/gui/BreadCrumbs.cpp
+++ b/src/gui/BreadCrumbs.cpp
@@ -19,25 +19,27 @@
 #include "App.hpp"
 #include "GraphView.hpp"
 
-#include "ingen/client/SigClientInterface.hpp"
-#include "raul/Symbol.hpp"
+#include <ingen/Message.hpp>
+#include <ingen/URI.hpp>
+#include <ingen/client/GraphModel.hpp>
+#include <ingen/client/SigClientInterface.hpp>
+#include <raul/Path.hpp>
+#include <raul/Symbol.hpp>
 
-#include <boost/variant/get.hpp>
-#include <glibmm/signalproxy.h>
 #include <sigc++/adaptors/bind.h>
 #include <sigc++/functors/mem_fun.h>
 
+#include <algorithm>
 #include <string>
+#include <variant>
 
-namespace ingen {
-namespace gui {
+namespace ingen::gui {
 
 using std::string;
 
 BreadCrumbs::BreadCrumbs(App& app)
 	: _active_path("/")
 	, _full_path("/")
-	, _enable_signal(true)
 {
 	app.sig_client()->signal_message().connect(
 		sigc::mem_fun(this, &BreadCrumbs::message));
@@ -48,13 +50,13 @@ BreadCrumbs::BreadCrumbs(App& app)
 std::shared_ptr<GraphView>
 BreadCrumbs::view(const raul::Path& path)
 {
-	for (const auto& b : _breadcrumbs) {
-		if (b->path() == path) {
-			return b->view();
-		}
-	}
+	const auto b = std::find_if(_breadcrumbs.begin(),
+	                            _breadcrumbs.end(),
+	                            [&path](const auto* crumb) {
+		                            return crumb->path() == path;
+	                            });
 
-	return nullptr;
+	return b == _breadcrumbs.end() ? nullptr : (*b)->view();
 }
 
 /** Sets up the crumbs to display `path`.
@@ -66,19 +68,19 @@ void
 BreadCrumbs::build(const raul::Path&                 path,
                    const std::shared_ptr<GraphView>& view)
 {
-	bool old_enable_signal = _enable_signal;
+	const bool old_enable_signal = _enable_signal;
 	_enable_signal = false;
 
 	if (!_breadcrumbs.empty() && (path.is_parent_of(_full_path) || path == _full_path)) {
 		// Moving to a path we already contain, just switch the active button
-		for (const auto& b : _breadcrumbs) {
+		for (auto* b : _breadcrumbs) {
 			if (b->path() == path) {
 				b->set_active(true);
 				if (!b->view()) {
 					b->set_view(view);
 				}
 
-				// views are expensive, having two around for the same graph is a bug
+				// Views are expensive, having two around is a bug
 				assert(b->view() == view);
 
 			} else {
@@ -87,13 +89,12 @@ BreadCrumbs::build(const raul::Path&                 path,
 		}
 
 		_active_path = path;
-		_enable_signal = old_enable_signal;
 
 	} else if (!_breadcrumbs.empty() && path.is_child_of(_full_path)) {
-		// Moving to a child of the full path, just append crumbs (preserve view cache)
+		// Moving to a child of the full path, append crumbs (preserve cache)
 
 		string suffix = path.substr(_full_path.length());
-		while (suffix.length() > 0) {
+		while (!suffix.empty()) {
 			if (suffix[0] == '/') {
 				suffix = suffix.substr(1);
 			}
@@ -105,25 +106,25 @@ BreadCrumbs::build(const raul::Path&                 path,
 			but->show();
 			if (suffix.find('/') == string::npos) {
 				break;
-			} else {
-				suffix = suffix.substr(suffix.find('/') + 1);
 			}
+
+			suffix = suffix.substr(suffix.find('/') + 1);
 		}
 
-		for (const auto& b : _breadcrumbs) {
+		for (auto* b : _breadcrumbs) {
 			b->set_active(false);
 		}
 		_breadcrumbs.back()->set_active(true);
 
 	} else {
-		// Rebuild from scratch
-		// Getting here is bad unless absolutely necessary, since the GraphView cache is lost
+		/* Rebuild from scratch.  Getting here is bad unless absolutely
+		   necessary, since the GraphView cache is lost. */
 
 		_full_path = path;
 		_active_path = path;
 
 		// Empty existing breadcrumbs
-		for (const auto& b : _breadcrumbs) {
+		for (auto* b : _breadcrumbs) {
 			remove(*b);
 		}
 		_breadcrumbs.clear();
@@ -136,7 +137,7 @@ BreadCrumbs::build(const raul::Path&                 path,
 
 		raul::Path working_path("/");
 		string suffix = path.substr(1);
-		while (suffix.length() > 0) {
+		while (!suffix.empty()) {
 			if (suffix[0] == '/') {
 				suffix = suffix.substr(1);
 			}
@@ -149,9 +150,9 @@ BreadCrumbs::build(const raul::Path&                 path,
 			but->show();
 			if (suffix.find('/') == string::npos) {
 				break;
-			} else {
-				suffix = suffix.substr(suffix.find('/')+1);
 			}
+
+			suffix = suffix.substr(suffix.find('/')+1);
 		}
 	}
 
@@ -197,7 +198,7 @@ BreadCrumbs::breadcrumb_clicked(BreadCrumb* crumb)
 void
 BreadCrumbs::message(const Message& msg)
 {
-	if (const Del* const del = boost::get<Del>(&msg)) {
+	if (const Del* const del = std::get_if<Del>(&msg)) {
 		object_destroyed(del->uri);
 	}
 }
@@ -205,15 +206,19 @@ BreadCrumbs::message(const Message& msg)
 void
 BreadCrumbs::object_destroyed(const URI& uri)
 {
-	for (auto i = _breadcrumbs.begin(); i != _breadcrumbs.end(); ++i) {
-		if ((*i)->path() == uri.c_str()) {
-			// Remove all crumbs after the removed one (inclusive)
-			for (auto j = i; j != _breadcrumbs.end(); ) {
-				BreadCrumb* bc = *j;
-				j = _breadcrumbs.erase(j);
-				remove(*bc);
-			}
-			break;
+	const auto i = std::find_if(_breadcrumbs.begin(),
+	                            _breadcrumbs.end(),
+	                            [&uri](const auto& b) {
+		                            return b->path() == uri.c_str();
+	                            });
+
+	if (i != _breadcrumbs.end()) {
+		// Remove all crumbs after the removed one (inclusive)
+		for (auto j = i; j != _breadcrumbs.end();) {
+			BreadCrumb* const bc = *j;
+
+			j = _breadcrumbs.erase(j);
+			remove(*bc);
 		}
 	}
 }
@@ -221,12 +226,11 @@ BreadCrumbs::object_destroyed(const URI& uri)
 void
 BreadCrumbs::object_moved(const raul::Path& old_path, const raul::Path& new_path)
 {
-	for (const auto& b : _breadcrumbs) {
+	for (auto* b : _breadcrumbs) {
 		if (b->path() == old_path) {
 			b->set_path(new_path);
 		}
 	}
 }
 
-} // namespace gui
-} // namespace ingen
+} // namespace ingen::gui