#77 Cleanup includes

xthebat · Dec 23, 2023 · 654f26b · 654f26b
1 parent dacc220
commit 654f26b
Show file tree

Hide file tree

Showing 56 changed files with 156 additions and 68 deletions.
diff --git a/Source/Cloud9/Character/Cloud9Character.cpp b/Source/Cloud9/Character/Cloud9Character.cpp
@@ -23,23 +23,23 @@
 
 #include "Cloud9Character.h"
 
+#include "Engine/World.h"
 #include "DrawDebugHelpers.h"
-#include "UObject/ConstructorHelpers.h"
+#include "Materials/Material.h"
 #include "Camera/CameraComponent.h"
-#include "Cloud9/Cloud9.h"
-#include "Cloud9/Game/Cloud9DeveloperSettings.h"
-#include "Cloud9/Game/Cloud9PlayerController.h"
-#include "Components/DecalComponent.h"
-#include "Components/CapsuleComponent.h"
-#include "Components/Cloud9CharacterMovement.h"
-#include "Components/Cloud9Inventory.h"
-#include "Components/Cloud9SpringArmComponent.h"
+#include "UObject/ConstructorHelpers.h"
+#include "Kismet/KismetMathLibrary.h"
 #include "GameFramework/CharacterMovementComponent.h"
 #include "GameFramework/PlayerController.h"
 #include "GameFramework/SpringArmComponent.h"
-#include "Materials/Material.h"
-#include "Engine/World.h"
-#include "Kismet/KismetMathLibrary.h"
+#include "Components/DecalComponent.h"
+#include "Components/CapsuleComponent.h"
+
+#include "Cloud9/Game/Cloud9DeveloperSettings.h"
+#include "Cloud9/Game/Cloud9PlayerController.h"
+#include "Cloud9/Character/Components/Cloud9CharacterMovement.h"
+#include "Cloud9/Character/Components/Cloud9Inventory.h"
+#include "Cloud9/Character/Components/Cloud9SpringArmComponent.h"
 
 class UCloud9SpringArmComponent;
 const FName ACloud9Character::SpringArmComponentName = TEXT("CameraBoom");

diff --git a/Source/Cloud9/Character/Cloud9Character.h b/Source/Cloud9/Character/Cloud9Character.h
@@ -26,8 +26,10 @@
 #include "CoreMinimal.h"
 #include "GameFramework/Character.h"
 
-#include "Components/Cloud9CharacterMovement.h"
+#include "Cloud9/Tools/Macro/Common.h"
+#include "Cloud9/Tools/Macro/Logging.h"
 #include "Components/Cloud9Inventory.h"
+#include "Components/Cloud9CharacterMovement.h"
 
 #include "Cloud9Character.generated.h"
 

diff --git a/Source/Cloud9/Character/Components/Cloud9CharacterComponent.h b/Source/Cloud9/Character/Components/Cloud9CharacterComponent.h
@@ -25,6 +25,10 @@
 
 #include "CoreMinimal.h"
 #include "UObject/Interface.h"
+
+#include "Cloud9/Tools/Macro/Common.h"
+#include "Cloud9/Tools/Macro/Logging.h"
+
 #include "Cloud9CharacterComponent.generated.h"
 
 class ACloud9Character;

diff --git a/Source/Cloud9/Character/Components/Cloud9CharacterMovement.h b/Source/Cloud9/Character/Components/Cloud9CharacterMovement.h
@@ -26,9 +26,11 @@
 #include "CoreMinimal.h"
 #include "GameFramework/CharacterMovementComponent.h"
 
-#include "Cloud9CharacterComponent.h"
-#include "Cloud9CharacterMovement.generated.h"
+#include "Cloud9/Tools/Macro/Common.h"
+#include "Cloud9/Tools/Macro/Logging.h"
+#include "Cloud9/Character/Components/Cloud9CharacterComponent.h"
 
+#include "Cloud9CharacterMovement.generated.h"
 
 class ACloud9Character;
 

