Update to 5.3 and Merge-Errors Fixes

jwindgassen · jwindgassen · commit a5a042494fc2 · 2023-10-14T01:27:03.000+02:00
diff --git a/Source/Linter/Private/BatchRenameTool/BatchRenameTool.cpp b/Source/Linter/Private/BatchRenameTool/BatchRenameTool.cpp
@@ -16,9 +16,14 @@
 #include "Logging/MessageLog.h"
 #include "Logging/TokenizedMessage.h"
 #include "Widgets/Layout/SSeparator.h"
+#include "Misc/EngineVersionComparison.h"
 
 #define LOCTEXT_NAMESPACE "LinterBatchRenamer"
 
+#if UE_VERSION_OLDER_THAN(5, 1, 0)
+using FAppStyle = FEditorStyle;
+#endif
+
 FDlgBatchRenameTool::FDlgBatchRenameTool(const TArray<FAssetData> Assets)
 	: bRemovePrefix(false)
 	, bRemoveSuffix(false)
@@ -75,7 +80,11 @@ FDlgBatchRenameTool::EResult FDlgBatchRenameTool::ShowModal()
 			const FAssetData& Asset = *AssetIt;
 
 			// Early out on assets that can not be renamed
+#if UE_VERSION_NEWER_THAN(5, 1, 0)
+			if (!(!Asset.IsRedirector() && Asset.AssetClassPath.GetAssetName() != NAME_Class && !(Asset.PackageFlags & PKG_FilterEditorOnly)))
+#else
 			if (!(!Asset.IsRedirector() && Asset.AssetClass != NAME_Class && !(Asset.PackageFlags & PKG_FilterEditorOnly)))
+#endif
 			{
 				continue;
 			}
diff --git a/Source/Linter/Private/LintRule.cpp b/Source/Linter/Private/LintRule.cpp
@@ -7,7 +7,7 @@
 #include "Engine/Blueprint.h"
 #include "Modules/ModuleManager.h"
 #include "IAssetTools.h"
-#include "AssetRegistryModule.h"
+#include "AssetRegistry/AssetRegistryModule.h"
 #include "Misc/EngineVersionComparison.h"
 
 
@@ -241,7 +241,11 @@ bool FLintRuleViolation::PopulateAssetData()
 
 	if (Violator.IsValid())
 	{
+#if UE_VERSION_NEWER_THAN(5, 1, 0)
+		ViolatorAssetData = AssetRegistry.GetAssetByObjectPath(Violator->GetPathName());
+#else
 		ViolatorAssetData = AssetRegistry.GetAssetByObjectPath(FName(*Violator->GetPathName()));
+#endif
 		return ViolatorAssetData.IsValid();
 	}
 
diff --git a/Source/Linter/Private/LintRuleSet.cpp b/Source/Linter/Private/LintRuleSet.cpp
@@ -3,7 +3,7 @@
 #include "AnyObject_LinterDummyClass.h"
 #include "LintRunner.h"
 #include "Linter.h"
-#include "AssetRegistryModule.h"
+#include "AssetRegistry/AssetRegistryModule.h"
 #include "Modules/ModuleManager.h"
 #include "HAL/RunnableThread.h"
 
