Merge remote-tracking branch 'origin/ptrs'

3 files changed, 11 insertions, 11 deletions

diff --git a/ui/builders/freeExtend.cpp b/ui/builders/freeExtend.cpp
index ab5a998..aff7cd7 100644
--- a/ui/builders/freeExtend.cpp
+++ b/ui/builders/freeExtend.cpp
@@ -16,17 +16,17 @@ BuilderFreeExtend::move(
 {
 	if (p1) {
 		if (const auto p = network->intersectRayNodes(ray)) {
-			candidateLinks.objects = network->candidateJoins(*p1, p->pos);
+			candidateLinks = network->candidateJoins(*p1, p->pos);
 		}
 		else if (const auto p = geoData->intersectRay(ray)) {
-			candidateLinks.objects = network->candidateExtend(*p1, p->first);
+			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 6941e23..f6cbce5 100644
--- a/ui/builders/join.cpp
+++ b/ui/builders/join.cpp
@@ -15,10 +15,10 @@ BuilderJoin::move(Network * network, const GeoData *, const SDL_MouseMotionEvent
 {
 	if (p1) {
 		if (const auto p = network->intersectRayNodes(ray)) {
-			candidateLinks.objects = network->candidateJoins(p1->pos, p->pos);
+			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 338aa8a..e7d83b5 100644
--- a/ui/builders/straight.cpp
+++ b/ui/builders/straight.cpp
@@ -17,10 +17,10 @@ BuilderStraight::move(
 {
 	if (p1) {
 		if (const auto p = geoData->intersectRay(ray)) {
-			candidateLinks.objects = network->candidateStraight(*p1, p->first);
+			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;
 	}
 }