diff --git a/Source/Cloud9/Character/Components/Cloud9Inventory.cpp b/Source/Cloud9/Character/Components/Cloud9Inventory.cpp
@@ -23,10 +23,9 @@
 
 #include "Cloud9Inventory.h"
 
-#include "Cloud9/Cloud9.h"
-#include "Cloud9/Character/Cloud9Character.h"
 #include "Cloud9/Tools/Extensions/TContainer.h"
 #include "Cloud9/Game/Cloud9GameInstance.h"
+#include "Cloud9/Character/Cloud9Character.h"
 #include "Cloud9/Weapon/Classes/Cloud9WeaponBase.h"
 #include "Cloud9/Weapon/Enums/WeaponState.h"
 

diff --git a/Source/Cloud9/Character/Components/Cloud9Inventory.h b/Source/Cloud9/Character/Components/Cloud9Inventory.h
@@ -24,11 +24,14 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "Cloud9/Cloud9.h"
 #include "Components/ActorComponent.h"
-#include "Cloud9CharacterComponent.h"
+
+#include "Cloud9/Tools/Macro/Common.h"
+#include "Cloud9/Tools/Macro/Logging.h"
+#include "Cloud9/Character/Components/Cloud9CharacterComponent.h"
 #include "Cloud9/Weapon/Enums/WeaponSlot.h"
 #include "Cloud9/Weapon/Structures/WeaponConfig.h"
+
 #include "Cloud9Inventory.generated.h"
 
 class ACloud9WeaponBase;

diff --git a/Source/Cloud9/Character/Components/Cloud9SpringArmComponent.cpp b/Source/Cloud9/Character/Components/Cloud9SpringArmComponent.cpp
@@ -23,7 +23,6 @@
 
 #include "Cloud9SpringArmComponent.h"
 
-#include "Cloud9/Cloud9.h"
 #include "Cloud9/Game/Cloud9DeveloperSettings.h"
 #include "Cloud9/Tools/Cloud9ToolsLibrary.h"
 

diff --git a/Source/Cloud9/Character/Components/Cloud9SpringArmComponent.h b/Source/Cloud9/Character/Components/Cloud9SpringArmComponent.h
@@ -25,8 +25,11 @@
 
 #include "CoreMinimal.h"
 #include "GameFramework/SpringArmComponent.h"
-#include "Cloud9SpringArmComponent.generated.h"
 
+#include "Cloud9/Tools/Macro/Common.h"
+#include "Cloud9/Tools/Macro/Logging.h"
+
+#include "Cloud9SpringArmComponent.generated.h"
 
 UCLASS(ClassGroup=(Camera), meta=(BlueprintSpawnableComponent))
 class CLOUD9_API UCloud9SpringArmComponent : public USpringArmComponent

diff --git a/Source/Cloud9/Console/Cloud9Console.h b/Source/Cloud9/Console/Cloud9Console.h
@@ -25,6 +25,10 @@
 
 #include "CoreMinimal.h"
 #include "GameFramework/Actor.h"
