Suppress/fix new warnings in clang-tidy 15

4 files changed, 22 insertions, 22 deletions

diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index c492d3e6..f1fd2128 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -75,7 +75,7 @@ ClientStore::add_object(const std::shared_ptr<ObjectModel>& object)
 		std::dynamic_pointer_cast<ObjectModel>(existing->second)->set(object);
 	} else {
 		if (!object->path().is_root()) {
-			std::shared_ptr<ObjectModel> parent = _object(object->path().parent());
+			const std::shared_ptr<ObjectModel> parent = _object(object->path().parent());
 			if (parent) {
 				assert(object->path().is_child_of(parent->path()));
 				object->set_parent(parent);
@@ -200,7 +200,7 @@ ClientStore::resource(const URI& uri) const
 void
 ClientStore::add_plugin(const std::shared_ptr<PluginModel>& pm)
 {
-	std::shared_ptr<PluginModel> existing = _plugin(pm->uri());
+	const std::shared_ptr<PluginModel> existing = _plugin(pm->uri());
 	if (existing) {
 		existing->set(pm);
 	} else {
@@ -285,7 +285,7 @@ ClientStore::operator()(const Put& msg)
 		if (_uris.ingen_Graph == type) {
 			is_graph = true;
 		} else if (_uris.ingen_Internal == type || _uris.lv2_Plugin == type) {
-			std::shared_ptr<PluginModel> p(new PluginModel(uris(), uri, type, properties));
+			const std::shared_ptr<PluginModel> p{new PluginModel(uris(), uri, type, properties)};
 			add_plugin(p);
 			return;
 		}
@@ -309,7 +309,7 @@ ClientStore::operator()(const Put& msg)
 	}
 
 	if (is_graph) {
-		std::shared_ptr<GraphModel> model(new GraphModel(uris(), path));
+		const std::shared_ptr<GraphModel> model{new GraphModel(uris(), path)};
 		model->set_properties(properties);
 		add_object(model);
 	} else if (is_block) {
@@ -330,14 +330,14 @@ ClientStore::operator()(const Put& msg)
 				add_plugin(plug);
 			}
 
-			std::shared_ptr<BlockModel> bm(new BlockModel(uris(), plug, path));
+			const std::shared_ptr<BlockModel> bm{new BlockModel(uris(), plug, path)};
 			bm->set_properties(properties);
 			add_object(bm);
 		} else {
 			_log.warn("Block %1% has no prototype\n", path.c_str());
 		}
 	} else if (is_port) {
-		PortModel::Direction pdir = (is_output)
+		const PortModel::Direction pdir = (is_output)
 			? PortModel::Direction::OUTPUT
 			: PortModel::Direction::INPUT;
 		uint32_t   index = 0;
@@ -346,7 +346,7 @@ ClientStore::operator()(const Put& msg)
 			index = i->second.get<int32_t>();
 		}
 
-		std::shared_ptr<PortModel> p(new PortModel(uris(), path, index, pdir));
+		const std::shared_ptr<PortModel> p{new PortModel(uris(), path, index, pdir)};
 		p->set_properties(properties);
 		add_object(p);
 	} else {
@@ -370,7 +370,7 @@ ClientStore::operator()(const Delta& msg)
 
 	const raul::Path path(uri_to_path(uri));
 
-	std::shared_ptr<ObjectModel> obj = _object(path);
+	const std::shared_ptr<ObjectModel> obj = _object(path);
 	if (obj) {
 		obj->remove_properties(msg.remove);
 		obj->add_properties(msg.add);
@@ -391,7 +391,7 @@ ClientStore::operator()(const SetProperty& msg)
 		          predicate.c_str(), _uris.forge.str(value, false));
 		return;
 	}
-	std::shared_ptr<Resource> subject = _resource(subject_uri);
+	const std::shared_ptr<Resource> subject = _resource(subject_uri);
 	if (subject) {
 		if (predicate == _uris.ingen_activity) {
 			/* Activity is transient, trigger any live actions (like GUI
@@ -401,7 +401,7 @@ ClientStore::operator()(const SetProperty& msg)
 			subject->set_property(predicate, value, msg.ctx);
 		}
 	} else {
-		std::shared_ptr<PluginModel> plugin = _plugin(subject_uri);
+		const std::shared_ptr<PluginModel> plugin = _plugin(subject_uri);
 		if (plugin) {
 			plugin->set_property(predicate, value);
 		} else if (predicate != _uris.ingen_activity) {
@@ -449,8 +449,8 @@ ClientStore::attempt_connection(const raul::Path& tail_path,
 	auto head = std::dynamic_pointer_cast<PortModel>(_object(head_path));
 
 	if (tail && head) {
-		std::shared_ptr<GraphModel> graph = connection_graph(tail_path, head_path);
-		std::shared_ptr<ArcModel>   arc(new ArcModel(tail, head));
+		const std::shared_ptr<GraphModel> graph = connection_graph(tail_path, head_path);
+		const std::shared_ptr<ArcModel>   arc(new ArcModel(tail, head));
 		graph->add_arc(arc);
 		return true;
 	}
diff --git a/src/client/GraphModel.cpp b/src/client/GraphModel.cpp
index 2a998fdf..45d0eb31 100644
--- a/src/client/GraphModel.cpp
+++ b/src/client/GraphModel.cpp
@@ -134,7 +134,7 @@ GraphModel::add_arc(const std::shared_ptr<ArcModel>& arc)
 	assert(arc->head()->parent().get() == this
 	       || arc->head()->parent()->parent().get() == this);
 
-	std::shared_ptr<ArcModel> existing = get_arc(
+	const std::shared_ptr<ArcModel> existing = get_arc(
 		arc->tail().get(), arc->head().get());
 
 	if (existing) {
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index 4371132c..2485fe65 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -106,7 +106,7 @@ PluginModel::get_property(const URI& key) const
 		}
 		str = str.substr(last_delim + 1);
 
-		std::string symbol = raul::Symbol::symbolify(str);
+		const std::string symbol = raul::Symbol::symbolify(str);
 		set_property(_uris.lv2_symbol, _uris.forge.alloc(symbol));
 		return get_property(key);
 	}
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index f0c3834a..a8ae0ee5 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -88,9 +88,9 @@ lv2_ui_write(SuilController controller,
 
 	} else if (format == uris.atom_eventTransfer.urid()) {
 		const auto* atom = static_cast<const LV2_Atom*>(buffer);
-		Atom        val  = Forge::alloc(atom->size,
-		                                atom->type,
-		                                LV2_ATOM_BODY_CONST(atom));
+		const Atom  val =
+		    Forge::alloc(atom->size, atom->type, LV2_ATOM_BODY_CONST(atom));
+
 		ui->signal_property_changed()(port->uri(),
 		                              uris.ingen_activity,
 		                              val,
@@ -122,8 +122,8 @@ lv2_ui_subscribe(SuilController            controller,
                  uint32_t                  protocol,
                  const LV2_Feature* const* features)
 {
-	auto* const           ui   = static_cast<PluginUI*>(controller);
-	std::shared_ptr<const PortModel> port = get_port(ui, port_index);
+	auto* const ui = static_cast<PluginUI*>(controller);
+	const std::shared_ptr<const PortModel> port = get_port(ui, port_index);
 	if (!port) {
 		return 1;
 	}
@@ -173,7 +173,7 @@ PluginUI::PluginUI(ingen::World&                     world,
 
 PluginUI::~PluginUI()
 {
-	for (uint32_t i : _subscribed_ports) {
+	for (const uint32_t i : _subscribed_ports) {
 		lv2_ui_unsubscribe(this, i, 0, nullptr);
 	}
 	suil_instance_free(_instance);
@@ -259,7 +259,7 @@ PluginUI::instantiate()
 			                   plugin_uri, lilv_node_as_string(_ui_node));
 		} else if (!strcmp(lilv_node_as_uri(plug), plugin_uri.c_str())) {
 			// Notification is valid and for this plugin
-			uint32_t index = lv2_ui_port_index(this, lilv_node_as_string(sym));
+			const uint32_t index = lv2_ui_port_index(this, lilv_node_as_string(sym));
 			if (index != LV2UI_INVALID_PORT_INDEX) {
 				lv2_ui_subscribe(this, index, 0, nullptr);
 				_subscribed_ports.insert(index);
@@ -293,7 +293,7 @@ PluginUI::instantiate()
 	if (!_instance) {
 		_world.log().error("Failed to instantiate LV2 UI\n");
 		// Cancel any subscriptions
-		for (uint32_t i : _subscribed_ports) {
+		for (const uint32_t i : _subscribed_ports) {
 			lv2_ui_unsubscribe(this, i, 0, nullptr);
 		}
 		return false;