From 035299f23a9207bb521b19e2f77154c276cf3033 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 23 Mar 2025 14:21:12 +0000
Subject: Other objects support in removeAll/clear

removeAll requires a type that is one of Others, clear clears everything
regardless of type.
---
 lib/collection.h | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/collection.h b/lib/collection.h
index 329b681..98f043b 100644
--- a/lib/collection.h
+++ b/lib/collection.h
@@ -103,15 +103,24 @@ public:
 		return applyOne_internal<T>(objects.rbegin(), objects.rend(), m, std::forward<Params>(params)...);
 	}
 
-	template<typename T = Object>
+	template<typename T>
+		requires(std::is_convertible_v<T *, Others *> || ...)
 	auto
 	removeAll()
 	{
+		std::get<OtherObjects<T>>(otherObjects).clear();
 		return std::erase_if(objects, [](auto && op) {
 			return dynamic_cast<T *>(op.get());
 		});
 	}
 
+	void
+	clear()
+	{
+		((std::get<OtherObjects<Others>>(otherObjects).clear()), ...);
+		objects.clear();
+	}
+
 	[[nodiscard]] auto
 	begin() const
 	{
-- 
cgit v1.2.3