+
+#include "Cloud9/Tools/Macro/Common.h"
+#include "Cloud9/Tools/Macro/Logging.h"
+
 #include "Cloud9Console.generated.h"
 
 /**

diff --git a/Source/Cloud9/Console/Cloud9ConsoleComponent.h b/Source/Cloud9/Console/Cloud9ConsoleComponent.h
@@ -25,14 +25,15 @@
 
 #include "CoreMinimal.h"
 #include "Kismet/BlueprintFunctionLibrary.h"
+
+#include "Cloud9/Tools/Macro/Common.h"
+#include "Cloud9/Tools/Macro/Logging.h"
+
 #include "Cloud9ConsoleComponent.generated.h"
 
 class UCloud9Console;
 class ACloud9GameMode;
 
-/**
- * 
- */
 UCLASS()
 class CLOUD9_API UCloud9ConsoleComponent : public UActorComponent
 {

diff --git a/Source/Cloud9/Environment/Cloud9LinearDoor.cpp b/Source/Cloud9/Environment/Cloud9LinearDoor.cpp
@@ -24,8 +24,6 @@
 
 #include "Cloud9LinearDoor.h"
 
-#include "Cloud9/Tools/Macro/Common.h"
-#include "Cloud9/Tools/Macro/Logging.h"
 #include "Cloud9/Tools/Extensions/AActor.h"
 #include "Cloud9/Tools/Extensions/FTransform.h"
 #include "Cloud9/Tools/Extensions/FVector.h"

diff --git a/Source/Cloud9/Environment/Cloud9LinearDoor.h b/Source/Cloud9/Environment/Cloud9LinearDoor.h
@@ -25,9 +25,12 @@
 
 #include "CoreMinimal.h"
 #include "Engine/StaticMeshActor.h"
+
+#include "Cloud9/Tools/Macro/Common.h"
+#include "Cloud9/Tools/Macro/Logging.h"
 #include "Cloud9/Tools/Extensions/EDirection.h"
-#include "Cloud9LinearDoor.generated.h"
 
+#include "Cloud9LinearDoor.generated.h"
 
 UCLASS()
 class CLOUD9_API ACloud9LinearDoor : public AStaticMeshActor

diff --git a/Source/Cloud9/Game/Cloud9AssetManager.cpp b/Source/Cloud9/Game/Cloud9AssetManager.cpp
@@ -22,7 +22,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 
 #include "Cloud9AssetManager.h"
-#include "Cloud9/Cloud9.h"
 
 UObject* UCloud9AssetManager::GetOrLoadAssetSync(FPrimaryAssetId PrimaryAssetId)
 {

diff --git a/Source/Cloud9/Game/Cloud9AssetManager.h b/Source/Cloud9/Game/Cloud9AssetManager.h
@@ -25,6 +25,10 @@
 
 #include "CoreMinimal.h"
 #include "Engine/AssetManager.h"
+
+#include "Cloud9/Tools/Macro/Common.h"
+#include "Cloud9/Tools/Macro/Logging.h"
+
 #include "Cloud9AssetManager.generated.h"
 
 UCLASS()

diff --git a/Source/Cloud9/Game/Cloud9ControllerComponent.cpp b/Source/Cloud9/Game/Cloud9ControllerComponent.cpp
@@ -23,8 +23,7 @@
 
 #include "Cloud9ControllerComponent.h"
 
-#include "Cloud9PlayerController.h"
-#include "Cloud9/Cloud9.h"
+#include "Cloud9/Game/Cloud9PlayerController.h"
 #include "Cloud9/Character/Cloud9Character.h"
 
 ACloud9Character* ICloud9ControllerComponent::GetCloud9Pawn() const

diff --git a/Source/Cloud9/Game/Cloud9ControllerComponent.h b/Source/Cloud9/Game/Cloud9ControllerComponent.h
@@ -25,9 +25,12 @@
 
 #include "CoreMinimal.h"
 #include "UObject/Interface.h"
+
+#include "Cloud9/Tools/Macro/Common.h"
+#include "Cloud9/Tools/Macro/Logging.h"
 #include "Cloud9/Character/Cloud9Character.h"
-#include "Cloud9ControllerComponent.generated.h"
 
+#include "Cloud9ControllerComponent.generated.h"
 
 UINTERFACE()
 class UCloud9ControllerComponent : public UInterface
@@ -38,6 +41,7 @@ class UCloud9ControllerComponent : public UInterface
 class CLOUD9_API ICloud9ControllerComponent
 {
 	GENERATED_BODY()
+
 public:
 	ACloud9Character* GetCloud9Pawn() const;
 

diff --git a/Source/Cloud9/Game/Cloud9DeveloperSettings.cpp b/Source/Cloud9/Game/Cloud9DeveloperSettings.cpp
@@ -23,10 +23,8 @@
 
 #include "Cloud9DeveloperSettings.h"
 
-#include "Cloud9/Cloud9.h"
 #include "Cloud9/Tools/Extensions/FString.h"
 #include "Cloud9/Tools/Extensions/UObject.h"
-#include "Cloud9/Tools/Extensions/WhenOrNone.h"
 
 // ReSharper disable once CppPossiblyUninitializedMember
 UCloud9DeveloperSettings::UCloud9DeveloperSettings(const FObjectInitializer& ObjectInitializer)

diff --git a/Source/Cloud9/Game/Cloud9DeveloperSettings.h b/Source/Cloud9/Game/Cloud9DeveloperSettings.h
@@ -24,6 +24,10 @@
 #pragma once
 
 #include "CoreMinimal.h"
+
+#include "Cloud9/Tools/Macro/Common.h"
+#include "Cloud9/Tools/Macro/Logging.h"
+
 #include "Cloud9DeveloperSettings.generated.h"
 
 USTRUCT(BlueprintType)

diff --git a/Source/Cloud9/Game/Cloud9GameInstance.h b/Source/Cloud9/Game/Cloud9GameInstance.h
@@ -25,8 +25,13 @@
 
 #include "CoreMinimal.h"
 #include "Engine/GameInstance.h"
+
+#include "Cloud9/Tools/Macro/Common.h"
+#include "Cloud9/Tools/Macro/Logging.h"
+
 #include "Cloud9/Weapon/Enums/WeaponSlot.h"
 #include "Cloud9/Weapon/Structures/WeaponConfig.h"
+
 #include "Cloud9GameInstance.generated.h"
 
 UCLASS()

diff --git a/Source/Cloud9/Game/Cloud9GameMode.cpp b/Source/Cloud9/Game/Cloud9GameMode.cpp
@@ -23,11 +23,11 @@
 
 #include "Cloud9GameMode.h"
 
+#include "UObject/ConstructorHelpers.h"
+
 #include "Cloud9DeveloperSettings.h"
 #include "Cloud9PlayerController.h"
-#include "Cloud9/Cloud9.h"
 #include "Cloud9/Character/Cloud9Character.h"
-#include "UObject/ConstructorHelpers.h"
 
 ACloud9GameMode::ACloud9GameMode()
 {

diff --git a/Source/Cloud9/Game/Cloud9GameMode.h b/Source/Cloud9/Game/Cloud9GameMode.h
@@ -25,6 +25,10 @@
 
 #include "CoreMinimal.h"
 #include "GameFramework/GameModeBase.h"
+
+#include "Cloud9/Tools/Macro/Common.h"
+#include "Cloud9/Tools/Macro/Logging.h"
+
 #include "Cloud9GameMode.generated.h"
 
 class UCloud9DeveloperSettings;

diff --git a/Source/Cloud9/Game/Cloud9KeyboardController.cpp b/Source/Cloud9/Game/Cloud9KeyboardController.cpp
@@ -25,10 +25,10 @@
 
 #include "Cloud9KeyboardController.h"
 
-#include "Cloud9/Cloud9.h"
-#include "Cloud9/Weapon/Classes/Cloud9WeaponBase.h"
 #include "GameFramework/SpringArmComponent.h"
 
+#include "Cloud9/Weapon/Classes/Cloud9WeaponBase.h"
+
 UCloud9KeyboardController::UCloud9KeyboardController()
 {
 	PrimaryComponentTick.bCanEverTick = true;

diff --git a/Source/Cloud9/Game/Cloud9KeyboardController.h b/Source/Cloud9/Game/Cloud9KeyboardController.h
@@ -25,6 +25,10 @@
 
 #include "CoreMinimal.h"
 #include "Cloud9ControllerComponent.h"
+
+#include "Cloud9/Tools/Macro/Common.h"
+#include "Cloud9/Tools/Macro/Logging.h"
+
 #include "Cloud9KeyboardController.generated.h"
 
 DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnMoveDelegate);

diff --git a/Source/Cloud9/Game/Cloud9MouseController.cpp b/Source/Cloud9/Game/Cloud9MouseController.cpp
@@ -21,9 +21,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
-#include "Cloud9MouseController.h"
-#include "Cloud9PlayerController.h"
-#include "Cloud9/Cloud9.h"
+#include "Cloud9/Game/Cloud9MouseController.h"
+#include "Cloud9/Game/Cloud9PlayerController.h"
 #include "Cloud9/Tools/Cloud9ToolsLibrary.h"
 
 UCloud9MouseController::UCloud9MouseController()

diff --git a/Source/Cloud9/Game/Cloud9MouseController.h b/Source/Cloud9/Game/Cloud9MouseController.h
@@ -25,6 +25,10 @@
 
 #include "CoreMinimal.h"
 #include "Cloud9ControllerComponent.h"
+
+#include "Cloud9/Tools/Macro/Common.h"
+#include "Cloud9/Tools/Macro/Logging.h"
+
 #include "Cloud9MouseController.generated.h"
 
 class ACloud9Character;

diff --git a/Source/Cloud9/Game/Cloud9PlayerController.cpp b/Source/Cloud9/Game/Cloud9PlayerController.cpp
@@ -23,13 +23,13 @@
 
 #include "Cloud9PlayerController.h"
 
-#include "Cloud9DeveloperSettings.h"
-#include "Cloud9KeyboardController.h"
-#include "Cloud9MouseController.h"
-#include "Cloud9/Cloud9.h"
-#include "Cloud9/Console/Cloud9ConsoleComponent.h"
 #include "Engine/World.h"
 
+#include "Cloud9/Game/Cloud9DeveloperSettings.h"
+#include "Cloud9/Game/Cloud9KeyboardController.h"
+#include "Cloud9/Game/Cloud9MouseController.h"
+#include "Cloud9/Console/Cloud9ConsoleComponent.h"
+
 const FName ACloud9PlayerController::ConsoleName = TEXT("Console");
 const FName ACloud9PlayerController::KeyboardControllerName = TEXT("KeyboardController");
 const FName ACloud9PlayerController::MouseControllerName = TEXT("MouseController");

diff --git a/Source/Cloud9/Game/Cloud9PlayerController.h b/Source/Cloud9/Game/Cloud9PlayerController.h
@@ -25,6 +25,10 @@
 
 #include "CoreMinimal.h"
 #include "GameFramework/PlayerController.h"
+
+#include "Cloud9/Tools/Macro/Common.h"
+#include "Cloud9/Tools/Macro/Logging.h"
+
 #include "Cloud9PlayerController.generated.h"
 
 class UCloud9KeyboardController;

diff --git a/Source/Cloud9/Tests/Unit/Tools/TestContainer.spec.cpp b/Source/Cloud9/Tests/Unit/Tools/TestContainer.spec.cpp
@@ -21,8 +21,6 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
-
-#include "Cloud9/Cloud9.h"
 #include "Cloud9/Tools/Extensions/TContainer.h"
 
 BEGIN_DEFINE_SPEC(

diff --git a/Source/Cloud9/Tests/Unit/Tools/TestOperator.spec.cpp b/Source/Cloud9/Tests/Unit/Tools/TestOperator.spec.cpp
@@ -21,8 +21,6 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
-
-#include "Cloud9/Cloud9.h"
 #include "Cloud9/Tools/Extensions/TContainer.h"
 #include "Cloud9/Tools/Macro/Operator.h"
 

diff --git a/Source/Cloud9/Tests/Unit/Tools/TestWhenOrNone.spec.cpp b/Source/Cloud9/Tests/Unit/Tools/TestWhenOrNone.spec.cpp
@@ -21,7 +21,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
-
+#include "Cloud9/Tools/Macro/Common.h"
 #include "Cloud9/Tests/Unit/Fake/UWhenOrNoneTestClassA.h"
 #include "Cloud9/Tests/Unit/Fake/UWhenOrNoneTestClassB.h"
 #include "Cloud9/Tools/Extensions/WhenOrNone.h"

diff --git a/Source/Cloud9/Tools/Cloud9ToolsLibrary.cpp b/Source/Cloud9/Tools/Cloud9ToolsLibrary.cpp
@@ -23,7 +23,6 @@
 
 #include "Cloud9ToolsLibrary.h"
 
-#include "Cloud9/Cloud9.h"
 #include "Cloud9/Game/Cloud9GameMode.h"
 
 void UCloud9ToolsLibrary::SetCollisionComplexity(UStaticMesh* StaticMesh, uint8 CollisionTraceFlag)