Merge changes from empty2fill

Author: empty2fill

Plugins/Linter/Source/Linter/Private/Linter.cpp

@@ -103,10 +103,10 @@ TSharedRef<SDockTab> FLinterModule::SpawnTab(const FSpawnTabArgs& TabSpawnArgs,
 
 	const TSharedRef<SDockTab> MajorTab =
 		SNew(SDockTab)
-		.Icon(IconBrush)
 		.TabRole(ETabRole::MajorTab);
 
 	MajorTab->SetContent(SNew(SLintWizard));
+	MajorTab->SetTabIcon(IconBrush);
 
 	return MajorTab;
 }

Plugins/Linter/Source/Linter/Private/LinterNamingConvention.cpp

@@ -147,9 +147,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();
 }
+#endif

Plugins/Linter/Source/Linter/Private/UI/LintWizard.cpp

@@ -93,7 +93,9 @@ void SLintWizard::Construct(const FArguments& InArgs)
 				.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([&]()

Plugins/Linter/Source/Linter/Public/LinterNamingConvention.h

@@ -7,6 +7,10 @@
 #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"
 
 
@@ -75,7 +79,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:
 

Plugins/Linter/Source/Linter/Public/LinterSettings.h

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