Use mcl::container for Model::Columns

monocasual · Apr 18, 2024 · 0ccb028 · 0ccb028
1 parent 63f84a3
commit 0ccb028
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/glue/channel.cpp b/src/glue/channel.cpp
@@ -164,7 +164,7 @@ Data getData(ID channelId)
 std::vector<Column> getColumns()
 {
 	std::vector<Column> out;
-	for (const v::Model::Column& modelColumn : g_ui->model.columns.getAll()) // Model::columns is the source of truth
+	for (const v::Model::Column& modelColumn : g_ui->model.columns) // Model::columns is the source of truth
 		out.push_back(makeColumn_(modelColumn));
 	return out;
 }

diff --git a/src/gui/model.cpp b/src/gui/model.cpp
@@ -87,7 +87,7 @@ void Model::store(m::Patch& patch) const
 {
 	patch.name = projectName;
 
-	for (const Column& column : columns.getAll())
+	for (const Column& column : columns)
 	{
 		m::Patch::Column pcolumn;
 		pcolumn.width = column.width;
@@ -168,7 +168,7 @@ Model::Column& Model::getColumnByIndex(int index)
 
 Model::Column& Model::getColumnByChannelId(ID channelId)
 {
-	return *u::vector::findIfSafe(columns.getAll(), [channelId](auto& col)
+	return *u::vector::findIfSafe(columns, [channelId](auto& col)
 	    { return col.channels.findById(channelId) != nullptr; });
 }
 
@@ -232,7 +232,7 @@ void Model::addChannelToGroup(ID channelId, ID groupId, int position)
 
 void Model::removeChannelFromColumn(ID channelId)
 {
-	for (Column& column : columns.getAll()) // Brute force!
+	for (Column& column : columns) // Brute force!
 	{
 		column.channels.removeById(channelId);
 		for (Channel& channel : column.channels.getAll())

diff --git a/src/gui/model.h b/src/gui/model.h
@@ -31,6 +31,7 @@
 #include "core/const.h"
 #include "core/plugins/pluginManager.h"
 #include "deps/geompp/src/rect.hpp"
+#include "deps/mcl-container/src/container.hpp"
 #include "utils/container.h"
 #include <FL/Enumerations.H>
 #include <string>
@@ -44,7 +45,7 @@ struct Model
 	using Channels = u::Container<T, /*Identifiable=*/true, /*Sortable=*/true>;
 
 	template <typename T>
-	using Columns = u::Container<T, /*Identifiable=*/false, /*Sortable=*/true>;
+	using Columns = mcl::Container<T>;
 
 	struct Channel
 	{