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 --- game/activity.h | 2 +- game/gamestate.h | 4 ++-- game/geoData.cpp | 2 +- game/network/link.cpp | 4 ++-- game/network/link.h | 6 +++--- game/network/network.cpp | 2 +- game/network/network.h | 6 +++--- game/network/rail.cpp | 4 ++-- game/network/rail.h | 4 ++-- game/objective.h | 2 +- game/orders.h | 2 +- game/scenary/foliage.cpp | 4 ++-- game/scenary/plant.cpp | 2 +- game/selectable.h | 2 +- game/terrain.cpp | 4 ++-- game/terrain.h | 4 ++-- game/vehicles/railVehicle.cpp | 4 ++-- game/vehicles/railVehicleClass.cpp | 4 ++-- game/vehicles/train.cpp | 2 +- game/vehicles/train.h | 6 +++--- game/vehicles/vehicle.cpp | 2 +- game/vehicles/vehicle.h | 2 +- game/worldobject.h | 4 ++-- 23 files changed, 39 insertions(+), 39 deletions(-) (limited to 'game') diff --git a/game/activity.h b/game/activity.h index 6ba3712..e0585f7 100644 --- a/game/activity.h +++ b/game/activity.h @@ -2,7 +2,7 @@ #include #include -#include +#include class Vehicle; diff --git a/game/gamestate.h b/game/gamestate.h index db223c0..6f3f382 100644 --- a/game/gamestate.h +++ b/game/gamestate.h @@ -1,9 +1,9 @@ #pragma once #include "assetFactory/assetFactory.h" -#include +#include #include -#include +#include class WorldObject; class GeoData; diff --git a/game/geoData.cpp b/game/geoData.cpp index 4dd0c40..34a1030 100644 --- a/game/geoData.cpp +++ b/game/geoData.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/game/network/link.cpp b/game/network/link.cpp index aecc2fc..bb27a52 100644 --- a/game/network/link.cpp +++ b/game/network/link.cpp @@ -1,9 +1,9 @@ #include "link.h" #include #include -#include +#include #include -#include +#include #include Link::Link(End a, End b, float l) : ends {{std::move(a), std::move(b)}}, length {l} { } diff --git a/game/network/link.h b/game/network/link.h index 1f6b780..4a9f83f 100644 --- a/game/network/link.h +++ b/game/network/link.h @@ -2,11 +2,11 @@ #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include diff --git a/game/network/network.cpp b/game/network/network.cpp index 59ef7c8..083b08e 100644 --- a/game/network/network.cpp +++ b/game/network/network.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/game/network/network.h b/game/network/network.h index 4b485cc..b9316eb 100644 --- a/game/network/network.h +++ b/game/network/network.h @@ -1,13 +1,13 @@ #pragma once #include "link.h" -#include +#include #include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/game/network/rail.cpp b/game/network/rail.cpp index e7006cf..4454600 100644 --- a/game/network/rail.cpp +++ b/game/network/rail.cpp @@ -3,11 +3,11 @@ #include #include #include -#include +#include #include #include #include // IWYU pragma: keep -#include +#include #include #include #include diff --git a/game/network/rail.h b/game/network/rail.h index 8edc363..611eb67 100644 --- a/game/network/rail.h +++ b/game/network/rail.h @@ -1,6 +1,6 @@ #pragma once -#include "chronology.hpp" +#include "chronology.h" #include "game/worldobject.h" #include "gfx/models/mesh.h" #include "gfx/renderable.h" @@ -9,7 +9,7 @@ #include #include #include -#include +#include class SceneShader; class Vertex; diff --git a/game/objective.h b/game/objective.h index 617b8e9..130015f 100644 --- a/game/objective.h +++ b/game/objective.h @@ -3,7 +3,7 @@ #include "activity.h" #include "network/link.h" #include -#include +#include class Orders; diff --git a/game/orders.h b/game/orders.h index 5ac0abf..f29e208 100644 --- a/game/orders.h +++ b/game/orders.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include class Objective; diff --git a/game/scenary/foliage.cpp b/game/scenary/foliage.cpp index 0913c6e..9304842 100644 --- a/game/scenary/foliage.cpp +++ b/game/scenary/foliage.cpp @@ -1,9 +1,9 @@ #include "foliage.h" #include "gfx/gl/sceneShader.h" #include "gfx/gl/shadowMapper.h" -#include "gfx/gl/vertexArrayObject.hpp" +#include "gfx/gl/vertexArrayObject.h" #include "gfx/models/texture.h" -#include "location.hpp" +#include "location.h" bool Foliage::persist(Persistence::PersistenceStore & store) diff --git a/game/scenary/plant.cpp b/game/scenary/plant.cpp index 2a79807..4fb3cb5 100644 --- a/game/scenary/plant.cpp +++ b/game/scenary/plant.cpp @@ -1,5 +1,5 @@ #include "plant.h" -#include "location.hpp" +#include "location.h" Plant::Plant(std::shared_ptr type, const Location & position) : type {std::move(type)}, location {this->type->instances.acquire(position.getTransform())} diff --git a/game/selectable.h b/game/selectable.h index 3d734f3..31287d8 100644 --- a/game/selectable.h +++ b/game/selectable.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include class Ray; diff --git a/game/terrain.cpp b/game/terrain.cpp index f798254..1753dfe 100644 --- a/game/terrain.cpp +++ b/game/terrain.cpp @@ -10,10 +10,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/game/terrain.h b/game/terrain.h index 879d173..d62f138 100644 --- a/game/terrain.h +++ b/game/terrain.h @@ -1,7 +1,7 @@ #pragma once -#include "chronology.hpp" -#include "collection.hpp" +#include "chronology.h" +#include "collection.h" #include "game/worldobject.h" #include #include diff --git a/game/vehicles/railVehicle.cpp b/game/vehicles/railVehicle.cpp index b77b93c..c4a9e96 100644 --- a/game/vehicles/railVehicle.cpp +++ b/game/vehicles/railVehicle.cpp @@ -6,10 +6,10 @@ #include #include #include -#include +#include #include #include -#include +#include RailVehicle::RailVehicle(RailVehicleClassPtr rvc) : rvClass {std::move(rvc)}, location {rvClass->instancesBody}, bogies { diff --git a/game/vehicles/railVehicleClass.cpp b/game/vehicles/railVehicleClass.cpp index 82a442e..64a21be 100644 --- a/game/vehicles/railVehicleClass.cpp +++ b/game/vehicles/railVehicleClass.cpp @@ -1,7 +1,7 @@ #include "railVehicleClass.h" #include "gfx/gl/sceneShader.h" #include "gfx/gl/shadowMapper.h" -#include "gfx/gl/vertexArrayObject.hpp" +#include "gfx/gl/vertexArrayObject.h" #include "gfx/models/mesh.h" #include "gfx/models/texture.h" #include @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/game/vehicles/train.cpp b/game/vehicles/train.cpp index fdfc3e1..6f3b036 100644 --- a/game/vehicles/train.cpp +++ b/game/vehicles/train.cpp @@ -3,7 +3,7 @@ #include "game/vehicles/railVehicle.h" #include "game/vehicles/railVehicleClass.h" #include "gfx/renderable.h" -#include "location.hpp" +#include "location.h" #include #include #include diff --git a/game/vehicles/train.h b/game/vehicles/train.h index 15e2f6e..20c3bc4 100644 --- a/game/vehicles/train.h +++ b/game/vehicles/train.h @@ -1,15 +1,15 @@ #pragma once -#include "chronology.hpp" +#include "chronology.h" #include "game/activities/go.h" // IWYU pragma: keep #include "game/activities/idle.h" // IWYU pragma: keep #include "game/activity.h" #include "game/network/link.h" #include "railVehicle.h" #include "vehicle.h" -#include +#include #include -#include +#include #include #include diff --git a/game/vehicles/vehicle.cpp b/game/vehicles/vehicle.cpp index 6dc8371..0d46017 100644 --- a/game/vehicles/vehicle.cpp +++ b/game/vehicles/vehicle.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/game/vehicles/vehicle.h b/game/vehicles/vehicle.h index 369bd7a..763ade9 100644 --- a/game/vehicles/vehicle.h +++ b/game/vehicles/vehicle.h @@ -1,6 +1,6 @@ #pragma once -#include "chronology.hpp" +#include "chronology.h" #include "linkHistory.h" #include #include diff --git a/game/worldobject.h b/game/worldobject.h index 994545b..e064bc7 100644 --- a/game/worldobject.h +++ b/game/worldobject.h @@ -1,7 +1,7 @@ #pragma once -#include "chronology.hpp" -#include +#include "chronology.h" +#include class WorldObject { public: -- cgit v1.2.3