UE5.3

Updated to 5.3.
Removed unused include files.
Fixed some inspection issues.

Plugins/Binaries/Win64/UnrealEditor.modules

@@ -1,5 +1,5 @@
 {
-	"BuildId": "19505902",
+	"BuildId": "27405482",
 	"Modules": 
 	{
 		"ElgKismetEditorWidget": "UnrealEditor-ElgKismetEditorWidget.dll"

Plugins/ElgKismetEditorWidget.uplugin

@@ -10,7 +10,7 @@
 	"DocsURL": "",
 	"MarketplaceURL": "",
 	"SupportURL": "",
-	"EngineVersion": "5.0.0",
+	"EngineVersion": "5.3.0",
 	"CanContainContent": true,
 	"Installed": true,
 	"Modules": [

Plugins/Source/ElgKismetEditorWidget/Private/BP/ElgKEWBlueprintEditorBP.cpp

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 ElgSoft. All rights reserved. 
+// Copyright 2019-2023 ElgSoft. All rights reserved. 
 
 
 #include "ElgKEWBlueprintEditorBP.h"
@@ -52,14 +52,13 @@ EBPElgKEWGraphType UElgKEWBlueprintEditorBP::GetGraphType(UEdGraph* InGraph)
 {
 	if (InGraph) {
 		if (const UEdGraphSchema* schema = InGraph->GetSchema()) {
-			EGraphType graphType = schema->GetGraphType(InGraph);
-			switch (graphType) {
-			case EGraphType::GT_Ubergraph:		return EBPElgKEWGraphType::GT_Ubergraph;
-			case EGraphType::GT_Animation:		return EBPElgKEWGraphType::GT_Animation;
-			case EGraphType::GT_Function:		return EBPElgKEWGraphType::GT_Function;
-			case EGraphType::GT_Macro:			return EBPElgKEWGraphType::GT_Macro;
-			case EGraphType::GT_StateMachine:	return EBPElgKEWGraphType::GT_StateMachine;
-			default:							return EBPElgKEWGraphType::GT_Function;
+			switch (schema->GetGraphType(InGraph)) {
+				case 		GT_Ubergraph:		return EBPElgKEWGraphType::GT_Ubergraph;
+				case 		GT_Animation:		return EBPElgKEWGraphType::GT_Animation;
+				case 		GT_Function:		return EBPElgKEWGraphType::GT_Function;
+				case 		GT_Macro:			return EBPElgKEWGraphType::GT_Macro;
+				case 		GT_StateMachine:	return EBPElgKEWGraphType::GT_StateMachine;
+				default:						return EBPElgKEWGraphType::GT_Function;
 			}
 		}
 	}
@@ -93,8 +92,7 @@ void UElgKEWBlueprintEditorBP::MakePinType(EBPElgKEWPinCategory InType, EBPElgPi
 void UElgKEWBlueprintEditorBP::TestFindBlueprintEditor(UObject* InSelf)
 {
 	if (GEditor) {
-		IAssetEditorInstance* AssetEditor = GEditor->GetEditorSubsystem<UAssetEditorSubsystem>()->FindEditorForAsset(InSelf->GetClass()->ClassGeneratedBy, false);
-		if (AssetEditor) {
+		if (IAssetEditorInstance* AssetEditor = GEditor->GetEditorSubsystem<UAssetEditorSubsystem>()->FindEditorForAsset(InSelf->GetClass()->ClassGeneratedBy, false)) {
 			FBlueprintEditor* BlueprintEditor = static_cast<FBlueprintEditor*>(AssetEditor);
 			UE_LOG(LogElgKismetEditorWidget, Log, TEXT("Found it!"));
 			GetKismetContext(InSelf);

Plugins/Source/ElgKismetEditorWidget/Private/BP/ElgKEWGraphFunctionBP.cpp

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 ElgSoft. All rights reserved. 
+// Copyright 2019-2023 ElgSoft. All rights reserved. 
 
 
 #include "ElgKEWGraphFunctionBP.h"

Plugins/Source/ElgKismetEditorWidget/Private/BP/ElgKEWGraphNodeBP.cpp

@@ -1,10 +1,7 @@
-// Copyright 2019-2021 ElgSoft. All rights reserved. 
+// Copyright 2019-2023 ElgSoft. All rights reserved. 
 
 
 #include "ElgKEWGraphNodeBP.h"
-#include "ElgKEWStructs.h"
-#include <ElgKEWEnum.h>
-#include <Kismet2/KismetEditorUtilities.h>
 #include <Math/Color.h>
 #include <Textures/SlateIcon.h>
 #include <K2Node_Variable.h>

Plugins/Source/ElgKismetEditorWidget/Private/BP/ElgKEWGraphPinBP.cpp

@@ -1,12 +1,8 @@
-// Copyright 2019-2021 ElgSoft. All rights reserved. 
+// Copyright 2019-2023 ElgSoft. All rights reserved. 
 
 
 #include "ElgKEWGraphPinBP.h"
 #include <ElgKEWStructs.h>
-#include <ElgKEWUtils.h>
-#include <Kismet2/KismetEditorUtilities.h>
-#include <EdGraphSchema_K2.h>
-#include <Kismet/KismetSystemLibrary.h>
 #include <ElgBESGraphPin.h>
 
 

Plugins/Source/ElgKismetEditorWidget/Private/BP/ElgKEWVariableBP.cpp

@@ -1,13 +1,10 @@
-// Copyright 2019-2021 ElgSoft. All rights reserved. 
+// Copyright 2019-2023 ElgSoft. All rights reserved. 
 
 
 #include "ElgKEWVariableBP.h"
 #include "ElgKEWStructs.h"
 #include "ElgKEWEnum.h"
-#include <ElgEditorContext_BlueprintEditor.h>
-#include <ElgKEWEditorSubSystem.h>
-#include <ElgKEWUtils.h>
-
+#include "Styling/AppStyle.h"
 #include <ElgBESGraphVariable.h>
 
 
@@ -105,9 +102,9 @@ FText UElgKEWVariableBP::GetVariableExposedTipText(const bool bExposedState)
 void UElgKEWVariableBP::GetVariableExposedIcon(const bool bExposedState, FSlateBrush& OutBrush)
 {
 	if (bExposedState) {
-		OutBrush = *FEditorStyle::GetBrush("Kismet.VariableList.ExposeForInstance");
+		OutBrush = *FAppStyle::GetBrush("Kismet.VariableList.ExposeForInstance");
 	} else {
-		OutBrush = *FEditorStyle::GetBrush("Kismet.VariableList.HideForInstance");
+		OutBrush = *FAppStyle::GetBrush("Kismet.VariableList.HideForInstance");
 	}
 }
 

Plugins/Source/ElgKismetEditorWidget/Private/BP/ElgKEWVariableLocalBP.cpp

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 ElgSoft. All rights reserved. 
+// Copyright 2019-2023 ElgSoft. All rights reserved. 
 
 
 #include "ElgKEWVariableLocalBP.h"

Plugins/Source/ElgKismetEditorWidget/Private/BPWrappers/ElgBESBase.cpp

@@ -1,10 +1,12 @@
-// Copyright 2019-2021 ElgSoft. All rights reserved. 
+// Copyright 2019-2023 ElgSoft. All rights reserved.
 
 
 #include "BPWrappers/ElgBESBase.h"
 #include <Styling/SlateBrush.h>
 #include <ElgEditorContext_BlueprintEditor.h>
 #include <ElgKEWEditorSubSystem.h>
+#include "Styling/AppStyle.h"
+
 
 void UElgBESBase::ShowInDetails()
 {
@@ -111,6 +113,6 @@ int32 UElgBESBase::GetCountInternal()
 void UElgBESBase::GetIconInternal(struct FSlateBrush& OutBrush)
 {
 	FLinearColor tint = FLinearColor(1.0f, 1.0f, 1.0f, 1.0f);
-	OutBrush = *FEditorStyle::GetBrush(TEXT("GraphEditor.PureFunction_16x"));
+	OutBrush = *FAppStyle::GetBrush(TEXT("GraphEditor.PureFunction_16x"));
 	OutBrush.TintColor = tint;
 }

Plugins/Source/ElgKismetEditorWidget/Private/BPWrappers/ElgBESGraphEditablePinBase.cpp

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 ElgSoft. All rights reserved. 
+// Copyright 2019-2023 ElgSoft. All rights reserved. 
 
 
 #include "ElgBESGraphEditablePinBase.h"
@@ -145,7 +145,7 @@ void UElgBESGraphEditablePinBase::Setup(UBlueprint* InBlueprint, UEdGraph* InGra
 	NodePtr = InNode;
 	PinPtr = InPin;
 	bCanAddExecPins = false;
-	bInputPin = PinPtr->Direction == EEdGraphPinDirection::EGPD_Output ? true : false;
+	bInputPin = PinPtr->Direction == EGPD_Output ? true : false;
 	Direction = bInputPin ? EBPElgKEWPinDirection::Input : EBPElgKEWPinDirection::Output;
 	SetupCustom();
 	UpdatePinProperties();

Plugins/Source/ElgKismetEditorWidget/Private/BPWrappers/ElgBESGraphEventDispatcher.cpp

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 ElgSoft. All rights reserved. 
+// Copyright 2019-2023 ElgSoft. All rights reserved. 
 
 
 #include "BPWrappers/ElgBESGraphEventDispatcher.h"
@@ -102,7 +102,7 @@ UElgBESGraphEventDispatcherPin* UElgBESGraphEventDispatcher::AddInputPin(FS_ElgG
 		InPinName = FName(TEXT("newparam"));
 	}
 	UElgBESGraphEventDispatcherPin* newPin = nullptr;
-	InPinName = FElgKEWUtils::AddEditablePin(BlueprintPtr, NodePtr, InPinName, InType, InDefaultValue, EEdGraphPinDirection::EGPD_Output);
+	InPinName = FElgKEWUtils::AddEditablePin(BlueprintPtr, NodePtr, InPinName, InType, InDefaultValue, EGPD_Output);
 	GetInputPinVariable(InPinName, newPin);
 	return newPin;
 }

Plugins/Source/ElgKismetEditorWidget/Private/BPWrappers/ElgBESGraphEventDispatcherPin.cpp

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 ElgSoft. All rights reserved. 
+// Copyright 2019-2023 ElgSoft. All rights reserved. 
 
 
 #include "ElgBESGraphEventDispatcherPin.h"

Plugins/Source/ElgKismetEditorWidget/Private/BPWrappers/ElgBESGraphFunction.cpp

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 ElgSoft. All rights reserved. 
+// Copyright 2019-2023 ElgSoft. All rights reserved. 
 
 
 #include "ElgBESGraphFunction.h"
@@ -12,7 +12,6 @@
 #include <K2Node_CallFunction.h>
 #include <K2Node_CreateDelegate.h>
 #include <GraphEditorSettings.h>
-#include <K2Node_FunctionTerminator.h>
 #include <K2Node_FunctionResult.h>
 #include <K2Node_FunctionEntry.h>
 #include "ObjectEditorUtils.h"
@@ -33,7 +32,7 @@ void UElgBESGraphFunction::SetIsPure(const bool bIsPure /*= true*/)
 	const FScopedTransaction Transaction(LOCTEXT("ChangePure", "Change Pure"));
 	EntryNodePtr->Modify();
 	func->Modify();
-	func->FunctionFlags ^= EFunctionFlags::FUNC_BlueprintPure;
+	func->FunctionFlags ^= FUNC_BlueprintPure;
 	EntryNodePtr->SetExtraFlags(EntryNodePtr->GetExtraFlags() ^ EFunctionFlags::FUNC_BlueprintPure);
 	FElgKEWUtils::UpdatedNodeParameters(EntryNodePtr);
 	FBlueprintEditorUtils::MarkBlueprintAsStructurallyModified(GetBlueprint());
@@ -53,11 +52,11 @@ void UElgBESGraphFunction::SetAccessSpecifier(EBPElgKEWFunctionAccess InAccessSp
 	int32 extraFlags = EntryNodePtr->GetExtraFlags();
 	extraFlags &= clearAccessSpecifierMask;
 
-	EFunctionFlags flag = EFunctionFlags::FUNC_Public;
+	EFunctionFlags flag = FUNC_Public;
 	switch (InAccessSpecifier) {
-	case EBPElgKEWFunctionAccess::Public:		flag = EFunctionFlags::FUNC_Public; break;
-	case EBPElgKEWFunctionAccess::Protected:	flag = EFunctionFlags::FUNC_Protected; break;
-	case EBPElgKEWFunctionAccess::Private:		flag = EFunctionFlags::FUNC_Private; break;
+	case EBPElgKEWFunctionAccess::Public:		flag = FUNC_Public; break;
+	case EBPElgKEWFunctionAccess::Protected:	flag = FUNC_Protected; break;
+	case EBPElgKEWFunctionAccess::Private:		flag = FUNC_Private; break;
 	}
 	extraFlags |= flag;
 	EntryNodePtr->SetExtraFlags(extraFlags);
@@ -222,7 +221,7 @@ void UElgBESGraphFunction::Remove(const bool bShowDialog /*= false*/)
 void UElgBESGraphFunction::Duplicate(UElgBESGraphFunction*& OutFunction)
 {
 	if (!ValidateFunction()) return;
-	if (UEdGraph* newGraph= FElgKEWUtils::DuplcateGraph(GetBlueprint(), GraphPtr)) {
+	if (UEdGraph* newGraph= FElgKEWUtils::DuplicateGraph(GetBlueprint(), GraphPtr)) {
 		OutFunction = UElgBESGraphFunction::MakeGraphFunctionObject(newGraph);
 		return;
 	}
@@ -503,7 +502,7 @@ bool UElgBESGraphFunction::GetIsOverride()
 {
 	if (!ValidateFunction()) return false; 
 	if (!GetBlueprint()->ParentClass) return false;
-	if (UFunction* overrideFunc = FindUField<UFunction>(GetBlueprint()->ParentClass, Name)) {
+	if (FindUField<UFunction>(GetBlueprint()->ParentClass, Name)) {
 		return true;
 	}
 	return false;
@@ -554,7 +553,7 @@ int32 UElgBESGraphFunction::GetCountInternal()
 		TArray<UK2Node_CallFunction*> callNodes;
 		graph->GetNodesOfClass(callNodes);
 		for (UK2Node_CallFunction* node : callNodes) {
-			if (FElgKEWUtils::GetCallfunctionMemberGuid(node) == Guid) {
+			if (FElgKEWUtils::GetCallFunctionMemberGuid(node) == Guid) {
 				usage++;
 			}
 		}
@@ -573,7 +572,7 @@ void UElgBESGraphFunction::GetIconInternal(struct FSlateBrush& OutBrush)
 {
 	if (!ValidateFunction()) return;
 
-	FLinearColor tint = FLinearColor(1.0f, 1.0f, 1.0f, 1.0f);
+	FLinearColor tint;
 	if (GetIsPure()) {
 		tint = GetDefault<UGraphEditorSettings>()->PureFunctionCallNodeTitleColor;
 	} else {
@@ -582,11 +581,11 @@ void UElgBESGraphFunction::GetIconInternal(struct FSlateBrush& OutBrush)
 
 	if (UFunction* overrideFunc = FindUField<UFunction>(GetBlueprint()->ParentClass, Name)) {
 		const bool bIsPureFunction = overrideFunc && overrideFunc->HasAnyFunctionFlags(FUNC_BlueprintPure);
-		OutBrush = *FEditorStyle::GetBrush(bIsPureFunction ? TEXT("GraphEditor.OverridePureFunction_16x") : TEXT("GraphEditor.OverrideFunction_16x"));
+		OutBrush = *FAppStyle::GetBrush(bIsPureFunction ? TEXT("GraphEditor.OverridePureFunction_16x") : TEXT("GraphEditor.OverrideFunction_16x"));
 	}
 	else {
 		bool bIsPPure = GetIsPure();
-		OutBrush = *FEditorStyle::GetBrush(bIsPPure ? TEXT("GraphEditor.PureFunction_16x") : TEXT("GraphEditor.Function_16x"));
+		OutBrush = *FAppStyle::GetBrush(bIsPPure ? TEXT("GraphEditor.PureFunction_16x") : TEXT("GraphEditor.Function_16x"));
 	}
 	OutBrush.TintColor = tint;
 }

Plugins/Source/ElgKismetEditorWidget/Private/BPWrappers/ElgBESGraphFunctionPin.cpp

@@ -1,10 +1,8 @@
-// Copyright 2019-2021 ElgSoft. All rights reserved. 
+// Copyright 2019-2023 ElgSoft. All rights reserved. 
 
 #include "BPWrappers/ElgBESGraphFunctionPin.h"
-#include <ElgKEWUtils.h>
 #include <K2Node_VariableGet.h>
 #include <K2Node_EditablePinBase.h>
-#include <Kismet2/BlueprintEditorUtils.h>
 #include <ElgKEWEditorSubSystem.h>
 
 

Plugins/Source/ElgKismetEditorWidget/Private/BPWrappers/ElgBESGraphInterface.cpp

@@ -1,13 +1,9 @@
-// Copyright 2019-2021 ElgSoft. All rights reserved. 
+// Copyright 2019-2023 ElgSoft. All rights reserved. 
 
 
 #include "BPWrappers/ElgBESGraphInterface.h"
 #include <ElgKEWUtils.h>
-#include <ElgBESGraphFunction.h>
 #include <ElgBESGraphInterfaceFunction.h>
-#include <ClassViewerModule.h>
-#include <ClassViewerFilter.h>
-#include <Kismet2/KismetEditorUtilities.h>
 #include <AssetRegistry/AssetRegistryModule.h>
 #include <ElgKEWBlueprintInterfaceFilter.h>
 #include "ElgKEW_Log.h"
@@ -142,7 +138,7 @@ TArray<UElgBESGraphInterface*> UElgBESGraphInterface::GetBlueprintInterfaces(UBl
 	check(InBlueprint);
 	for (int32 i = 0; i < InBlueprint->ImplementedInterfaces.Num(); i++) {
 		FBPInterfaceDescription& InterfaceDesc = InBlueprint->ImplementedInterfaces[i];
-		interfaces.Add(UElgBESGraphInterface::MakeGraphInterface(InBlueprint, InterfaceDesc));
+		interfaces.Add(MakeGraphInterface(InBlueprint, InterfaceDesc));
 	}
 	if (bIncludeInherent) {
 		// Now get all the ones the blueprint's parents implemented
@@ -193,7 +189,7 @@ TArray<FName> UElgBESGraphInterface::GetInterfaces(UBlueprint* InBlueprint)
 	IAssetRegistry& AssetRegistry = AssetRegistryModule.Get();
 
 	FARFilter Filter;	
-	Filter.ClassNames.Add(UBlueprint::StaticClass()->GetFName());
+	Filter.ClassPaths.Add(UBlueprint::StaticClass()->GetClassPathName());
 	Filter.bRecursiveClasses = true;
 	Filter.TagsAndValues.Add(FName(TEXT("BlueprintType")), FString(TEXT("BPTYPE_Interface")));
 

Plugins/Source/ElgKismetEditorWidget/Private/BPWrappers/ElgBESGraphInterfaceFunction.cpp

@@ -1,19 +1,16 @@
-// Copyright 2019-2021 ElgSoft. All rights reserved. 
+// Copyright 2019-2023 ElgSoft. All rights reserved. 
 
 #include "ElgBESGraphInterfaceFunction.h"
 #include <ElgKEWUtils.h>
 #include <ElgKEWEditorSubSystem.h>
 #include <ElgEditorContext_BlueprintEditor.h>
 #include <Kismet2/KismetEditorUtilities.h>
 #include <Kismet2/BlueprintEditorUtils.h>
-#include <K2Node_FunctionResult.h>
-#include <K2Node_FunctionEntry.h>
-#include <K2Node_CreateDelegate.h>
 #include <K2Node_CallFunction.h>
-#include <GraphEditorSettings.h>
 #include "ObjectEditorUtils.h"
 #include <K2Node_Event.h>
 #include "ElgKEW_Log.h"
+#include "K2Node_FunctionEntry.h"
 
 
 #define LOCTEXT_NAMESPACE "FElgKismetEditorWidgetModule"
@@ -52,10 +49,8 @@ bool UElgBESGraphInterfaceFunction::ImpletentEvent()
 	if (UK2Node_Event* ExistingNode = FBlueprintEditorUtils::FindOverrideForFunction(BlueprintPtr, OverrideFuncClass, FunctionName)) {
 		FKismetEditorUtilities::BringKismetToFocusAttentionOnObject(ExistingNode, false);
 		return false;
-	} else {
-		return FElgKEWUtils::SpawnEventNodeInGraph(BlueprintPtr, FunctionName);
 	}
-	return true;
+	return FElgKEWUtils::SpawnEventNodeInGraph(BlueprintPtr, FunctionName);
 }
 
 
@@ -335,7 +330,7 @@ void UElgBESGraphInterfaceFunction::GetIconInternal(struct FSlateBrush& OutBrush
 	if (!bFunction) {
 		tint = FLinearColor::Yellow;
 	}
-	OutBrush = *FEditorStyle::GetBrush(TEXT("GraphEditor.InterfaceFunction_16x"));
+	OutBrush = *FAppStyle::GetBrush(TEXT("GraphEditor.InterfaceFunction_16x"));
 	OutBrush.TintColor = tint;
 
 }

Plugins/Source/ElgKismetEditorWidget/Private/BPWrappers/ElgBESGraphMacro.cpp

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 ElgSoft. All rights reserved. 
+// Copyright 2019-2023 ElgSoft. All rights reserved. 
 
 
 #include "ElgBESGraphMacro.h"
@@ -100,7 +100,7 @@ UElgBESGraphMacroPin* UElgBESGraphMacro::AddInputPin(FS_ElgGraphPinType InType,
 		InPinName = FName(TEXT("newparam"));
 	}
 	UElgBESGraphMacroPin* newPin = nullptr;
-	InPinName = FElgKEWUtils::AddEditablePin(GetBlueprint(), InputNodePtr, InPinName, InType, InDefaultValue, EEdGraphPinDirection::EGPD_Output);
+	InPinName = FElgKEWUtils::AddEditablePin(GetBlueprint(), InputNodePtr, InPinName, InType, InDefaultValue, EGPD_Output);
 	GetMacroInputPinVariable(InPinName, newPin);
 	return newPin;
 }
@@ -112,7 +112,7 @@ UElgBESGraphMacroPin* UElgBESGraphMacro::AddOutputPin(FS_ElgGraphPinType InType,
 		InPinName = FName(TEXT("newparam"));
 	}
 	UElgBESGraphMacroPin* newPin = nullptr;
-	InPinName = FElgKEWUtils::AddEditablePin(GetBlueprint(), OutputNodePtr, InPinName, InType, FString(), EEdGraphPinDirection::EGPD_Input);
+	InPinName = FElgKEWUtils::AddEditablePin(GetBlueprint(), OutputNodePtr, InPinName, InType, FString(), EGPD_Input);
 	GetMacroOutputPinVariable(InPinName, newPin);
 	return newPin;
 }
@@ -190,7 +190,7 @@ void UElgBESGraphMacro::SetMacroName(FName InNewName)
 void UElgBESGraphMacro::Duplicate(UElgBESGraphMacro*& OutMacro)
 {
 	if (!ValidateMacro()) return;
-	if (UEdGraph* newGraph = FElgKEWUtils::DuplcateGraph(GetBlueprint(), GraphPtr)) {
+	if (UEdGraph* newGraph = FElgKEWUtils::DuplicateGraph(GetBlueprint(), GraphPtr)) {
 		OutMacro = UElgBESGraphMacro::MakeGraphMacroObject(newGraph);
 		return;
 	}

Plugins/Source/ElgKismetEditorWidget/Private/BPWrappers/ElgBESGraphMacroPin.cpp

@@ -1,9 +1,8 @@
-// Copyright 2019-2021 ElgSoft. All rights reserved. 
+// Copyright 2019-2023 ElgSoft. All rights reserved. 
 
 
 #include "BPWrappers/ElgBESGraphMacroPin.h"
 #include <ElgKEWUtils.h>
-#include <K2Node_VariableGet.h>
 
 #define LOCTEXT_NAMESPACE "FElgKismetEditorWidgetModule"