Use auto when declaring iterators

10 files changed, 64 insertions, 69 deletions

diff --git a/src/gui/.clang-tidy b/src/gui/.clang-tidy
index c99c9007..e258f145 100644
--- a/src/gui/.clang-tidy
+++ b/src/gui/.clang-tidy
@@ -9,7 +9,6 @@ Checks: >
   -*-non-private-member-variables-in-classes,
   -*-special-member-functions,
   -*-uppercase-literal-suffix,
-  -*-use-auto,
   -abseil-string-find-str-contains,
   -altera-*,
   -android-cloexec-*,
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index dc51df1d..3187548a 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -376,7 +376,7 @@ App::status_text() const
 void
 App::port_activity(Port* port)
 {
-	std::pair<ActivityPorts::iterator, bool> inserted = _activity_ports.emplace(port, false);
+	const auto inserted = _activity_ports.emplace(port, false);
 	if (inserted.second) {
 		inserted.first->second = false;
 	}
diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp
index ee3013b1..14258a5a 100644
--- a/src/gui/GraphBox.cpp
+++ b/src/gui/GraphBox.cpp
@@ -717,18 +717,17 @@ GraphBox::event_export_image()
 		dialog.set_transient_for(*_window);
 	}
 
-	using Types = std::map<std::string, std::string>;
-	Types types;
+	std::map<std::string, std::string> types;
 	types["*.dot"] = "Graphviz DOT";
 	types["*.pdf"] = "Portable Document Format";
 	types["*.ps"]  = "PostScript";
 	types["*.svg"] = "Scalable Vector Graphics";
