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.
---
 ui/builders/freeExtend.cpp | 4 ++--
 ui/builders/join.cpp       | 4 ++--
 ui/builders/straight.cpp   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'ui')

diff --git a/ui/builders/freeExtend.cpp b/ui/builders/freeExtend.cpp
index 09e1c75..aff7cd7 100644
--- a/ui/builders/freeExtend.cpp
+++ b/ui/builders/freeExtend.cpp
@@ -22,11 +22,11 @@ BuilderFreeExtend::move(
 			candidateLinks = network->candidateExtend(*p1, p->first);
 		}
 		else {
-			candidateLinks.removeAll();
+			candidateLinks.clear();
 		}
 	}
 	else {
-		candidateLinks.removeAll();
+		candidateLinks.clear();
 	}
 }
 
diff --git a/ui/builders/join.cpp b/ui/builders/join.cpp
index 161b081..f6cbce5 100644
--- a/ui/builders/join.cpp
+++ b/ui/builders/join.cpp
@@ -18,7 +18,7 @@ BuilderJoin::move(Network * network, const GeoData *, const SDL_MouseMotionEvent
 			candidateLinks = network->candidateJoins(p1->pos, p->pos);
 		}
 		else {
-			candidateLinks.removeAll();
+			candidateLinks.clear();
 		}
 	}
 }
@@ -33,7 +33,7 @@ BuilderJoin::click(
 				if (p1) {
 					create(network, geoData, p1, p);
 					p1.reset();
-					candidateLinks.removeAll();
+					candidateLinks.clear();
 				}
 				else {
 					p1 = p;
diff --git a/ui/builders/straight.cpp b/ui/builders/straight.cpp
index 6815689..e7d83b5 100644
--- a/ui/builders/straight.cpp
+++ b/ui/builders/straight.cpp
@@ -20,7 +20,7 @@ BuilderStraight::move(
 			candidateLinks = network->candidateStraight(*p1, p->first);
 		}
 		else {
-			candidateLinks.removeAll();
+			candidateLinks.clear();
 		}
 	}
 }
@@ -34,7 +34,7 @@ BuilderStraight::click(
 			if (const auto p = geoData->intersectRay(ray)) {
 				if (p1) {
 					create(network, geoData, *p1, p->first);
-					candidateLinks.removeAll();
+					candidateLinks.clear();
 					p1.reset();
 				}
 				else {
@@ -44,7 +44,7 @@ BuilderStraight::click(
 			return;
 		case SDL_BUTTON_MIDDLE:
 			p1.reset();
-			candidateLinks.removeAll();
+			candidateLinks.clear();
 			return;
 	}
 }
-- 
cgit v1.2.3