From f0a676a074081619e91563ed501b581261413019 Mon Sep 17 00:00:00 2001 From: Rob B Date: Mon, 23 Oct 2023 02:49:06 -0400 Subject: [PATCH 1/2] Make CP_ widget extension classes abstract to avoid confusion when creating configs (cherry picked from commit 2e2ce58c93ee046993ae50f947afe619b02fcf2a) --- .../Public/Configuration/Properties/WidgetExtension/CP_Array.h | 2 +- .../Public/Configuration/Properties/WidgetExtension/CP_Bool.h | 2 +- .../Public/Configuration/Properties/WidgetExtension/CP_Class.h | 2 +- .../Public/Configuration/Properties/WidgetExtension/CP_Float.h | 2 +- .../Configuration/Properties/WidgetExtension/CP_Integer.h | 2 +- .../Configuration/Properties/WidgetExtension/CP_Section.h | 2 +- .../Public/Configuration/Properties/WidgetExtension/CP_String.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Array.h b/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Array.h index dc8895c600..3a1f7cae28 100644 --- a/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Array.h +++ b/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Array.h @@ -10,7 +10,7 @@ enum class ECP_ArrayWidgetType : uint8 }; -UCLASS(EditInlineNew) +UCLASS(EditInlineNew, Abstract) class SML_API UCP_Array : public UConfigPropertyArray { GENERATED_BODY() public: diff --git a/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Bool.h b/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Bool.h index e3894bf7bc..6b4e0826ed 100644 --- a/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Bool.h +++ b/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Bool.h @@ -3,7 +3,7 @@ #include "CP_Bool.generated.h" -UCLASS(EditInlineNew) +UCLASS(EditInlineNew, Abstract) class SML_API UCP_Bool : public UConfigPropertyBool { GENERATED_BODY() public: diff --git a/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Class.h b/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Class.h index da929865e6..c31f504fd0 100644 --- a/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Class.h +++ b/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Class.h @@ -3,7 +3,7 @@ #include "CP_Class.generated.h" -UCLASS(EditInlineNew) +UCLASS(EditInlineNew, Abstract) class SML_API UCP_Class : public UConfigPropertyClass { GENERATED_BODY() public: diff --git a/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Float.h b/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Float.h index 96d7761c8d..c8c1e221d6 100644 --- a/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Float.h +++ b/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Float.h @@ -11,7 +11,7 @@ enum class ECP_FloatWidgetType : uint8 }; -UCLASS(EditInlineNew) +UCLASS(EditInlineNew, Abstract) class SML_API UCP_Float : public UConfigPropertyFloat { GENERATED_BODY() diff --git a/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Integer.h b/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Integer.h index 4866a0a3bf..8ba1e78b9f 100644 --- a/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Integer.h +++ b/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Integer.h @@ -12,7 +12,7 @@ enum class ECP_IntegerWidgetType : uint8 }; -UCLASS(EditInlineNew) +UCLASS(EditInlineNew, Abstract) class SML_API UCP_Integer : public UConfigPropertyInteger { GENERATED_BODY() public: diff --git a/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Section.h b/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Section.h index a4ddb8d129..9941516fdf 100644 --- a/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Section.h +++ b/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Section.h @@ -10,7 +10,7 @@ enum class ECP_SectionWidgetType : uint8 CPS_Vertical UMETA(Displayname = "Vertical List", Tooltip = "Nested Properties will be Listed in a Vertical Layout"), }; -UCLASS(EditInlineNew) +UCLASS(EditInlineNew, Abstract) class SML_API UCP_Section : public UConfigPropertySection { GENERATED_BODY() public: diff --git a/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_String.h b/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_String.h index cf4ac12475..de907e45cb 100644 --- a/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_String.h +++ b/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_String.h @@ -2,7 +2,7 @@ #include "Configuration/Properties/ConfigPropertyString.h" #include "CP_String.generated.h" -UCLASS(EditInlineNew) +UCLASS(EditInlineNew, Abstract) class SML_API UCP_String : public UConfigPropertyString { GENERATED_BODY() public: From 44b3ceb5b2b82ed87818da5f6163133dacdbadda Mon Sep 17 00:00:00 2001 From: Rob B Date: Mon, 23 Oct 2023 02:54:06 -0400 Subject: [PATCH 2/2] Clean up whitespace (cherry picked from commit 7bc1446cfb26dfb6e58cd6997cddbacacd710c01) --- .../Configuration/CodeGeneration/ConfigVariableDescriptor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mods/SML/Source/SML/Public/Configuration/CodeGeneration/ConfigVariableDescriptor.h b/Mods/SML/Source/SML/Public/Configuration/CodeGeneration/ConfigVariableDescriptor.h index 27411f3339..4918e79a8d 100644 --- a/Mods/SML/Source/SML/Public/Configuration/CodeGeneration/ConfigVariableDescriptor.h +++ b/Mods/SML/Source/SML/Public/Configuration/CodeGeneration/ConfigVariableDescriptor.h @@ -78,7 +78,7 @@ struct SML_API FConfigVariableDescriptor { UClass* BaseObjectClass; UClass* BaseClassType; class UConfigGeneratedStruct* ConfigGeneratedStructType; - TSharedPtr ArrayElementDescriptor; + TSharedPtr ArrayElementDescriptor; TSharedPtr MapKeyDescriptor; TSharedPtr MapValueDescriptor; };