-	for (Types::const_iterator t = types.begin(); t != types.end(); ++t) {
+	for (const auto& t : types) {
 		Gtk::FileFilter filt;
-		filt.add_pattern(t->first);
-		filt.set_name(t->second);
+		filt.add_pattern(t.first);
+		filt.set_name(t.second);
 		dialog.add_filter(filt);
-		if (t->first == "*.pdf") {
+		if (t.first == "*.pdf") {
 			dialog.set_filter(filt);
 		}
 	}
diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp
index 77c33052..6b62e0de 100644
--- a/src/gui/GraphCanvas.cpp
+++ b/src/gui/GraphCanvas.cpp
@@ -284,7 +284,7 @@ GraphCanvas::build()
 	const Store::const_range kids = _app.store()->children_range(_graph);
 
 	// Create modules for blocks
-	for (Store::const_iterator i = kids.first; i != kids.second; ++i) {
+	for (auto i = kids.first; i != kids.second; ++i) {
 		auto block = std::dynamic_pointer_cast<BlockModel>(i->second);
 		if (block && block->parent() == _graph) {
 			add_block(block);
@@ -707,8 +707,6 @@ GraphCanvas::copy_selection()
 void
 GraphCanvas::paste()
 {
-	using PropIter = Properties::const_iterator;
-
 	std::lock_guard<std::mutex> lock(_app.world().rdf_mutex());
 
 	const Glib::ustring str    = Gtk::Clipboard::get()->wait_for_text();
@@ -807,8 +805,8 @@ GraphCanvas::paste()
 		}
 
 		// Set coordinates so paste origin is at the mouse pointer
-		PropIter xi = node->properties().find(uris.ingen_canvasX);
-		PropIter yi = node->properties().find(uris.ingen_canvasY);
+		const auto xi = node->properties().find(uris.ingen_canvasX);
+		const auto yi = node->properties().find(uris.ingen_canvasY);
 		if (xi != node->properties().end()) {
 			const float x = xi->second.get<float>() - min_x + paste_x;
 			props.insert({xi->first, Property(_app.forge().make(x),
diff --git a/src/gui/GraphTreeWindow.cpp b/src/gui/GraphTreeWindow.cpp
index e1ef158f..98b90ff0 100644
--- a/src/gui/GraphTreeWindow.cpp
+++ b/src/gui/GraphTreeWindow.cpp
@@ -108,8 +108,8 @@ void
 GraphTreeWindow::add_graph(const std::shared_ptr<GraphModel>& pm)
 {
 	if (!pm->parent()) {
-		Gtk::TreeModel::iterator iter = _graph_treestore->append();
-		Gtk::TreeModel::Row row = *iter;
+		const auto iter = _graph_treestore->append();
+		auto       row  = *iter;
 		if (pm->path().is_root()) {
 			row[_graph_tree_columns.name_col] = _app->interface()->uri().string();
 		} else {
@@ -119,12 +119,13 @@ GraphTreeWindow::add_graph(const std::shared_ptr<GraphModel>& pm)
 		row[_graph_tree_columns.graph_model_col] = pm;
 		_graphs_treeview->expand_row(_graph_treestore->get_path(iter), true);
 	} else {
-		Gtk::TreeModel::Children children = _graph_treestore->children();
-		Gtk::TreeModel::iterator c = find_graph(children, pm->parent());
+		const auto& children = _graph_treestore->children();
+		auto        c        = find_graph(children, pm->parent());
 
 		if (c != children.end()) {
-			Gtk::TreeModel::iterator iter = _graph_treestore->append(c->children());
-			Gtk::TreeModel::Row row = *iter;
+			const auto iter = _graph_treestore->append(c->children());
+			auto       row  = *iter;
+
 			row[_graph_tree_columns.name_col] = pm->symbol().c_str();
 			row[_graph_tree_columns.enabled_col] = pm->enabled();
 			row[_graph_tree_columns.graph_model_col] = pm;
@@ -148,7 +149,7 @@ GraphTreeWindow::add_graph(const std::shared_ptr<GraphModel>& pm)
 void
 GraphTreeWindow::remove_graph(const std::shared_ptr<GraphModel>& pm)
 {
-	Gtk::TreeModel::iterator i = find_graph(_graph_treestore->children(), pm);
+	const auto i = find_graph(_graph_treestore->children(), pm);
 	if (i != _graph_treestore->children().end()) {
 		_graph_treestore->erase(i);
 	}
@@ -158,12 +159,12 @@ Gtk::TreeModel::iterator
 GraphTreeWindow::find_graph(Gtk::TreeModel::Children                    root,
                             const std::shared_ptr<client::ObjectModel>& graph)
 {
-	for (Gtk::TreeModel::iterator c = root.begin(); c != root.end(); ++c) {
+	for (auto c = root.begin(); c != root.end(); ++c) {
 		std::shared_ptr<GraphModel> pm = (*c)[_graph_tree_columns.graph_model_col];
 		if (graph == pm) {
 			return c;
 		} else if (!(*c)->children().empty()) {
-			Gtk::TreeModel::iterator ret = find_graph(c->children(), graph);
+			auto ret = find_graph(c->children(), graph);
 			if (ret != c->children().end()) {
 				return ret;
 			}
@@ -177,10 +178,12 @@ GraphTreeWindow::find_graph(Gtk::TreeModel::Children                    root,
 void
 GraphTreeWindow::show_graph_menu(GdkEventButton* ev)
 {
-	Gtk::TreeModel::iterator active = _graph_tree_selection->get_selected();
+	const auto active = _graph_tree_selection->get_selected();
 	if (active) {
-		Gtk::TreeModel::Row         row = *active;
-		std::shared_ptr<GraphModel> pm  = row[_graph_tree_columns.graph_model_col];
+		auto row = *active;
+		auto col = _graph_tree_columns.graph_model_col;
+
+		const std::shared_ptr<GraphModel>& pm = row[col];
 		if (pm) {
 			_app->log().warn("TODO: graph menu from tree window");
 		}
@@ -191,9 +194,10 @@ void
 GraphTreeWindow::event_graph_activated(const Gtk::TreeModel::Path& path,
                                        Gtk::TreeView::Column*      col)
 {
-	Gtk::TreeModel::iterator    active = _graph_treestore->get_iter(path);
-	Gtk::TreeModel::Row         row    = *active;
-	std::shared_ptr<GraphModel> pm     = row[_graph_tree_columns.graph_model_col];
+	const auto active = _graph_treestore->get_iter(path);
+	auto       row    = *active;
+
+	std::shared_ptr<GraphModel> pm = row[_graph_tree_columns.graph_model_col];
 
 	_app->window_factory()->present_graph(pm);
 }
@@ -201,9 +205,9 @@ GraphTreeWindow::event_graph_activated(const Gtk::TreeModel::Path& path,
 void
 GraphTreeWindow::event_graph_enabled_toggled(const Glib::ustring& path_str)
 {
-	Gtk::TreeModel::Path     path(path_str);
-	Gtk::TreeModel::iterator active = _graph_treestore->get_iter(path);
-	Gtk::TreeModel::Row      row    = *active;
+	Gtk::TreeModel::Path path(path_str);
+	auto                 active = _graph_treestore->get_iter(path);
+	auto                 row    = *active;
 
 	std::shared_ptr<GraphModel> pm = row[_graph_tree_columns.graph_model_col];
 	assert(pm);
@@ -224,9 +228,9 @@ GraphTreeWindow::graph_property_changed(
 	const URIs& uris = _app->uris();
 	_enable_signal = false;
 	if (key == uris.ingen_enabled && value.type() == uris.forge.Bool) {
-		Gtk::TreeModel::iterator i = find_graph(_graph_treestore->children(), graph);
+		const auto i = find_graph(_graph_treestore->children(), graph);
 		if (i != _graph_treestore->children().end()) {
-			Gtk::TreeModel::Row row = *i;
+			auto row = *i;
 			row[_graph_tree_columns.enabled_col] = value.get<int32_t>();
 		} else {
 			_app->log().error("Unable to find graph %1%\n", graph->path());
@@ -240,11 +244,9 @@ GraphTreeWindow::graph_moved(const std::shared_ptr<GraphModel>& graph)
 {
 	_enable_signal = false;
 
-	Gtk::TreeModel::iterator i
-		= find_graph(_graph_treestore->children(), graph);
-
+	auto i = find_graph(_graph_treestore->children(), graph);
 	if (i != _graph_treestore->children().end()) {
-		Gtk::TreeModel::Row row = *i;
+		auto row = *i;
 		row[_graph_tree_columns.name_col] = graph->symbol().c_str();
 	} else {
 		_app->log().error("Unable to find graph %1%\n", graph->path());
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index 5a9536a2..e147fdf2 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -102,8 +102,9 @@ LoadPluginWindow::LoadPluginWindow(BaseObjectType*                   cobject,
 	_criteria_liststore = Gtk::ListStore::create(_criteria_columns);
 	_filter_combo->set_model(_criteria_liststore);
 
-	Gtk::TreeModel::iterator iter = _criteria_liststore->append();
-	Gtk::TreeModel::Row      row  = *iter;
+	auto iter = _criteria_liststore->append();
+	auto row  = *iter;
+
 	row[_criteria_columns._col_label] = "Name contains";
 	row[_criteria_columns._col_criteria] = CriteriaColumns::Criteria::NAME;
 	_filter_combo->set_active(iter);
@@ -326,8 +327,8 @@ LoadPluginWindow::add_plugin(const std::shared_ptr<const PluginModel>& plugin)
 		return;
 	}
 
-	Gtk::TreeModel::iterator iter = _plugins_liststore->append();
-	Gtk::TreeModel::Row      row  = *iter;
+	auto iter = _plugins_liststore->append();
+	auto row  = *iter;
 	_rows.emplace(plugin->uri(), iter);
 
 	set_row(row, plugin);
@@ -355,13 +356,16 @@ LoadPluginWindow::plugin_selection_changed()
 		_name_entry->set_text("");
 		_name_entry->set_sensitive(false);
 	} else if (n_selected == 1) {
-		Gtk::TreeModel::iterator iter = _plugins_liststore->get_iter(
-			*_selection->get_selected_rows().begin());
+		auto iter = _plugins_liststore->get_iter(
+		    *_selection->get_selected_rows().begin());
 		if (iter) {
-			Gtk::TreeModel::Row row = *iter;
-			auto                p = row.get_value(_plugins_columns._col_plugin);
-			_name_offset = _app->store()->child_name_offset(
-				_graph->path(), p->default_block_symbol());
+			auto row = *iter;
+			auto p   = row.get_value(_plugins_columns._col_plugin);
+
+			_name_offset =
+			    _app->store()->child_name_offset(_graph->path(),
+			                                     p->default_block_symbol());
+
 			_name_entry->set_text(generate_module_name(p, _name_offset));
 			_name_entry->set_sensitive(true);
 		} else {
@@ -397,11 +401,11 @@ LoadPluginWindow::generate_module_name(
 void
 LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter)
 {
-	const URIs&         uris       = _app->uris();
-	Gtk::TreeModel::Row row        = *iter;
-	auto                plugin     = row.get_value(_plugins_columns._col_plugin);
-	bool                polyphonic = _polyphonic_checkbutton->get_active();
-	string              name       = _name_entry->get_text();
+	const URIs& uris       = _app->uris();
+	auto        row        = *iter;
+	auto        plugin     = row.get_value(_plugins_columns._col_plugin);
+	bool        polyphonic = _polyphonic_checkbutton->get_active();
+	string      name       = _name_entry->get_text();
 
 	if (name.empty()) {
 		name = generate_module_name(plugin, _name_offset);
@@ -451,7 +455,7 @@ LoadPluginWindow::filter_changed()
 	transform(search.begin(), search.end(), search.begin(), ::toupper);
 
 	// Get selected criteria
-	const Gtk::TreeModel::Row row = *(_filter_combo->get_active());
+	const auto row = *(_filter_combo->get_active());
 	CriteriaColumns::Criteria criteria = row[_criteria_columns._col_criteria];
 
 	string field;
@@ -523,7 +527,7 @@ LoadPluginWindow::plugin_property_changed(const URI&  plugin,
 {
 	const URIs& uris = _app->uris();
 	if (predicate == uris.doap_name) {
-		Rows::const_iterator i = _rows.find(plugin);
+		const auto i = _rows.find(plugin);
 		if (i != _rows.end() && value.type() == uris.forge.String) {
 			(*i->second)[_plugins_columns._col_name] = value.ptr<char>();
 		}
diff --git a/src/gui/PluginMenu.cpp b/src/gui/PluginMenu.cpp
index 7ddfd075..66cf9b35 100644
--- a/src/gui/PluginMenu.cpp
+++ b/src/gui/PluginMenu.cpp
@@ -78,8 +78,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 +86,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 +110,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));
diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp
index afcfa827..cd2a6bd1 100644
--- a/src/gui/PropertiesWindow.cpp
+++ b/src/gui/PropertiesWindow.cpp
@@ -276,8 +276,9 @@ PropertiesWindow::set_object(const std::shared_ptr<const ObjectModel>& model)
 	}
 
 	for (const auto& e : entries) {
-		Gtk::ListStore::iterator ki  = _key_store->append();
-		Gtk::ListStore::Row      row = *ki;
+		auto ki  = _key_store->append();
+		auto row = *ki;
+
 		row[_combo_columns.uri_col]   = e.second.string();
 		row[_combo_columns.label_col] = e.first;
 	}
@@ -521,7 +522,7 @@ PropertiesWindow::on_change(const URI& key)
 std::string
 PropertiesWindow::active_key() const
 {
-	const Gtk::ListStore::iterator iter = _key_combo->get_active();
+	const auto iter = _key_combo->get_active();
 	if (!iter) {
 		return "";
 	}
diff --git a/src/gui/RDFS.cpp b/src/gui/RDFS.cpp
index ed8d7e8c..fc722479 100644
--- a/src/gui/RDFS.cpp
+++ b/src/gui/RDFS.cpp
@@ -118,13 +118,10 @@ datatypes(World& world, URISet& types, bool super)
 URISet
 types(World& world, const std::shared_ptr<const client::ObjectModel>& model)
 {
-	using PropIter  = Properties::const_iterator;
-	using PropRange = std::pair<PropIter, PropIter>;
-
 	// Start with every rdf:type
 	URISet types;
 	types.insert(URI(LILV_NS_RDFS "Resource"));
-	PropRange range = model->properties().equal_range(world.uris().rdf_type);
+	const auto range = model->properties().equal_range(world.uris().rdf_type);
 	for (auto t = range.first; t != range.second; ++t) {
 		if (t->second.type() == world.forge().URI ||
 		    t->second.type() == world.forge().URID) {
diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp
index ae396b61..b4117b08 100644
--- a/src/gui/WindowFactory.cpp
+++ b/src/gui/WindowFactory.cpp
@@ -18,7 +18,6 @@
 
 #include "App.hpp"
 #include "GraphBox.hpp"
-#include "GraphView.hpp"
 #include "GraphWindow.hpp"
 #include "LoadGraphWindow.hpp"
 #include "LoadPluginWindow.hpp"