From 5a0b3927a33807cca4c77c40eb873f8a3b51b0b0 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 29 Apr 2023 19:07:11 +0100 Subject: Drop .hpp for header only things Half of them acquired a .cpp part anyway --- test/enumDetailsData.h | 20 ++++++++++++++++++++ test/enumDetailsData.hpp | 20 -------------------- test/test-assetFactory.cpp | 6 +++--- test/test-collection.cpp | 6 +++--- test/test-enumDetails.cpp | 6 +++--- test/test-geo.cpp | 4 ++-- test/test-instancing.cpp | 2 +- test/test-maths.cpp | 2 +- test/test-network.cpp | 4 ++-- test/test-render.cpp | 4 ++-- test/test-static-enumDetails.cpp | 4 ++-- test/test-static-stream_support.cpp | 2 +- test/test-text.cpp | 2 +- test/test-worker.cpp | 2 +- test/testRenderOutput.h | 2 +- 15 files changed, 43 insertions(+), 43 deletions(-) create mode 100644 test/enumDetailsData.h delete mode 100644 test/enumDetailsData.hpp (limited to 'test') diff --git a/test/enumDetailsData.h b/test/enumDetailsData.h new file mode 100644 index 0000000..713d742 --- /dev/null +++ b/test/enumDetailsData.h @@ -0,0 +1,20 @@ +#pragma once +#include + +enum GlobalUnscoped { aa, b, c }; +enum class GlobalScoped { aa, b, c }; +namespace ns { + enum Unscoped { aa, b, c }; + enum class Scoped { aa, b, c }; +} +namespace test1 { + enum class DefaultDense { a, bee, ci, de }; +} +namespace test2 { + enum class NumberedSparse { a = 0, bee = 3, ci = -20, de = 100 }; +} + +template<> struct EnumValueCollection { + // Any ordered integer_sequence which includes all enumeration values + using Vs = std::integer_sequence; +}; diff --git a/test/enumDetailsData.hpp b/test/enumDetailsData.hpp deleted file mode 100644 index 0e98af5..0000000 --- a/test/enumDetailsData.hpp +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once -#include - -enum GlobalUnscoped { aa, b, c }; -enum class GlobalScoped { aa, b, c }; -namespace ns { - enum Unscoped { aa, b, c }; - enum class Scoped { aa, b, c }; -} -namespace test1 { - enum class DefaultDense { a, bee, ci, de }; -} -namespace test2 { - enum class NumberedSparse { a = 0, bee = 3, ci = -20, de = 100 }; -} - -template<> struct EnumValueCollection { - // Any ordered integer_sequence which includes all enumeration values - using Vs = std::integer_sequence; -}; diff --git a/test/test-assetFactory.cpp b/test/test-assetFactory.cpp index c0edd66..18dc778 100644 --- a/test/test-assetFactory.cpp +++ b/test/test-assetFactory.cpp @@ -14,9 +14,9 @@ #include "game/vehicles/railVehicleClass.h" #include "gfx/gl/sceneRenderer.h" #include "gfx/renderable.h" -#include "lib/collection.hpp" -#include "lib/location.hpp" -#include "lib/stream_support.hpp" +#include "lib/collection.h" +#include "lib/location.h" +#include "lib/stream_support.h" #include "testMainWindow.h" #include "ui/applicationBase.h" diff --git a/test/test-collection.cpp b/test/test-collection.cpp index 9884812..16db792 100644 --- a/test/test-collection.cpp +++ b/test/test-collection.cpp @@ -2,10 +2,10 @@ #include -#include +#include #include -#include -#include +#include +#include #include class Base { diff --git a/test/test-enumDetails.cpp b/test/test-enumDetails.cpp index db2d6d0..0e759e5 100644 --- a/test/test-enumDetails.cpp +++ b/test/test-enumDetails.cpp @@ -1,11 +1,11 @@ #define BOOST_TEST_MODULE test_enumDetails -#include "enumDetailsData.hpp" +#include "enumDetailsData.h" #include "testHelpers.h" #include #include -#include -#include +#include +#include constexpr std::array INVALID_NAMES {"", "missing", "GlobalScoped::aa", "GlobalScoped", "ns::aa", "a", "bb"}; constexpr std::array VALID_NAMES {"aa", "b", "c"}; diff --git a/test/test-geo.cpp b/test/test-geo.cpp index bc442e9..e672e54 100644 --- a/test/test-geo.cpp +++ b/test/test-geo.cpp @@ -3,10 +3,10 @@ #include "testHelpers.h" #include #include -#include +#include #include -#include +#include struct TestGeoData : public GeoData { TestGeoData() : GeoData {{{-10, -5}, {30, 40}}, 5.F} { } diff --git a/test/test-instancing.cpp b/test/test-instancing.cpp index c743ce0..8745484 100644 --- a/test/test-instancing.cpp +++ b/test/test-instancing.cpp @@ -1,6 +1,6 @@ #define BOOST_TEST_MODULE instancing -#include "stream_support.hpp" +#include "stream_support.h" #include "testHelpers.h" #include "testMainWindow.h" #include "ui/applicationBase.h" diff --git a/test/test-maths.cpp b/test/test-maths.cpp index 6ee2113..a4a881d 100644 --- a/test/test-maths.cpp +++ b/test/test-maths.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include diff --git a/test/test-network.cpp b/test/test-network.cpp index 19c0977..e6241e4 100644 --- a/test/test-network.cpp +++ b/test/test-network.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include // IWYU pragma: keep @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/test/test-render.cpp b/test/test-render.cpp index d5e2d87..4bfcad2 100644 --- a/test/test-render.cpp +++ b/test/test-render.cpp @@ -14,9 +14,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include diff --git a/test/test-static-enumDetails.cpp b/test/test-static-enumDetails.cpp index 03c2203..5f81753 100644 --- a/test/test-static-enumDetails.cpp +++ b/test/test-static-enumDetails.cpp @@ -1,6 +1,6 @@ #define ENUM_PROBE -#include "enumDetailsData.hpp" -#include +#include "enumDetailsData.h" +#include // Test type name static_assert(EnumTypeDetails::typeName == "GlobalUnscoped"); diff --git a/test/test-static-stream_support.cpp b/test/test-static-stream_support.cpp index 367d5a2..3002ccc 100644 --- a/test/test-static-stream_support.cpp +++ b/test/test-static-stream_support.cpp @@ -1,4 +1,4 @@ -#include "stream_support.hpp" +#include "stream_support.h" #include #include diff --git a/test/test-text.cpp b/test/test-text.cpp index 0c73021..3a23818 100644 --- a/test/test-text.cpp +++ b/test/test-text.cpp @@ -3,7 +3,7 @@ #include "testHelpers.h" #include #include -#include +#include #include #include diff --git a/test/test-worker.cpp b/test/test-worker.cpp index 76b7138..cadc366 100644 --- a/test/test-worker.cpp +++ b/test/test-worker.cpp @@ -3,7 +3,7 @@ #include "testHelpers.h" #include #include -#include +#include #include uint32_t diff --git a/test/testRenderOutput.h b/test/testRenderOutput.h index 8a8bdaf..f5cd56b 100644 --- a/test/testRenderOutput.h +++ b/test/testRenderOutput.h @@ -2,7 +2,7 @@ #include "glArrays.h" #include -#include +#include class TestRenderOutput { public: -- cgit v1.2.3