From 1033bc8cf7f36fbfce13b49a15421850b72d4057 Mon Sep 17 00:00:00 2001 From: Arnaud Jamin Date: Fri, 10 May 2024 22:56:37 -0400 Subject: [PATCH] Move enum ECogLogVerbosity to cog common --- .../Source/CogCommon/Public/CogCommonLog.h | 34 +++++++++++++++++++ .../CogCommon/Public/CogCommonLogCategory.h | 20 ----------- .../Private/CogDebugDrawBlueprint.cpp | 2 +- .../Source/CogDebug/Private/CogDebugLog.cpp | 3 +- .../CogDebug/Private/CogDebugLogBlueprint.cpp | 2 +- .../CogDebug/Public/CogDebugLogBlueprint.h | 15 +------- .../CogDebug/Public/CogDebugReplicator.h | 2 +- .../Private/CogDebugLogCategoryDetails.cpp | 2 +- .../Private/SCogDebugLogCategoryGraphPin.cpp | 2 +- .../Public/CogDebugGraphPanelPinFactory.h | 2 +- 10 files changed, 42 insertions(+), 42 deletions(-) create mode 100644 Plugins/Cog/Source/CogCommon/Public/CogCommonLog.h delete mode 100644 Plugins/Cog/Source/CogCommon/Public/CogCommonLogCategory.h diff --git a/Plugins/Cog/Source/CogCommon/Public/CogCommonLog.h b/Plugins/Cog/Source/CogCommon/Public/CogCommonLog.h new file mode 100644 index 0000000..fc55b7a --- /dev/null +++ b/Plugins/Cog/Source/CogCommon/Public/CogCommonLog.h @@ -0,0 +1,34 @@ +#pragma once + +#include "CoreMinimal.h" +#include "CogCommonLog.generated.h" + +//-------------------------------------------------------------------------------------------------------------------------- +UENUM(BlueprintType) +enum class ECogLogVerbosity : uint8 +{ + NoLogging = ELogVerbosity::NoLogging, + Fatal = ELogVerbosity::Fatal, + Error = ELogVerbosity::Error, + Warning = ELogVerbosity::Warning, + Display = ELogVerbosity::Display, + Log = ELogVerbosity::Log, + Verbose = ELogVerbosity::Verbose, + VeryVerbose = ELogVerbosity::VeryVerbose +}; + +//-------------------------------------------------------------------------------------------------------------------------- +USTRUCT(BlueprintType) +struct COGCOMMON_API FCogLogCategory +{ + GENERATED_USTRUCT_BODY() + + FCogLogCategory() {} + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + FName Name; + + FString GetName() const { return Name.ToString(); } + + mutable FLogCategoryBase* LogCategory = nullptr; +}; diff --git a/Plugins/Cog/Source/CogCommon/Public/CogCommonLogCategory.h b/Plugins/Cog/Source/CogCommon/Public/CogCommonLogCategory.h deleted file mode 100644 index e9d8d7c..0000000 --- a/Plugins/Cog/Source/CogCommon/Public/CogCommonLogCategory.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "CoreMinimal.h" -#include "CogCommonLogCategory.generated.h" - -//-------------------------------------------------------------------------------------------------------------------------- -USTRUCT(BlueprintType) -struct COGCOMMON_API FCogLogCategory -{ - GENERATED_USTRUCT_BODY() - - FCogLogCategory() {} - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - FName Name; - - FString GetName() const { return Name.ToString(); } - - mutable FLogCategoryBase* LogCategory = nullptr; -}; diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebugDrawBlueprint.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebugDrawBlueprint.cpp index cdd8bb3..755c5ac 100644 --- a/Plugins/Cog/Source/CogDebug/Private/CogDebugDrawBlueprint.cpp +++ b/Plugins/Cog/Source/CogDebug/Private/CogDebugDrawBlueprint.cpp @@ -1,7 +1,7 @@ #include "CogDebugDrawBlueprint.h" #include "CogDebugDraw.h" -#include "CogCommonLogCategory.h" +#include "CogCommonLog.h" #include "CogDebugLog.h" //-------------------------------------------------------------------------------------------------------------------------- diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebugLog.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebugLog.cpp index 26c0199..6694218 100644 --- a/Plugins/Cog/Source/CogDebug/Private/CogDebugLog.cpp +++ b/Plugins/Cog/Source/CogDebug/Private/CogDebugLog.cpp @@ -1,7 +1,6 @@ #include "CogDebugLog.h" -#include "CogCommonLogCategory.h" -#include "CogDebugModule.h" +#include "CogCommonLog.h" #include "CogDebugReplicator.h" #include "Engine/Engine.h" #include "Engine/World.h" diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebugLogBlueprint.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebugLogBlueprint.cpp index 95e1533..ed45fb2 100644 --- a/Plugins/Cog/Source/CogDebug/Private/CogDebugLogBlueprint.cpp +++ b/Plugins/Cog/Source/CogDebug/Private/CogDebugLogBlueprint.cpp @@ -2,7 +2,7 @@ #include "CogCommon.h" #include "CogDebugLog.h" -#include "CogCommonLogCategory.h" +#include "CogCommonLog.h" //-------------------------------------------------------------------------------------------------------------------------- void UCogDebugLogBlueprint::Log(const UObject* WorldContextObject, const FCogLogCategory LogCategory, ECogLogVerbosity Verbosity, const FString& Text) diff --git a/Plugins/Cog/Source/CogDebug/Public/CogDebugLogBlueprint.h b/Plugins/Cog/Source/CogDebug/Public/CogDebugLogBlueprint.h index 0f1a422..8806f01 100644 --- a/Plugins/Cog/Source/CogDebug/Public/CogDebugLogBlueprint.h +++ b/Plugins/Cog/Source/CogDebug/Public/CogDebugLogBlueprint.h @@ -1,23 +1,10 @@ #pragma once #include "CoreMinimal.h" -#include "Kismet/KismetSystemLibrary.h" +#include "CogCommonLog.h" #include "Logging/LogVerbosity.h" #include "CogDebugLogBlueprint.generated.h" -//-------------------------------------------------------------------------------------------------------------------------- -UENUM() -enum class ECogLogVerbosity : uint8 -{ - Fatal = ELogVerbosity::Fatal, - Error = ELogVerbosity::Error, - Warning = ELogVerbosity::Warning, - Display = ELogVerbosity::Display, - Log = ELogVerbosity::Log, - Verbose = ELogVerbosity::Verbose, - VeryVerbose = ELogVerbosity::VeryVerbose -}; - //-------------------------------------------------------------------------------------------------------------------------- UCLASS(meta = (ScriptName = "CogLogBlueprint")) class COGDEBUG_API UCogDebugLogBlueprint : public UBlueprintFunctionLibrary diff --git a/Plugins/Cog/Source/CogDebug/Public/CogDebugReplicator.h b/Plugins/Cog/Source/CogDebug/Public/CogDebugReplicator.h index 3d15b07..0076af6 100644 --- a/Plugins/Cog/Source/CogDebug/Public/CogDebugReplicator.h +++ b/Plugins/Cog/Source/CogDebug/Public/CogDebugReplicator.h @@ -1,9 +1,9 @@ #pragma once #include "CoreMinimal.h" +#include "CogCommonLog.h" #include "GameFramework/Actor.h" #include "CogDebugShape.h" -#include "CogDebugLogBlueprint.h" #include "UObject/Class.h" #include "UObject/ObjectMacros.h" #include "CogDebugReplicator.generated.h" diff --git a/Plugins/Cog/Source/CogDebugEditor/Private/CogDebugLogCategoryDetails.cpp b/Plugins/Cog/Source/CogDebugEditor/Private/CogDebugLogCategoryDetails.cpp index 5f2583d..bf4e93b 100644 --- a/Plugins/Cog/Source/CogDebugEditor/Private/CogDebugLogCategoryDetails.cpp +++ b/Plugins/Cog/Source/CogDebugEditor/Private/CogDebugLogCategoryDetails.cpp @@ -1,6 +1,6 @@ #include "CogDebugLogCategoryDetails.h" -#include "CogCommonLogCategory.h" +#include "CogCommonLog.h" #include "CogDebugLog.h" #include "DetailWidgetRow.h" #include "Editor.h" diff --git a/Plugins/Cog/Source/CogDebugEditor/Private/SCogDebugLogCategoryGraphPin.cpp b/Plugins/Cog/Source/CogDebugEditor/Private/SCogDebugLogCategoryGraphPin.cpp index 3f4381f..e225686 100644 --- a/Plugins/Cog/Source/CogDebugEditor/Private/SCogDebugLogCategoryGraphPin.cpp +++ b/Plugins/Cog/Source/CogDebugEditor/Private/SCogDebugLogCategoryGraphPin.cpp @@ -1,6 +1,6 @@ #include "SCogDebugLogCategoryGraphPin.h" -#include "CogCommonLogCategory.h" +#include "CogCommonLog.h" #include "ScopedTransaction.h" #include "SCogDebugLogCategoryWidget.h" #include "UObject/UObjectIterator.h" diff --git a/Plugins/Cog/Source/CogDebugEditor/Public/CogDebugGraphPanelPinFactory.h b/Plugins/Cog/Source/CogDebugEditor/Public/CogDebugGraphPanelPinFactory.h index e8d850d..720c5fb 100644 --- a/Plugins/Cog/Source/CogDebugEditor/Public/CogDebugGraphPanelPinFactory.h +++ b/Plugins/Cog/Source/CogDebugEditor/Public/CogDebugGraphPanelPinFactory.h @@ -2,7 +2,7 @@ #include "CoreMinimal.h" #include "CogDebugGraphPanelPinFactory.h" -#include "CogCommonLogCategory.h" +#include "CogCommonLog.h" #include "EdGraphSchema_K2.h" #include "EdGraphUtilities.h" #include "SCogDebugLogCategoryGraphPin.h"