Invert how shared/unique is specified for Collection

Template param is a pointer now, typedefs added for ease.

5 files changed, 5 insertions, 5 deletions

diff --git a/ui/editNetwork.h b/ui/editNetwork.h
index ae887bd..2fc102a 100644
--- a/ui/editNetwork.h
+++ b/ui/editNetwork.h
@@ -36,7 +36,7 @@ public:
 		using Ptr = std::unique_ptr<Builder>;
 
 	protected:
-		Collection<const Link> candidateLinks;
+		SharedCollection<const Link> candidateLinks;
 	};
 
 private:
diff --git a/ui/gameMainWindow.cpp b/ui/gameMainWindow.cpp
index b58f3dc..07901b3 100644
--- a/ui/gameMainWindow.cpp
+++ b/ui/gameMainWindow.cpp
@@ -32,7 +32,7 @@ GameMainWindow::GameMainWindow(size_t w, size_t h) : WindowContent {w, h}, Scene
 {
 	uiComponents.create<ManualCameraController>(glm::vec2 {310'727'624, 494'018'810});
 	auto gms = uiComponents.create<GameMainSelector>(&camera, ScreenAbsCoord {w, h});
-	uiComponents.create<GameMainToolbar>(gms.get());
+	uiComponents.create<GameMainToolbar>(gms);
 }
 
 GameMainWindow::~GameMainWindow() { }
diff --git a/ui/mainApplication.h b/ui/mainApplication.h
index a6cb126..1489587 100644
--- a/ui/mainApplication.h
+++ b/ui/mainApplication.h
@@ -6,7 +6,7 @@
 
 class MainApplication : public ApplicationBase {
 public:
-	using Windows = Collection<Window>;
+	using Windows = SharedCollection<Window>;
 	void mainLoop();
 
 protected:
diff --git a/ui/toolbar.h b/ui/toolbar.h
index ea560f5..b0480e2 100644
--- a/ui/toolbar.h
+++ b/ui/toolbar.h
@@ -19,5 +19,5 @@ public:
 
 	bool handleInput(const SDL_Event & e, const Position & parentPos) override;
 
-	Collection<IconButton, false> icons;
+	UniqueCollection<IconButton> icons;
 };
diff --git a/ui/windowContent.h b/ui/windowContent.h
index 474445a..5437da6 100644
--- a/ui/windowContent.h
+++ b/ui/windowContent.h
@@ -21,6 +21,6 @@ public:
 	virtual bool handleInput(const SDL_Event & e);
 
 protected:
-	::Collection<UIComponent> uiComponents;
+	UniqueCollection<UIComponent> uiComponents;
 	UIShader uiShader;
 };