Support UE 4.26 - 5.0

Author: empty2fill

Source/Linter/Private/LinterNamingConvention.cpp

@@ -159,10 +159,18 @@ void ULinterNamingConvention::SortConventions()
 	});
 }
 
+#if UE_VERSION_NEWER_THAN(5, 0, 0)
+void ULinterNamingConvention::PreSave(FObjectPreSaveContext ObjectSaveContext)
+{
+	Super::PreSave(ObjectSaveContext);
+
+	SortConventions();
+}
+#else
 void ULinterNamingConvention::PreSave(const class ITargetPlatform* TargetPlatform)
 {
 	Super::PreSave(TargetPlatform);
 
 	SortConventions();
 }
->>>>>>> 99c97f0 (Sort Class Naming Conventions on PreSave):Plugins/Linter/Source/Linter/Private/LinterNamingConvention.cpp
+#endif

Source/Linter/Private/UI/LintWizard.cpp

@@ -88,11 +88,13 @@ void SLintWizard::Construct(const FArguments& InArgs)
 				SAssignNew(MainWizard, SWizard)
 				.ShowPageList(false)
 				.ShowCancelButton(false)
-				.ButtonStyle(FAppStyle::Get(), "FlatButton.Default")
-				.CancelButtonStyle(FAppStyle::Get(), "FlatButton.Default")
-				.FinishButtonStyle(FAppStyle::Get(), "FlatButton.Success")
-				.ButtonTextStyle(FAppStyle::Get(), "LargeText")
-				//.ForegroundColor(FAppStyle::Get().GetSlateColor("WhiteBrush"))
+				.ButtonStyle(FEditorStyle::Get(), "FlatButton.Default")
+				.CancelButtonStyle(FEditorStyle::Get(), "FlatButton.Default")
+				.FinishButtonStyle(FEditorStyle::Get(), "FlatButton.Success")
+				.ButtonTextStyle(FEditorStyle::Get(), "LargeText")
+#if UE_VERSION_OLDER_THAN(5, 0, 0)
+				.ForegroundColor(FEditorStyle::Get().GetSlateColor("WhiteBrush"))
+#endif
 				.CanFinish(true)
 				.FinishButtonText(LOCTEXT("FinishButtonText", "Close"))
 				.OnFinished_Lambda([&]()

Source/Linter/Public/LinterNamingConvention.h

@@ -6,6 +6,11 @@
 #include "Templates/SharedPointer.h"
 #include "IDetailCustomization.h"
 #include "PropertyHandle.h"
+#include "Engine/DataAsset.h"
+#include "Misc/EngineVersionComparison.h"
+#if UE_VERSION_NEWER_THAN(5, 0, 0)
+#include "UObject/ObjectSaveContext.h"
+#endif
 #include "LinterNamingConvention.generated.h"
 
 
@@ -76,7 +81,11 @@ class LINTER_API ULinterNamingConvention : public UDataAsset
 	UFUNCTION(Blueprintcallable, Category = "Conventions")
 	void SortConventions();
 
+#if UE_VERSION_NEWER_THAN(5, 0, 0)
+	virtual void PreSave(FObjectPreSaveContext ObjectSaveContext) override;
+#else
 	virtual void PreSave(const class ITargetPlatform* TargetPlatform) override;
+#endif
 
 protected:
 

Source/Linter/Public/LinterSettings.h

@@ -21,4 +21,5 @@ class ULinterSettings : public UObject
 
 	UPROPERTY(EditAnywhere, config, Category = Settings)
 	TSoftObjectPtr<ULintRuleSet> DefaultLintRuleSet;
-};
+
+};