1 files changed, 17 insertions, 23 deletions

diff --git a/src/gui/PluginMenu.cpp b/src/gui/PluginMenu.cpp
index 7ddfd075..26bbed08 100644
--- a/src/gui/PluginMenu.cpp
+++ b/src/gui/PluginMenu.cpp
@@ -16,15 +16,15 @@
 
 #include "PluginMenu.hpp"
 
-#include "ingen/Log.hpp"
-#include "ingen/URIs.hpp"
-#include "ingen/World.hpp"
-#include "ingen/client/PluginModel.hpp"
+#include <ingen/Log.hpp>
+#include <ingen/URIs.hpp>
+#include <ingen/World.hpp>
+#include <ingen/client/PluginModel.hpp>
+#include <lilv/lilv.h>
 
 #include <glibmm/ustring.h>
 #include <gtkmm/menu_elems.h>
 #include <gtkmm/menuitem.h>
-#include <gtkmm/menushell.h>
 #include <gtkmm/object.h>
 #include <sigc++/adaptors/bind.h>
 #include <sigc++/functors/mem_fun.h>
@@ -32,8 +32,7 @@
 #include <memory>
 #include <utility>
 
-namespace ingen {
-namespace gui {
+namespace ingen::gui {
 
 PluginMenu::PluginMenu(ingen::World& world)
 	: _world(world)
@@ -56,7 +55,7 @@ PluginMenu::clear()
 
 	// Build skeleton
 	LV2Children children;
-	LILV_FOREACH(plugin_classes, i, classes) {
+	LILV_FOREACH (plugin_classes, i, classes) {
 		const LilvPluginClass* c = lilv_plugin_classes_get(classes, i);
 		const LilvNode*        p = lilv_plugin_class_get_parent_uri(c);
 		if (!p) {
@@ -78,8 +77,6 @@ PluginMenu::clear()
 void
 PluginMenu::add_plugin(const std::shared_ptr<client::PluginModel>& p)
 {
-	using iterator = ClassMenus::iterator;
-
 	if (!p->lilv_plugin() || lilv_plugin_is_replaced(p->lilv_plugin())) {
 		return;
 	}
@@ -88,7 +85,7 @@ PluginMenu::add_plugin(const std::shared_ptr<client::PluginModel>& p)
 	const LilvNode*        class_uri     = lilv_plugin_class_get_uri(pc);
 	const char*            class_uri_str = lilv_node_as_string(class_uri);
 
-	std::pair<iterator, iterator> range = _class_menus.equal_range(class_uri_str);
+	const auto range = _class_menus.equal_range(class_uri_str);
 	if (range.first == _class_menus.end() || range.first == range.second
 	    || range.first->second.menu == this) {
 		// Add to uncategorized plugin menu
@@ -112,16 +109,14 @@ PluginMenu::build_plugin_class_menu(Gtk::Menu*               menu,
 	const LilvNode* class_uri     = lilv_plugin_class_get_uri(plugin_class);
 	const char*     class_uri_str = lilv_node_as_string(class_uri);
 
-	const std::pair<LV2Children::const_iterator, LV2Children::const_iterator> kids
-		= children.equal_range(class_uri_str);
-
+	const auto kids = children.equal_range(class_uri_str);
 	if (kids.first == children.end()) {
 		return 0;
 	}
 
 	// Add submenus
 	ancestors.insert(class_uri_str);
-	for (LV2Children::const_iterator i = kids.first; i != kids.second; ++i) {
+	for (auto i = kids.first; i != kids.second; ++i) {
 		const LilvPluginClass* c = i->second;
 		const char* sub_label_str = lilv_node_as_string(lilv_plugin_class_get_label(c));
 		const char* sub_uri_str   = lilv_node_as_string(lilv_plugin_class_get_uri(c));
@@ -131,7 +126,7 @@ PluginMenu::build_plugin_class_menu(Gtk::Menu*               menu,
 			return 0;
 		}
 
-		Gtk::Menu_Helpers::MenuElem menu_elem = Gtk::Menu_Helpers::MenuElem(
+		const Gtk::Menu_Helpers::MenuElem menu_elem = Gtk::Menu_Helpers::MenuElem(
 			std::string("_") + sub_label_str);
 		menu->items().push_back(menu_elem);
 		Gtk::MenuItem* menu_item = &(menu->items().back());
@@ -139,7 +134,7 @@ PluginMenu::build_plugin_class_menu(Gtk::Menu*               menu,
 		Gtk::Menu* submenu = Gtk::manage(new Gtk::Menu());
 		menu_item->set_submenu(*submenu);
 
-		size_t num_child_items = build_plugin_class_menu(
+		const size_t num_child_items = build_plugin_class_menu(
 			submenu, c, classes, children, ancestors);
 
 		_class_menus.emplace(sub_uri_str, MenuRecord(menu_item, submenu));
@@ -163,10 +158,10 @@ PluginMenu::add_plugin_to_menu(MenuRecord&                                 menu,
 	LilvNode*   ingen_Graph = lilv_new_uri(lworld, uris.ingen_Graph.c_str());
 	LilvNode*   rdf_type    = lilv_new_uri(lworld, uris.rdf_type.c_str());
 
-	bool is_graph = lilv_world_ask(lworld,
-	                               lilv_plugin_get_uri(p->lilv_plugin()),
-	                               rdf_type,
-	                               ingen_Graph);
+	const bool is_graph = lilv_world_ask(lworld,
+	                                     lilv_plugin_get_uri(p->lilv_plugin()),
+	                                     rdf_type,
+	                                     ingen_Graph);
 
 	menu.menu->items().push_back(
 		Gtk::Menu_Helpers::MenuElem(
@@ -187,5 +182,4 @@ PluginMenu::load_plugin(const std::weak_ptr<client::PluginModel>& weak_plugin)
 	signal_load_plugin.emit(weak_plugin);
 }
 
-} // namespace gui
-} // namespace ingen
+} // namespace ingen::gui