@@ -82,7 +82,11 @@ TArray<FLintRuleViolation> ULintRuleSet::LintPath(TArray<FString> AssetPaths, FS
 		}
 		else
 		{
+#if UE_VERSION_NEWER_THAN(5, 1, 0)
+			Threads.Push(FRunnableThread::Create(Runner, *FString::Printf(TEXT("FLintRunner - %s"), *Asset.GetObjectPathString()), 0, TPri_Normal));
+#else
 			Threads.Push(FRunnableThread::Create(Runner, *FString::Printf(TEXT("FLintRunner - %s"), *Asset.ObjectPath.ToString()), 0, TPri_Normal));
+#endif
 			if (ParentScopedSlowTask != nullptr)
 			{
 				ParentScopedSlowTask->EnterProgressFrame(1.0f);
diff --git a/Source/Linter/Private/LintRules/LintRule_SoundWave_SampleRate.cpp b/Source/Linter/Private/LintRules/LintRule_SoundWave_SampleRate.cpp
@@ -24,7 +24,7 @@ bool ULintRule_SoundWave_SampleRate::PassesRule(UObject* ObjectToLint, const ULi
 
 bool ULintRule_SoundWave_SampleRate::PassesRule_Internal_Implementation(UObject* ObjectToLint, const ULintRuleSet* ParentRuleSet, TArray<FLintRuleViolation>& OutRuleViolations) const
 {
-	const USoundWave* SoundWave = const_cast<USoundWave*>(CastChecked<USoundWave>(ObjectToLint));
+	USoundWave* SoundWave = CastChecked<USoundWave>(ObjectToLint);
 
 	if (ValidSampleRates.Contains(SoundWave->GetSampleRateForCurrentPlatform()))
 	{
diff --git a/Source/Linter/Private/Linter.cpp b/Source/Linter/Private/Linter.cpp
@@ -5,16 +5,14 @@
 #include "Framework/Docking/TabManager.h"
 #include "LevelEditor.h"
 #include "Styling/SlateStyle.h"
-#include "AssetRegistryModule.h"
-#include "IAssetRegistry.h"
 #include "PropertyEditorModule.h"
-
 #include "LinterStyle.h"
 #include "LinterContentBrowserExtensions.h"
 #include "LinterNamingConvention.h"
 #include "LinterSettings.h"
 #include "UI/LintWizard.h"
 #include "LintRuleSet.h"
+#include "AssetRegistry/AssetRegistryModule.h"
 
 #define LOCTEXT_NAMESPACE "FLinterModule"
 
@@ -119,7 +117,11 @@ void FLinterModule::TryToLoadAllLintRuleSets()
 	const IAssetRegistry& AssetRegistry = AssetRegistryModule.Get();
 
 	TArray<FAssetData> FoundRuleSets;
+#if UE_VERSION_NEWER_THAN(5, 1, 0)
+	AssetRegistry.GetAssetsByClass(ULintRuleSet::StaticClass()->GetClassPathName(), FoundRuleSets, true);
+#else
 	AssetRegistry.GetAssetsByClass(ULintRuleSet::StaticClass()->GetFName(), FoundRuleSets, true);
+#endif
 
 	// Attempt to get all RuleSets in memory so that linting tools are better aware of them
 	for (const FAssetData& RuleSetData : FoundRuleSets)
diff --git a/Source/Linter/Private/LinterCommandlet.cpp b/Source/Linter/Private/LinterCommandlet.cpp
@@ -1,8 +1,7 @@
 // Copyright 2020 Gamemakin LLC. All Rights Reserved.
 
 #include "LinterCommandlet.h"
-#include "AssetRegistryModule.h"
-#include "Engine/ObjectLibrary.h"
+#include "AssetRegistry/AssetRegistryModule.h"
 #include "Dom/JsonObject.h"
 #include "Dom/JsonValue.h"
 #include "Interfaces/IPluginManager.h"
@@ -56,7 +55,11 @@ int32 ULinterCommandlet::Main(const FString& InParams)
 		FLinterModule::TryToLoadAllLintRuleSets();
 
 		TArray<FAssetData> FoundRuleSets;
+#if UE_VERSION_NEWER_THAN(5, 1, 0)
+		AssetRegistryModule.Get().GetAssetsByClass(ULintRuleSet::StaticClass()->GetClassPathName(), FoundRuleSets, true);
+#else
 		AssetRegistryModule.Get().GetAssetsByClass(ULintRuleSet::StaticClass()->GetFName(), FoundRuleSets, true);
+#endif
 
 		for (const FAssetData& RuleSetData : FoundRuleSets)
 		{
@@ -128,7 +131,11 @@ int32 ULinterCommandlet::Main(const FString& InParams)
 				UniqueViolatorViolations[0].PopulateAssetData();
 				AssetData = UniqueViolatorViolations[0].ViolatorAssetData;
 				AssetJsonObject->SetStringField(TEXT("ViolatorAssetName"), AssetData.AssetName.ToString());
+#if UE_VERSION_NEWER_THAN(5, 1, 0)
+				AssetJsonObject->SetStringField(TEXT("ViolatorAssetPath"), AssetData.GetObjectPathString());
+#else
 				AssetJsonObject->SetStringField(TEXT("ViolatorAssetPath"), AssetData.ObjectPath.ToString());
+#endif
 				AssetJsonObject->SetStringField(TEXT("ViolatorFullName"), AssetData.GetFullName());
 				//@TODO: Thumbnail export?
 
diff --git a/Source/Linter/Private/LinterContentBrowserExtensions.cpp b/Source/Linter/Private/LinterContentBrowserExtensions.cpp
@@ -92,7 +92,11 @@ void FLinterContentBrowserExtensions::InstallHooks(FLinterModule* LinterModule,
 				{
 					const FAssetData& Asset = *AssetIt;
 					// Cannot rename redirectors or classes or cooked packages
+#if UE_VERSION_NEWER_THAN(5, 1, 0)
+					if (!Asset.IsRedirector() && Asset.AssetClassPath.GetAssetName() != NAME_Class && !(Asset.PackageFlags & PKG_FilterEditorOnly))
+#else
 					if (!Asset.IsRedirector() && Asset.AssetClass != NAME_Class && !(Asset.PackageFlags & PKG_FilterEditorOnly))
+#endif
 					{
 						if (Asset.GetClass()->IsChildOf(UBlueprint::StaticClass()))
 						{
@@ -129,7 +133,11 @@ void FLinterContentBrowserExtensions::InstallHooks(FLinterModule* LinterModule,
 				{
 					const FAssetData& Asset = *AssetIt;
 					// Cannot rename redirectors or classes or cooked packages
+#if UE_VERSION_NEWER_THAN(5, 1, 0)
+					if (!Asset.IsRedirector() && Asset.AssetClassPath.GetAssetName() != NAME_Class && !(Asset.PackageFlags & PKG_FilterEditorOnly))
+#else
 					if (!Asset.IsRedirector() && Asset.AssetClass != NAME_Class && !(Asset.PackageFlags & PKG_FilterEditorOnly))
+#endif
 					{
 						bAnyAssetCanBeRenamed = true;
 						break;
diff --git a/Source/Linter/Private/LinterNamingConvention.cpp b/Source/Linter/Private/LinterNamingConvention.cpp
@@ -1,12 +1,11 @@
-
 #include "LinterNamingConvention.h"
+
 #include "AnyObject_LinterDummyClass.h"
 #include "DetailLayoutBuilder.h"
 #include "PropertyCustomizationHelpers.h"
 #include "Templates/SharedPointer.h"
 #include "DetailCategoryBuilder.h"
 #include "IDetailChildrenBuilder.h"
-#include "UObject/ObjectSaveContext.h"
 
 TSharedRef<IDetailCustomization> FLinterNamingConventionDetails::MakeInstance()
 {
@@ -75,13 +74,6 @@ ULinterNamingConvention::ULinterNamingConvention(const FObjectInitializer& Objec
 	ClassNamingConventions = TArray<FLinterNamingConventionInfo>();
 }
 
-void ULinterNamingConvention::PreSave(const FObjectPreSaveContext SaveContext)
-{
-	Super::PreSave(SaveContext);
-
-	SortConventions();
-}
-
 TArray<FLinterNamingConventionInfo> ULinterNamingConvention::GetNamingConventionsForClassVariant(const TSoftClassPtr<UObject> Class, FName Variant /*= NAME_None*/) const
 {
 	TArray<FLinterNamingConventionInfo> NamingConventionList;
diff --git a/Source/Linter/Private/UI/LintReport.cpp b/Source/Linter/Private/UI/LintReport.cpp
@@ -4,7 +4,6 @@
 #include "LintRule.h"
 #include "Widgets/SBoxPanel.h"
 #include "LintRuleSet.h"
-#include "UI/LintReportAssetErrorList.h"
 #include "UI/LintReportAssetDetails.h"
 #include "AssetThumbnail.h"
 #include "Containers/Map.h"
@@ -279,7 +278,11 @@ void SLintReport::Rebuild(const ULintRuleSet* SelectedLintRuleSet)
 		{
 			AssetData = UniqueViolatorViolations[0]->ViolatorAssetData;
 			AssetJsonObject->SetStringField(TEXT("ViolatorAssetName"), AssetData.AssetName.ToString());
+#if UE_VERSION_NEWER_THAN(5, 1, 0)
+			AssetJsonObject->SetStringField(TEXT("ViolatorAssetPath"), AssetData.GetObjectPathString());
+#else
 			AssetJsonObject->SetStringField(TEXT("ViolatorAssetPath"), AssetData.ObjectPath.ToString());
+#endif
 			AssetJsonObject->SetStringField(TEXT("ViolatorFullName"), AssetData.GetFullName());
 			//@TODO: Thumbnail export?
 
diff --git a/Source/Linter/Private/UI/LintReportAssetDetails.cpp b/Source/Linter/Private/UI/LintReportAssetDetails.cpp
@@ -3,15 +3,12 @@
 #include "UI/LintReportAssetDetails.h"
 #include "LinterStyle.h"
 #include "Widgets/Layout/SBorder.h"
-#include "EditorStyleSet.h"
 #include "Widgets/SBoxPanel.h"
 #include "Widgets/Layout/SExpandableArea.h"
 #include "ContentBrowserModule.h"
 #include "IContentBrowserSingleton.h"
-#include "AssetRegistryModule.h"
+#include "AssetRegistry/AssetRegistryModule.h"
 #include "Widgets/Input/SHyperlink.h"
-#include "IAssetTools.h"
-#include "AssetToolsModule.h"
 #include "Internationalization/Internationalization.h"
 #include "Widgets/Text/STextBlock.h"
 #include "LintRule.h"
@@ -139,4 +136,6 @@ void SLintReportAssetDetails::Construct(const FArguments& Args)
 			]
 		]
 	];
-}
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/Linter/Private/UI/LintReportAssetError.cpp b/Source/Linter/Private/UI/LintReportAssetError.cpp
@@ -107,4 +107,6 @@ void SLintReportAssetError::Construct(const FArguments& Args)
 			.Text(RuleViolation.Get()->RecommendedAction)
 		]
 	];
-}
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/Linter/Private/UI/LintReportAssetErrorList.cpp b/Source/Linter/Private/UI/LintReportAssetErrorList.cpp
@@ -28,4 +28,6 @@ void SLintReportAssetErrorList::Construct(const FArguments& Args)
 			];
 		})
 	];
-}
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/Linter/Private/UI/LintReportRuleDetails.cpp b/Source/Linter/Private/UI/LintReportRuleDetails.cpp
@@ -2,20 +2,15 @@
 #include "UI/LintReportRuleDetails.h"
 #include "LinterStyle.h"
 #include "Widgets/Layout/SBorder.h"
-#include "EditorStyleSet.h"
 #include "Widgets/SBoxPanel.h"
 #include "Widgets/Layout/SExpandableArea.h"
-#include "ContentBrowserModule.h"
-#include "IContentBrowserSingleton.h"
-#include "AssetRegistryModule.h"
-#include "Widgets/Input/SHyperlink.h"
-#include "IAssetTools.h"
-#include "AssetToolsModule.h"
+#include "AssetRegistry/AssetRegistryModule.h"
 #include "Internationalization/Internationalization.h"
 #include "Widgets/Text/STextBlock.h"
-#include "UI/LintReportRuleErrorList.h"
 #include "LintRule.h"
 #include "AssetThumbnail.h"
+#include "LintReportRuleErrorList.h"
+#include "Misc/EngineVersionComparison.h"
 
 
 
@@ -57,7 +52,11 @@ void SLintReportRuleDetails::Construct(const FArguments& Args)
 	const FAssetRegistryModule& AssetRegistryModule = FModuleManager::LoadModuleChecked<FAssetRegistryModule>(TEXT("AssetRegistry"));
 	const IAssetRegistry& AssetRegistry = AssetRegistryModule.Get();
 
+#if UE_VERSION_NEWER_THAN(5, 1, 0)
+	RuleAssetData = AssetRegistry.GetAssetByObjectPath(BrokenRule->GetPathName(), true);
+#else
 	RuleAssetData = AssetRegistry.GetAssetByObjectPath(FName(*BrokenRule->GetPathName()), true);
+#endif
 	FText RuleAssetPath;
 	if (RuleAssetData.IsValid())
 	{
@@ -202,3 +201,5 @@ void SLintReportRuleDetails::Construct(const FArguments& Args)
 		ThumbnailBox->SetContent(RuleThumbnail->MakeThumbnailWidget());
 	}
 }
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/Linter/Private/UI/LintReportRuleError.cpp b/Source/Linter/Private/UI/LintReportRuleError.cpp
@@ -10,6 +10,7 @@
 #include "Widgets/Input/SHyperlink.h"
 #include "LintRule.h"
 #include "AssetRegistry/AssetRegistryModule.h"
+#include "Misc/EngineVersionComparison.h"
 
 #define LOCTEXT_NAMESPACE "LintReport"
 
@@ -40,7 +41,11 @@ void SLintReportRuleError::Construct(const FArguments& Args)
 					const FContentBrowserModule& ContentBrowserModule = FModuleManager::Get().LoadModuleChecked<FContentBrowserModule>("ContentBrowser");
 					const FAssetRegistryModule& AssetRegistryModule = FModuleManager::LoadModuleChecked<FAssetRegistryModule>(TEXT("AssetRegistry"));
 					TArray<FAssetData> AssetDatas;
+#if UE_VERSION_NEWER_THAN(5, 1, 0)
+					AssetDatas.Push(AssetRegistryModule.Get().GetAssetByObjectPath(RuleViolation.Get()->ViolatorAssetData.GetSoftObjectPath()));
+#else
 					AssetDatas.Push(AssetRegistryModule.Get().GetAssetByObjectPath(RuleViolation.Get()->ViolatorAssetData.ObjectPath));
+#endif
 					ContentBrowserModule.Get().SyncBrowserToAssets(AssetDatas);
 				})
 			]
