From 5a0b3927a33807cca4c77c40eb873f8a3b51b0b0 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 29 Apr 2023 19:07:11 +0100
Subject: Drop .hpp for header only things

Half of them acquired a .cpp part anyway
---
 ui/applicationBase.h    |  2 +-
 ui/editNetwork.h        |  2 +-
 ui/font.cpp             |  2 +-
 ui/gameMainSelector.cpp |  4 ++--
 ui/gameMainSelector.h   |  2 +-
 ui/gameMainWindow.cpp   |  4 ++--
 ui/gameMainWindow.h     |  2 +-
 ui/modeHelper.h         | 39 +++++++++++++++++++++++++++++++++++++++
 ui/modeHelper.hpp       | 39 ---------------------------------------
 ui/toolbar.h            |  2 +-
 ui/uiComponent.h        |  2 +-
 ui/window.h             |  8 ++++----
 12 files changed, 54 insertions(+), 54 deletions(-)
 create mode 100644 ui/modeHelper.h
 delete mode 100644 ui/modeHelper.hpp

(limited to 'ui')

diff --git a/ui/applicationBase.h b/ui/applicationBase.h
index 57995ca..9d9b66b 100644
--- a/ui/applicationBase.h
+++ b/ui/applicationBase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <special_members.hpp>
+#include <special_members.h>
 
 class ApplicationBase {
 public:
diff --git a/ui/editNetwork.h b/ui/editNetwork.h
index 1ba2e13..eb1677e 100644
--- a/ui/editNetwork.h
+++ b/ui/editNetwork.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "gameMainSelector.h"
-#include "modeHelper.hpp"
+#include "modeHelper.h"
 #include "toolbar.h"
 #include "worldOverlay.h"
 #include <game/gamestate.h>
diff --git a/ui/font.cpp b/ui/font.cpp
index 43991f0..108f905 100644
--- a/ui/font.cpp
+++ b/ui/font.cpp
@@ -5,7 +5,7 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include "glArrays.h"
-#include <glRef.hpp>
+#include <glRef.h>
 #include <maths.h>
 #include <memory>
 #include <optional>
diff --git a/ui/gameMainSelector.cpp b/ui/gameMainSelector.cpp
index 0fbf687..081718d 100644
--- a/ui/gameMainSelector.cpp
+++ b/ui/gameMainSelector.cpp
@@ -1,5 +1,5 @@
 #include "gameMainSelector.h"
-#include "collection.hpp"
+#include "collection.h"
 #include "text.h"
 #include "ui/uiComponent.h"
 #include <SDL2/SDL.h>
@@ -10,7 +10,7 @@
 #include <gfx/gl/camera.h>
 #include <optional>
 #include <span>
-#include <stream_support.hpp>
+#include <stream_support.h>
 #include <typeinfo>
 #include <vector>
 
diff --git a/ui/gameMainSelector.h b/ui/gameMainSelector.h
index aacd67a..98cdf53 100644
--- a/ui/gameMainSelector.h
+++ b/ui/gameMainSelector.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "SDL_events.h"
-#include "special_members.hpp"
+#include "special_members.h"
 #include "uiComponent.h"
 #include "worldOverlay.h"
 #include <glm/glm.hpp>
diff --git a/ui/gameMainWindow.cpp b/ui/gameMainWindow.cpp
index 3f85a4f..30cdada 100644
--- a/ui/gameMainWindow.cpp
+++ b/ui/gameMainWindow.cpp
@@ -3,12 +3,12 @@
 #include "gameMainSelector.h"
 #include "gfx/camera_controller.h"
 #include "manualCameraController.h"
-#include "modeHelper.hpp"
+#include "modeHelper.h"
 #include "toolbar.h"
 #include "window.h"
 #include <GL/glew.h>
 #include <SDL2/SDL.h>
-#include <collection.hpp>
+#include <collection.h>
 #include <game/gamestate.h>
 #include <game/network/rail.h>
 #include <game/worldobject.h> // IWYU pragma: keep
diff --git a/ui/gameMainWindow.h b/ui/gameMainWindow.h
index d5bcf41..a4e822e 100644
--- a/ui/gameMainWindow.h
+++ b/ui/gameMainWindow.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "chronology.hpp"
+#include "chronology.h"
 #include "gfx/gl/sceneRenderer.h"
 #include "window.h"
 #include <cstddef>
diff --git a/ui/modeHelper.h b/ui/modeHelper.h
new file mode 100644
index 0000000..77707f2
--- /dev/null
+++ b/ui/modeHelper.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <memory>
+union SDL_Event;
+
+enum ModeSecondClick { Unset, Reset, NoAction };
+template<typename Target, ModeSecondClick msc = ModeSecondClick::Unset> class Mode {
+public:
+	explicit Mode(Target & t) : target {t} { }
+
+	Target & target;
+
+	template<typename Mode, typename... Params>
+	auto
+	toggle(Params &&... params)
+	{
+		return [params..., this](const SDL_Event &) {
+			toggleSetMode<Mode>(std::forward<Params>(params)...);
+		};
+	}
+
+private:
+	template<typename Mode, typename... Params>
+	void
+	toggleSetMode(Params &&... params)
+	{
+		if (dynamic_cast<Mode *>(target.get())) {
+			if constexpr (msc == ModeSecondClick::Unset) {
+				target.reset();
+			}
+			if constexpr (msc == ModeSecondClick::Reset) {
+				target = std::make_unique<Mode>(std::forward<Params>(params)...);
+			}
+		}
+		else {
+			target = std::make_unique<Mode>(std::forward<Params>(params)...);
+		}
+	}
+};
diff --git a/ui/modeHelper.hpp b/ui/modeHelper.hpp
deleted file mode 100644
index 77707f2..0000000
--- a/ui/modeHelper.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include <memory>
-union SDL_Event;
-
-enum ModeSecondClick { Unset, Reset, NoAction };
-template<typename Target, ModeSecondClick msc = ModeSecondClick::Unset> class Mode {
-public:
-	explicit Mode(Target & t) : target {t} { }
-
-	Target & target;
-
-	template<typename Mode, typename... Params>
-	auto
-	toggle(Params &&... params)
-	{
-		return [params..., this](const SDL_Event &) {
-			toggleSetMode<Mode>(std::forward<Params>(params)...);
-		};
-	}
-
-private:
-	template<typename Mode, typename... Params>
-	void
-	toggleSetMode(Params &&... params)
-	{
-		if (dynamic_cast<Mode *>(target.get())) {
-			if constexpr (msc == ModeSecondClick::Unset) {
-				target.reset();
-			}
-			if constexpr (msc == ModeSecondClick::Reset) {
-				target = std::make_unique<Mode>(std::forward<Params>(params)...);
-			}
-		}
-		else {
-			target = std::make_unique<Mode>(std::forward<Params>(params)...);
-		}
-	}
-};
diff --git a/ui/toolbar.h b/ui/toolbar.h
index d141139..ea560f5 100644
--- a/ui/toolbar.h
+++ b/ui/toolbar.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "collection.hpp"
+#include "collection.h"
 #include "iconButton.h"
 #include "uiComponent.h"
 #include <initializer_list>
diff --git a/ui/uiComponent.h b/ui/uiComponent.h
index 8a9613e..75c2284 100644
--- a/ui/uiComponent.h
+++ b/ui/uiComponent.h
@@ -2,7 +2,7 @@
 
 #include <functional>
 #include <glm/glm.hpp>
-#include <special_members.hpp>
+#include <special_members.h>
 
 class UIShader;
 union SDL_Event;
diff --git a/ui/window.h b/ui/window.h
index 8b7d870..be9e114 100644
--- a/ui/window.h
+++ b/ui/window.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "chronology.hpp"
-#include "collection.hpp"
+#include "chronology.h"
+#include "collection.h"
 #include "gfx/gl/uiShader.h"
-#include "ptr.hpp"
+#include "ptr.h"
 #include "uiComponent.h" // IWYU pragma: keep
 #include <SDL2/SDL.h>
 #include <cstddef>
-#include <special_members.hpp>
+#include <special_members.h>
 #include <string>
 
 using SDL_WindowPtr = wrapped_ptrt<SDL_Window, SDL_CreateWindow, SDL_DestroyWindow>;
-- 
cgit v1.2.3