@@ -56,4 +61,6 @@ void SLintReportRuleError::Construct(const FArguments& Args)
 			.Visibility(RuleViolation.Get()->RecommendedAction.IsEmpty() ? EVisibility::Collapsed : EVisibility::SelfHitTestInvisible)
 		]
 	];
-}
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/Linter/Private/UI/LintReportRuleErrorList.cpp b/Source/Linter/Private/UI/LintReportRuleErrorList.cpp
@@ -27,4 +27,6 @@ void SLintReportRuleErrorList::Construct(const FArguments& Args)
 			];
 		})
 	];
-}
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/Linter/Private/UI/LintWizard.cpp b/Source/Linter/Private/UI/LintWizard.cpp
diff --git a/Source/Linter/Private/UI/SAssetLinkWidget.cpp b/Source/Linter/Private/UI/SAssetLinkWidget.cpp
diff --git a/Source/Linter/Public/LinterNamingConvention.h b/Source/Linter/Public/LinterNamingConvention.h

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#include "AnyObject_LinterDummyClass.h"`
`4`	`4`	`#include "LintRunner.h"`
`5`	`5`	`#include "Linter.h"`
`6`		`-#include "AssetRegistryModule.h"`
	`6`	`+#include "AssetRegistry/AssetRegistryModule.h"`
`7`	`7`	`#include "Modules/ModuleManager.h"`
`8`	`8`	`#include "HAL/RunnableThread.h"`
`9`	`9`
`@@ -82,7 +82,11 @@ TArray<FLintRuleViolation> ULintRuleSet::LintPath(TArray<FString> AssetPaths, FS`
`82`	`82`	`}`
`83`	`83`	`else`
`84`	`84`	`{`
	`85`	`+#if UE_VERSION_NEWER_THAN(5, 1, 0)`
	`86`	`+ Threads.Push(FRunnableThread::Create(Runner, FString::Printf(TEXT("FLintRunner - %s"), Asset.GetObjectPathString()), 0, TPri_Normal));`
	`87`	`+#else`
`85`	`88`	`Threads.Push(FRunnableThread::Create(Runner, FString::Printf(TEXT("FLintRunner - %s"), Asset.ObjectPath.ToString()), 0, TPri_Normal));`
	`89`	`+#endif`
`86`	`90`	`if (ParentScopedSlowTask != nullptr)`
`87`	`91`	`{`
`88`	`92`	`ParentScopedSlowTask->EnterProgressFrame(1.0f);`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ bool ULintRule_SoundWave_SampleRate::PassesRule(UObject* ObjectToLint, const ULi`
`24`	`24`
`25`	`25`	`bool ULintRule_SoundWave_SampleRate::PassesRule_Internal_Implementation(UObject* ObjectToLint, const ULintRuleSet* ParentRuleSet, TArray<FLintRuleViolation>& OutRuleViolations) const`
`26`	`26`	`{`
`27`		`- const USoundWave* SoundWave = const_cast<USoundWave*>(CastChecked<USoundWave>(ObjectToLint));`
	`27`	`+ USoundWave* SoundWave = CastChecked<USoundWave>(ObjectToLint);`
`28`	`28`
`29`	`29`	`if (ValidSampleRates.Contains(SoundWave->GetSampleRateForCurrentPlatform()))`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,11 @@ void FLinterContentBrowserExtensions::InstallHooks(FLinterModule* LinterModule,`
`92`	`92`	`{`
`93`	`93`	`const FAssetData& Asset = *AssetIt;`
`94`	`94`	`// Cannot rename redirectors or classes or cooked packages`
	`95`	`+#if UE_VERSION_NEWER_THAN(5, 1, 0)`
	`96`	`+ if (!Asset.IsRedirector() && Asset.AssetClassPath.GetAssetName() != NAME_Class && !(Asset.PackageFlags & PKG_FilterEditorOnly))`
	`97`	`+#else`
`95`	`98`	`if (!Asset.IsRedirector() && Asset.AssetClass != NAME_Class && !(Asset.PackageFlags & PKG_FilterEditorOnly))`
	`99`	`+#endif`
`96`	`100`	`{`
`97`	`101`	`if (Asset.GetClass()->IsChildOf(UBlueprint::StaticClass()))`
`98`	`102`	`{`
`@@ -129,7 +133,11 @@ void FLinterContentBrowserExtensions::InstallHooks(FLinterModule* LinterModule,`
`129`	`133`	`{`
`130`	`134`	`const FAssetData& Asset = *AssetIt;`
`131`	`135`	`// Cannot rename redirectors or classes or cooked packages`
	`136`	`+#if UE_VERSION_NEWER_THAN(5, 1, 0)`
	`137`	`+ if (!Asset.IsRedirector() && Asset.AssetClassPath.GetAssetName() != NAME_Class && !(Asset.PackageFlags & PKG_FilterEditorOnly))`
	`138`	`+#else`
`132`	`139`	`if (!Asset.IsRedirector() && Asset.AssetClass != NAME_Class && !(Asset.PackageFlags & PKG_FilterEditorOnly))`
	`140`	`+#endif`
`133`	`141`	`{`
`134`	`142`	`bAnyAssetCanBeRenamed = true;`
`135`	`143`	`break;`