5.1 update

Drakynfly · Drakynfly · commit a69693551401 · 2022-12-25T21:24:21.000-08:00
diff --git a/Source/Linter/Private/BatchRenameTool/BatchRenameTool.cpp b/Source/Linter/Private/BatchRenameTool/BatchRenameTool.cpp
@@ -35,7 +35,7 @@ FDlgBatchRenameTool::FDlgBatchRenameTool(const TArray<FAssetData> Assets)
 
 		const TSharedPtr<SBorder> DialogWrapper =
 			SNew(SBorder)
-			.BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder"))
+			.BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder"))
 			.Padding(4.0f)
 			[
 				SAssignNew(DialogWidget, SDlgBatchRenameTool)
@@ -290,22 +290,22 @@ void SDlgBatchRenameTool::Construct(const FArguments& InArgs)
 		.Padding(8.0f, 4.0f, 8.0f, 4.0f)
 		[
 			SNew(SUniformGridPanel)
-			.SlotPadding(FEditorStyle::GetMargin("StandardDialog.SlotPadding"))
-			.MinDesiredSlotWidth(FEditorStyle::GetFloat("StandardDialog.MinDesiredSlotWidth"))
-			.MinDesiredSlotHeight(FEditorStyle::GetFloat("StandardDialog.MinDesiredSlotHeight"))
+			.SlotPadding(FAppStyle::GetMargin("StandardDialog.SlotPadding"))
+			.MinDesiredSlotWidth(FAppStyle::GetFloat("StandardDialog.MinDesiredSlotWidth"))
+			.MinDesiredSlotHeight(FAppStyle::GetFloat("StandardDialog.MinDesiredSlotHeight"))
 			+ SUniformGridPanel::Slot(0, 0)
 			[
 				SNew(SButton)
 				.HAlign(HAlign_Center)
-				.ContentPadding(FEditorStyle::GetMargin("StandardDialog.ContentPadding"))
+				.ContentPadding(FAppStyle::GetMargin("StandardDialog.ContentPadding"))
 				.OnClicked(this, &SDlgBatchRenameTool::OnButtonClick, FDlgBatchRenameTool::Confirm)
 				.Text(LOCTEXT("SkeletonMergeOk", "OK"))
 			]
 			+ SUniformGridPanel::Slot(1, 0)
 			[
 				SNew(SButton)
 				.HAlign(HAlign_Center)
-				.ContentPadding(FEditorStyle::GetMargin("StandardDialog.ContentPadding"))
+				.ContentPadding(FAppStyle::GetMargin("StandardDialog.ContentPadding"))
 				.OnClicked(this, &SDlgBatchRenameTool::OnButtonClick, FDlgBatchRenameTool::Cancel)
 				.Text(LOCTEXT("SkeletonMergeCancel", "Cancel"))
 			]
diff --git a/Source/Linter/Private/LintRules/LintRule_Blueprint_Funcs_MaxNodes.cpp b/Source/Linter/Private/LintRules/LintRule_Blueprint_Funcs_MaxNodes.cpp
@@ -68,7 +68,7 @@ bool ULintRule_Blueprint_Funcs_MaxNodes::PassesRule_Internal_Implementation(UObj
 	const FText FixTextTemplate = NSLOCTEXT("Linter", "BlueprintFuncsMaxNodes", "{Previous}{WhiteSpace}Please simply function {FuncName} as it has {Nodes} nodes when we want a max of {MaxNodes}.");
 	FText AllFixes;
 
-	for (const auto FunctionGraph : Blueprint->FunctionGraphs)
+	for (auto&& FunctionGraph : Blueprint->FunctionGraphs)
 	{
 		if (FunctionGraph->GetFName() != UEdGraphSchema_K2::FN_UserConstructionScript)
 		{
diff --git a/Source/Linter/Private/LintRules/LintRule_Blueprint_Funcs_MustHaveReturn.cpp b/Source/Linter/Private/LintRules/LintRule_Blueprint_Funcs_MustHaveReturn.cpp
@@ -34,7 +34,7 @@ bool ULintRule_Blueprint_Funcs_MustHaveReturn::PassesRule_Internal_Implementatio
 
 	static const FName DefaultAnimGraphName("AnimGraph");
 
-	for (const auto FunctionGraph : Blueprint->FunctionGraphs)
+	for (auto&& FunctionGraph : Blueprint->FunctionGraphs)
 	{
 		if (FunctionGraph->GetFName() != UEdGraphSchema_K2::FN_UserConstructionScript
 			&& FunctionGraph->GetFName() != DefaultAnimGraphName)
diff --git a/Source/Linter/Private/LinterStyle.cpp b/Source/Linter/Private/LinterStyle.cpp
@@ -81,7 +81,7 @@ void FLinterStyle::Initialize()
 		StyleSet->Set("Linter.Padding",  2.0f);
 
 		// PaCK Fonts
-		const FTextBlockStyle NormalText = FEditorStyle::GetWidgetStyle<FTextBlockStyle>("NormalText");
+		const FTextBlockStyle NormalText = FAppStyle::GetWidgetStyle<FTextBlockStyle>("NormalText");
 
 		FTextBlockStyle NameText = FTextBlockStyle(NormalText)
 			.SetColorAndOpacity(FLinearColor(0.9f, 0.9f, 0.9f));
diff --git a/Source/Linter/Private/TooltipTool/TooltipTool.cpp b/Source/Linter/Private/TooltipTool/TooltipTool.cpp
@@ -48,7 +48,7 @@ FTooltipTool::FTooltipTool(const TArray<FAssetData> Assets)
 
 		const TSharedPtr<SBorder> DialogWrapper =
 			SNew(SBorder)
-			.BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder"))
+			.BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder"))
 			.Padding(4.0f)
 			[
 				SAssignNew(DialogWidget, STooltipTool)
@@ -166,7 +166,7 @@ void STooltipTool::Construct(const FArguments& InArgs)
 				[&]{
 					// Save package here if SCC is enabled because the user can use SCC to revert a change
 					TArray<UPackage*> OutermostPackagesToSave;
-					for (const auto Asset : Blueprints.Get())
+					for (auto&& Asset : Blueprints.Get())
 					{
 						OutermostPackagesToSave.Add(Asset->GetPackage());
 					}
@@ -216,7 +216,7 @@ void STooltipTool::Construct(const FArguments& InArgs)
 											.AutoWidth()
 											[
 												SNew(SImage)
-												.Image(FEditorStyle::GetBrush(TEXT("Icons.Error")))
+												.Image(FAppStyle::GetBrush(TEXT("Icons.Error")))
 												.Visibility_Lambda([Item] {return Item.IsValid() ? (Item->HasMetaData(FBlueprintMetadata::MD_Tooltip) && Item->GetMetaData(FBlueprintMetadata::MD_Tooltip).Len() > 0 ? EVisibility::Collapsed : EVisibility::HitTestInvisible) : EVisibility::Collapsed; })
 											]
 											+ SHorizontalBox::Slot()
@@ -340,7 +340,7 @@ void STooltipTool::Construct(const FArguments& InArgs)
 											.AutoWidth()
 											[
 												SNew(SImage)
-												.Image(FEditorStyle::GetBrush(TEXT("Icons.Error")))
+												.Image(FAppStyle::GetBrush(TEXT("Icons.Error")))
 												.Visibility_Lambda([Item] {return (Item.IsValid() && Item->FunctionEntryNode != nullptr&&  !Item->FunctionEntryNode->MetaData.ToolTip.IsEmptyOrWhitespace()) ? EVisibility::Collapsed : EVisibility::Visible; })
 											]
 											+ SHorizontalBox::Slot()
@@ -501,7 +501,7 @@ void STooltipTool::Construct(const FArguments& InArgs)
 													.AutoWidth()
 													[
 														SNew(SImage)
-														.Image(FEditorStyle::GetBrush(TEXT("Icons.Error")))
+														.Image(FAppStyle::GetBrush(TEXT("Icons.Error")))
 														.Visibility_Lambda([Item] {return (Item.IsValid() && !Item->Tooltip.IsEmptyOrWhitespace()) ? EVisibility::Collapsed : EVisibility::Visible; })
 													]
 													+ SHorizontalBox::Slot()
@@ -572,7 +572,7 @@ void STooltipTool::Construct(const FArguments& InArgs)
 													.AutoWidth()
 													[
 														SNew(SImage)
-														.Image(FEditorStyle::GetBrush(TEXT("Icons.Error")))
+														.Image(FAppStyle::GetBrush(TEXT("Icons.Error")))
 														.Visibility_Lambda([Item] {return (Item.IsValid() && !Item->Tooltip.IsEmptyOrWhitespace()) ? EVisibility::Collapsed : EVisibility::Visible; })
 													]
 													+ SHorizontalBox::Slot()
diff --git a/Source/Linter/Private/UI/LintReport.cpp b/Source/Linter/Private/UI/LintReport.cpp
@@ -176,12 +176,12 @@ void SLintReport::Construct(const FArguments& Args)
 		.VAlign(VAlign_Top)
 		[
 			SNew(SBorder)
-			.BorderImage(FEditorStyle::GetBrush("NoBorder"))
+			.BorderImage(FAppStyle::GetBrush("NoBorder"))
 			.Padding(FMargin(4.0f, 0.0f, 4.0f, 2.0f))
 			//.Visibility_Lambda([&]() { return AssetErrorLists.Num() > 0 ? EVisibility::SelfHitTestInvisible : EVisibility::Collapsed; })
 			[
 				SNew(SBorder)
-				.BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder"))
+				.BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder"))
 				.Padding(FMargin(2.0f, 0.0f, 2.0f, 2.0f))
 				[
 
@@ -194,8 +194,8 @@ void SLintReport::Construct(const FArguments& Args)
 					[
 						SAssignNew( ViewOptionsComboButton, SComboButton )
 						.ContentPadding(0)
-						.ForegroundColor_Lambda([&]() { return ViewOptionsComboButton->IsHovered() ? FEditorStyle::GetSlateColor("InvertedForeground") : FEditorStyle::GetSlateColor("DefaultForeground"); })
-						.ButtonStyle( FEditorStyle::Get(), "ToggleButton" ) // Use the tool bar item style for this button
+						.ForegroundColor_Lambda([&]() { return ViewOptionsComboButton->IsHovered() ? FAppStyle::GetSlateColor("InvertedForeground") : FAppStyle::GetSlateColor("DefaultForeground"); })
+						.ButtonStyle( FAppStyle::Get(), "ToggleButton" ) // Use the tool bar item style for this button
 						.OnGetMenuContent( this, &SLintReport::GetViewButtonContent )
 						.ButtonContent()
 						[
@@ -204,7 +204,7 @@ void SLintReport::Construct(const FArguments& Args)
 							.AutoWidth()
 							.VAlign(VAlign_Center)
 							[
-								SNew(SImage).Image( FEditorStyle::GetBrush("GenericViewButton") )
+								SNew(SImage).Image( FAppStyle::GetBrush("GenericViewButton") )
 							]
 
 							+SHorizontalBox::Slot()
diff --git a/Source/Linter/Private/UI/LintReportAssetDetails.cpp b/Source/Linter/Private/UI/LintReportAssetDetails.cpp
@@ -58,11 +58,11 @@ void SLintReportAssetDetails::Construct(const FArguments& Args)
 	ChildSlot
 	[
 		SNew(SBorder)
-		.BorderImage(FEditorStyle::GetBrush("NoBorder"))
+		.BorderImage(FAppStyle::GetBrush("NoBorder"))
 		.Padding(PaddingAmount)
 		[
 			SNew(SBorder)
-			.BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder"))
+			.BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder"))
 			.Padding(PaddingAmount)
 			[
 				SNew(SVerticalBox)
diff --git a/Source/Linter/Private/UI/LintReportRuleDetails.cpp b/Source/Linter/Private/UI/LintReportRuleDetails.cpp
@@ -69,11 +69,11 @@ void SLintReportRuleDetails::Construct(const FArguments& Args)
 	ChildSlot
 	[
 		SNew(SBorder)
-		.BorderImage(FEditorStyle::GetBrush("NoBorder"))
+		.BorderImage(FAppStyle::GetBrush("NoBorder"))
 		.Padding(PaddingAmount)
 		[
 			SNew(SBorder)
-			.BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder"))
+			.BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder"))
 			.Padding(PaddingAmount)
 			[
 				SNew(SVerticalBox)
@@ -164,7 +164,7 @@ void SLintReportRuleDetails::Construct(const FArguments& Args)
 								{
 									AssetDatas.Push(RuleViolation->ViolatorAssetData);
 								}
-								
+
 								ContentBrowserModule.Get().SyncBrowserToAssets(AssetDatas);
 							})
 						]
diff --git a/Source/Linter/Private/UI/LintWizard.cpp b/Source/Linter/Private/UI/LintWizard.cpp
@@ -71,19 +71,19 @@ void SLintWizard::Construct(const FArguments& InArgs)
 	[
 		SNew(SBorder)
 		.Padding(18)
-		.BorderImage(FEditorStyle::GetBrush("Docking.Tab.ContentAreaBrush"))
+		.BorderImage(FAppStyle::GetBrush("Docking.Tab.ContentAreaBrush"))
 		[
 			SNew(SVerticalBox)
 			+ SVerticalBox::Slot()
 			[
 				SAssignNew(MainWizard, SWizard)
 				.ShowPageList(false)
 				.ShowCancelButton(false)
-				.ButtonStyle(FEditorStyle::Get(), "FlatButton.Default")
-				.CancelButtonStyle(FEditorStyle::Get(), "FlatButton.Default")
-				.FinishButtonStyle(FEditorStyle::Get(), "FlatButton.Success")
-				.ButtonTextStyle(FEditorStyle::Get(), "LargeText")
-				//.ForegroundColor(FEditorStyle::Get().GetSlateColor("WhiteBrush"))
+				.ButtonStyle(FAppStyle::Get(), "FlatButton.Default")
+				.CancelButtonStyle(FAppStyle::Get(), "FlatButton.Default")
+				.FinishButtonStyle(FAppStyle::Get(), "FlatButton.Success")
+				.ButtonTextStyle(FAppStyle::Get(), "LargeText")
+				//.ForegroundColor(FAppStyle::Get().GetSlateColor("WhiteBrush"))
 				.CanFinish(true)
 				.FinishButtonText(LOCTEXT("FinishButtonText", "Close"))
 				.OnFinished_Lambda([&]()
@@ -100,7 +100,7 @@ void SLintWizard::Construct(const FArguments& InArgs)
 					.Padding(0)
 					[
 						SNew(STextBlock)
-						.TextStyle( FEditorStyle::Get(), "NewClassDialog.PageTitle" )
+						.TextStyle( FAppStyle::Get(), "NewClassDialog.PageTitle" )
 						.Text(LOCTEXT("LinterSelectionTitle", "Linter Rule Set Selection"))
 					]
 					// Title spacer
@@ -147,7 +147,7 @@ void SLintWizard::Construct(const FArguments& InArgs)
 					.Padding(0)
 					[
 						SNew(STextBlock)
-						.TextStyle( FEditorStyle::Get(), "NewClassDialog.PageTitle" )
+						.TextStyle( FAppStyle::Get(), "NewClassDialog.PageTitle" )
 						.Text(LOCTEXT("LinterReportTitle", "Lint Report"))
 					]
 					// Marketplace No Errors Required Text
@@ -188,7 +188,7 @@ void SLintWizard::Construct(const FArguments& InArgs)
 					.Padding(0)
 					[
 						SNew(STextBlock)
-						.TextStyle( FEditorStyle::Get(), "NewClassDialog.PageTitle" )
+						.TextStyle( FAppStyle::Get(), "NewClassDialog.PageTitle" )
 						.Text(LOCTEXT("MarketplaceInfoTitle", "Marketplace Recommendations"))
 					]
 					// Title spacer
@@ -211,11 +211,11 @@ void SLintWizard::Construct(const FArguments& InArgs)
 							.AutoHeight()
 							[
 								SNew(SBorder)
-								.BorderImage(FEditorStyle::GetBrush("NoBorder"))
+								.BorderImage(FAppStyle::GetBrush("NoBorder"))
 								.Padding(PaddingAmount)
 								[
 									SNew(SBorder)
-									.BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder"))
+									.BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder"))
 									.Padding(PaddingAmount)
 									[
 										SNew(SHorizontalBox)
@@ -277,7 +277,7 @@ void SLintWizard::Construct(const FArguments& InArgs)
 										TArray<FString> ObjectPaths;
 										for (const auto& Asset : AssetList)
 										{
-											ObjectPaths.Add(Asset.ObjectPath.ToString());
+											ObjectPaths.Add(Asset.GetObjectPathString());
 										}
 
 										ScopedSlowTask.EnterProgressFrame(0.25f, LOCTEXT("Linter.FixUpRedirects.LoadingRedirectors", "Loading redirectors..."));
@@ -287,7 +287,7 @@ void SLintWizard::Construct(const FArguments& InArgs)
 										{
 											// Transform Objects array to ObjectRedirectors array
 											TArray<UObjectRedirector*> Redirectors;
-											for (const auto Object : Objects)
+											for (auto&& Object : Objects)
 											{
 												auto Redirector = CastChecked<UObjectRedirector>(Object);
 												Redirectors.Add(Redirector);
@@ -318,12 +318,12 @@ void SLintWizard::Construct(const FArguments& InArgs)
 							.Padding(PaddingAmount)
 							[
 								SNew(SBorder)
-								.BorderImage(FEditorStyle::GetBrush("NoBorder"))
+								.BorderImage(FAppStyle::GetBrush("NoBorder"))
 								.Padding(PaddingAmount)
 								.Visibility_Lambda([&](){ return (MapAssetDataList.Num() > 0) ? EVisibility::SelfHitTestInvisible : EVisibility::Collapsed; })
 								[
 									SNew(SBorder)
-									.BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder"))
+									.BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder"))
 									.Padding(PaddingAmount)
 									[
 										SNew(SVerticalBox)
@@ -425,11 +425,11 @@ void SLintWizard::Construct(const FArguments& InArgs)
 							[
 								SNew(SBorder)
 								.Visibility(EVisibility::Collapsed)
-								.BorderImage(FEditorStyle::GetBrush("NoBorder"))
+								.BorderImage(FAppStyle::GetBrush("NoBorder"))
 								.Padding(PaddingAmount)
 								[
 									SNew(SBorder)
-									.BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder"))
+									.BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder"))
 									.Padding(PaddingAmount)
 									[
 										SNew(SVerticalBox)
@@ -518,7 +518,7 @@ void SLintWizard::Construct(const FArguments& InArgs)
 																	FString CommandLine = FString::Printf(TEXT("ZipProjectUp %s -project=\"%s\" -install=\"%s\""), UATFlags, *ProjectPath, *FinalFileName);
 
 																	IUATHelperModule::Get().CreateUatTask(CommandLine, PlatformName, LOCTEXT("ZipTaskName", "Zipping Up Project"),
-																		LOCTEXT("ZipTaskShortName", "Zip Project Task"), FEditorStyle::GetBrush(TEXT("MainFrame.CookContent")));
+																		LOCTEXT("ZipTaskShortName", "Zip Project Task"), FAppStyle::GetBrush(TEXT("MainFrame.CookContent")));
 																}
 
 																FGlobalTabmanager::Get()->TryInvokeTab(FName("LinterTab"))->RequestCloseTab();
@@ -547,7 +547,7 @@ void SLintWizard::Construct(const FArguments& InArgs)
 	FContentBrowserModule& ContentBrowserModule = FModuleManager::Get().LoadModuleChecked<FContentBrowserModule>("ContentBrowser");
 	TArray<FAssetData> AssetDatas;
 	FARFilter Filter;
-	Filter.ClassNames.Add(UWorld::StaticClass()->GetFName());
+	Filter.ClassPaths.Add(FTopLevelAssetPath(UWorld::StaticClass()));
 	Filter.bRecursivePaths = true;
 	Filter.PackagePaths.Add(TEXT("/Game"));
 	AssetRegistryModule.Get().GetAssets(Filter, AssetDatas);
diff --git a/Source/Linter/Private/UI/SStepWidget.cpp b/Source/Linter/Private/UI/SStepWidget.cpp
@@ -57,11 +57,11 @@ void SStepWidget::Construct(const FArguments& Args)
 	ChildSlot
 	[
 		SNew(SBorder)
-		.BorderImage(FEditorStyle::GetBrush("NoBorder"))
+		.BorderImage(FAppStyle::GetBrush("NoBorder"))
 		.Padding(PaddingAmount)
 		[
 			SNew(SBorder)
-			.BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder"))
+			.BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder"))
 			.Padding(PaddingAmount)
 			[
 				SNew(SHorizontalBox)
diff --git a/Source/Linter/Public/TooltipEditor/TooltipTool.h b/Source/Linter/Public/TooltipEditor/TooltipTool.h
@@ -10,7 +10,7 @@
 #include "Widgets/Input/SComboBox.h"
 #include "Widgets/Input/SMultiLineEditableTextBox.h"
 #include "Widgets/Views/SListView.h"
-#include "AssetData.h"
+#include "AssetRegistry/AssetData.h"
 #include "Engine/Blueprint.h"
 #include "K2Node_FunctionEntry.h"
 #include "K2Node_FunctionResult.h"
@@ -124,8 +124,8 @@ class STooltipTool : public SCompoundWidget
 
 public:
 
-	
-	
+
+
 	TAttribute<TArray<TSharedPtr<FAssetData>>> Blueprints;
 	TSharedPtr<SComboBox<TSharedPtr<FAssetData>>> BlueprintComboBox;
 
@@ -139,7 +139,7 @@ class STooltipTool : public SCompoundWidget
 	TArray<TSharedPtr<FBPFunctionArgumentDescription>> FunctionOutputDescriptions;
 	TSharedPtr<SListView<TSharedPtr<FBPFunctionArgumentDescription>>> FunctionOutputListView;
 
-	
+
 	TArray<TSharedPtr<FBPVariableDescription>> Members;
 	TSharedPtr<SListView<TSharedPtr<FBPVariableDescription>>> MemberListView;
 	TSharedPtr<SMultiLineEditableTextBox> VariableTooltipEditableTextBox;

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ bool ULintRule_Blueprint_Funcs_MaxNodes::PassesRule_Internal_Implementation(UObj`
`68`	`68`	`const FText FixTextTemplate = NSLOCTEXT("Linter", "BlueprintFuncsMaxNodes", "{Previous}{WhiteSpace}Please simply function {FuncName} as it has {Nodes} nodes when we want a max of {MaxNodes}.");`
`69`	`69`	`FText AllFixes;`
`70`	`70`
`71`		`- for (const auto FunctionGraph : Blueprint->FunctionGraphs)`
	`71`	`+ for (auto&& FunctionGraph : Blueprint->FunctionGraphs)`
`72`	`72`	`{`
`73`	`73`	`if (FunctionGraph->GetFName() != UEdGraphSchema_K2::FN_UserConstructionScript)`
`74`	`74`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ bool ULintRule_Blueprint_Funcs_MustHaveReturn::PassesRule_Internal_Implementatio`
`34`	`34`
`35`	`35`	`static const FName DefaultAnimGraphName("AnimGraph");`
`36`	`36`
`37`		`- for (const auto FunctionGraph : Blueprint->FunctionGraphs)`
	`37`	`+ for (auto&& FunctionGraph : Blueprint->FunctionGraphs)`
`38`	`38`	`{`
`39`	`39`	`if (FunctionGraph->GetFName() != UEdGraphSchema_K2::FN_UserConstructionScript`
`40`	`40`	`&& FunctionGraph->GetFName() != DefaultAnimGraphName)`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ FTooltipTool::FTooltipTool(const TArray<FAssetData> Assets)`
`48`	`48`
`49`	`49`	`const TSharedPtr<SBorder> DialogWrapper =`
`50`	`50`	`SNew(SBorder)`
`51`		`- .BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder"))`
	`51`	`+ .BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder"))`
`52`	`52`	`.Padding(4.0f)`
`53`	`53`	`[`
`54`	`54`	`SAssignNew(DialogWidget, STooltipTool)`
`@@ -166,7 +166,7 @@ void STooltipTool::Construct(const FArguments& InArgs)`
`166`	`166`	`[&]{`
`167`	`167`	`// Save package here if SCC is enabled because the user can use SCC to revert a change`
`168`	`168`	`TArray<UPackage*> OutermostPackagesToSave;`
`169`		`- for (const auto Asset : Blueprints.Get())`
	`169`	`+ for (auto&& Asset : Blueprints.Get())`
`170`	`170`	`{`
`171`	`171`	`OutermostPackagesToSave.Add(Asset->GetPackage());`
`172`	`172`	`}`
`@@ -216,7 +216,7 @@ void STooltipTool::Construct(const FArguments& InArgs)`
`216`	`216`	`.AutoWidth()`
`217`	`217`	`[`
`218`	`218`	`SNew(SImage)`
`219`		`- .Image(FEditorStyle::GetBrush(TEXT("Icons.Error")))`
	`219`	`+ .Image(FAppStyle::GetBrush(TEXT("Icons.Error")))`
`220`	`220`	`.Visibility_Lambda([Item] {return Item.IsValid() ? (Item->HasMetaData(FBlueprintMetadata::MD_Tooltip) && Item->GetMetaData(FBlueprintMetadata::MD_Tooltip).Len() > 0 ? EVisibility::Collapsed : EVisibility::HitTestInvisible) : EVisibility::Collapsed; })`
`221`	`221`	`]`
`222`	`222`	`+ SHorizontalBox::Slot()`
`@@ -340,7 +340,7 @@ void STooltipTool::Construct(const FArguments& InArgs)`
`340`	`340`	`.AutoWidth()`
`341`	`341`	`[`
`342`	`342`	`SNew(SImage)`
`343`		`- .Image(FEditorStyle::GetBrush(TEXT("Icons.Error")))`
	`343`	`+ .Image(FAppStyle::GetBrush(TEXT("Icons.Error")))`
`344`	`344`	`.Visibility_Lambda([Item] {return (Item.IsValid() && Item->FunctionEntryNode != nullptr&& !Item->FunctionEntryNode->MetaData.ToolTip.IsEmptyOrWhitespace()) ? EVisibility::Collapsed : EVisibility::Visible; })`
`345`	`345`	`]`
`346`	`346`	`+ SHorizontalBox::Slot()`
`@@ -501,7 +501,7 @@ void STooltipTool::Construct(const FArguments& InArgs)`
`501`	`501`	`.AutoWidth()`
`502`	`502`	`[`
`503`	`503`	`SNew(SImage)`
`504`		`- .Image(FEditorStyle::GetBrush(TEXT("Icons.Error")))`
	`504`	`+ .Image(FAppStyle::GetBrush(TEXT("Icons.Error")))`
`505`	`505`	`.Visibility_Lambda([Item] {return (Item.IsValid() && !Item->Tooltip.IsEmptyOrWhitespace()) ? EVisibility::Collapsed : EVisibility::Visible; })`
`506`	`506`	`]`
`507`	`507`	`+ SHorizontalBox::Slot()`
`@@ -572,7 +572,7 @@ void STooltipTool::Construct(const FArguments& InArgs)`
`572`	`572`	`.AutoWidth()`
`573`	`573`	`[`
`574`	`574`	`SNew(SImage)`
`575`		`- .Image(FEditorStyle::GetBrush(TEXT("Icons.Error")))`
	`575`	`+ .Image(FAppStyle::GetBrush(TEXT("Icons.Error")))`
`576`	`576`	`.Visibility_Lambda([Item] {return (Item.IsValid() && !Item->Tooltip.IsEmptyOrWhitespace()) ? EVisibility::Collapsed : EVisibility::Visible; })`
`577`	`577`	`]`
`578`	`578`	`+ SHorizontalBox::Slot()`
Original file line number	Diff line number	Diff line change
`@@ -176,12 +176,12 @@ void SLintReport::Construct(const FArguments& Args)`
`176`	`176`	`.VAlign(VAlign_Top)`
`177`	`177`	`[`
`178`	`178`	`SNew(SBorder)`
`179`		`- .BorderImage(FEditorStyle::GetBrush("NoBorder"))`
	`179`	`+ .BorderImage(FAppStyle::GetBrush("NoBorder"))`
`180`	`180`	`.Padding(FMargin(4.0f, 0.0f, 4.0f, 2.0f))`
`181`	`181`	`//.Visibility_Lambda([&]() { return AssetErrorLists.Num() > 0 ? EVisibility::SelfHitTestInvisible : EVisibility::Collapsed; })`
`182`	`182`	`[`
`183`	`183`	`SNew(SBorder)`
`184`		`- .BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder"))`
	`184`	`+ .BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder"))`
`185`	`185`	`.Padding(FMargin(2.0f, 0.0f, 2.0f, 2.0f))`
`186`	`186`	`[`
`187`	`187`
`@@ -194,8 +194,8 @@ void SLintReport::Construct(const FArguments& Args)`
`194`	`194`	`[`
`195`	`195`	`SAssignNew( ViewOptionsComboButton, SComboButton )`
`196`	`196`	`.ContentPadding(0)`
`197`		`- .ForegroundColor_Lambda([&]() { return ViewOptionsComboButton->IsHovered() ? FEditorStyle::GetSlateColor("InvertedForeground") : FEditorStyle::GetSlateColor("DefaultForeground"); })`
`198`		`- .ButtonStyle( FEditorStyle::Get(), "ToggleButton" ) // Use the tool bar item style for this button`
	`197`	`+ .ForegroundColor_Lambda([&]() { return ViewOptionsComboButton->IsHovered() ? FAppStyle::GetSlateColor("InvertedForeground") : FAppStyle::GetSlateColor("DefaultForeground"); })`
	`198`	`+ .ButtonStyle( FAppStyle::Get(), "ToggleButton" ) // Use the tool bar item style for this button`
`199`	`199`	`.OnGetMenuContent( this, &SLintReport::GetViewButtonContent )`
`200`	`200`	`.ButtonContent()`
`201`	`201`	`[`
`@@ -204,7 +204,7 @@ void SLintReport::Construct(const FArguments& Args)`
`204`	`204`	`.AutoWidth()`
`205`	`205`	`.VAlign(VAlign_Center)`
`206`	`206`	`[`
`207`		`- SNew(SImage).Image( FEditorStyle::GetBrush("GenericViewButton") )`
	`207`	`+ SNew(SImage).Image( FAppStyle::GetBrush("GenericViewButton") )`
`208`	`208`	`]`
`209`	`209`
`210`	`210`	`+SHorizontalBox::Slot()`
Original file line number	Diff line number	Diff line change
`@@ -58,11 +58,11 @@ void SLintReportAssetDetails::Construct(const FArguments& Args)`
`58`	`58`	`ChildSlot`
`59`	`59`	`[`
`60`	`60`	`SNew(SBorder)`
`61`		`- .BorderImage(FEditorStyle::GetBrush("NoBorder"))`
	`61`	`+ .BorderImage(FAppStyle::GetBrush("NoBorder"))`
`62`	`62`	`.Padding(PaddingAmount)`
`63`	`63`	`[`
`64`	`64`	`SNew(SBorder)`
`65`		`- .BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder"))`
	`65`	`+ .BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder"))`
`66`	`66`	`.Padding(PaddingAmount)`
`67`	`67`	`[`
`68`	`68`	`SNew(SVerticalBox)`
Original file line number	Diff line number	Diff line change
`@@ -69,11 +69,11 @@ void SLintReportRuleDetails::Construct(const FArguments& Args)`
`69`	`69`	`ChildSlot`
`70`	`70`	`[`
`71`	`71`	`SNew(SBorder)`
`72`		`- .BorderImage(FEditorStyle::GetBrush("NoBorder"))`
	`72`	`+ .BorderImage(FAppStyle::GetBrush("NoBorder"))`
`73`	`73`	`.Padding(PaddingAmount)`
`74`	`74`	`[`
`75`	`75`	`SNew(SBorder)`
`76`		`- .BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder"))`
	`76`	`+ .BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder"))`
`77`	`77`	`.Padding(PaddingAmount)`
`78`	`78`	`[`
`79`	`79`	`SNew(SVerticalBox)`
`@@ -164,7 +164,7 @@ void SLintReportRuleDetails::Construct(const FArguments& Args)`
`164`	`164`	`{`
`165`	`165`	`AssetDatas.Push(RuleViolation->ViolatorAssetData);`
`166`	`166`	`}`
`167`		`-`
	`167`	`+`
`168`	`168`	`ContentBrowserModule.Get().SyncBrowserToAssets(AssetDatas);`
`169`	`169`	`})`
`170`	`170`	`]`
Original file line number	Diff line number	Diff line change
`@@ -71,19 +71,19 @@ void SLintWizard::Construct(const FArguments& InArgs)`
`71`	`71`	`[`
`72`	`72`	`SNew(SBorder)`
`73`	`73`	`.Padding(18)`
`74`		`- .BorderImage(FEditorStyle::GetBrush("Docking.Tab.ContentAreaBrush"))`
	`74`	`+ .BorderImage(FAppStyle::GetBrush("Docking.Tab.ContentAreaBrush"))`
`75`	`75`	`[`
`76`	`76`	`SNew(SVerticalBox)`
`77`	`77`	`+ SVerticalBox::Slot()`
`78`	`78`	`[`
`79`	`79`	`SAssignNew(MainWizard, SWizard)`
`80`	`80`	`.ShowPageList(false)`
`81`	`81`	`.ShowCancelButton(false)`
`82`		`- .ButtonStyle(FEditorStyle::Get(), "FlatButton.Default")`
`83`		`- .CancelButtonStyle(FEditorStyle::Get(), "FlatButton.Default")`
`84`		`- .FinishButtonStyle(FEditorStyle::Get(), "FlatButton.Success")`
`85`		`- .ButtonTextStyle(FEditorStyle::Get(), "LargeText")`
`86`		`- //.ForegroundColor(FEditorStyle::Get().GetSlateColor("WhiteBrush"))`
	`82`	`+ .ButtonStyle(FAppStyle::Get(), "FlatButton.Default")`
	`83`	`+ .CancelButtonStyle(FAppStyle::Get(), "FlatButton.Default")`
	`84`	`+ .FinishButtonStyle(FAppStyle::Get(), "FlatButton.Success")`
	`85`	`+ .ButtonTextStyle(FAppStyle::Get(), "LargeText")`
	`86`	`+ //.ForegroundColor(FAppStyle::Get().GetSlateColor("WhiteBrush"))`
`87`	`87`	`.CanFinish(true)`
`88`	`88`	`.FinishButtonText(LOCTEXT("FinishButtonText", "Close"))`
`89`	`89`	`.OnFinished_Lambda([&]()`
`@@ -100,7 +100,7 @@ void SLintWizard::Construct(const FArguments& InArgs)`
`100`	`100`	`.Padding(0)`
`101`	`101`	`[`
`102`	`102`	`SNew(STextBlock)`
`103`		`- .TextStyle( FEditorStyle::Get(), "NewClassDialog.PageTitle" )`
	`103`	`+ .TextStyle( FAppStyle::Get(), "NewClassDialog.PageTitle" )`
`104`	`104`	`.Text(LOCTEXT("LinterSelectionTitle", "Linter Rule Set Selection"))`
`105`	`105`	`]`
`106`	`106`	`// Title spacer`
`@@ -147,7 +147,7 @@ void SLintWizard::Construct(const FArguments& InArgs)`
`147`	`147`	`.Padding(0)`
`148`	`148`	`[`
`149`	`149`	`SNew(STextBlock)`
`150`		`- .TextStyle( FEditorStyle::Get(), "NewClassDialog.PageTitle" )`
	`150`	`+ .TextStyle( FAppStyle::Get(), "NewClassDialog.PageTitle" )`
`151`	`151`	`.Text(LOCTEXT("LinterReportTitle", "Lint Report"))`
`152`	`152`	`]`
`153`	`153`	`// Marketplace No Errors Required Text`
`@@ -188,7 +188,7 @@ void SLintWizard::Construct(const FArguments& InArgs)`
`188`	`188`	`.Padding(0)`
`189`	`189`	`[`
`190`	`190`	`SNew(STextBlock)`
`191`		`- .TextStyle( FEditorStyle::Get(), "NewClassDialog.PageTitle" )`
	`191`	`+ .TextStyle( FAppStyle::Get(), "NewClassDialog.PageTitle" )`
`192`	`192`	`.Text(LOCTEXT("MarketplaceInfoTitle", "Marketplace Recommendations"))`
`193`	`193`	`]`
`194`	`194`	`// Title spacer`
`@@ -211,11 +211,11 @@ void SLintWizard::Construct(const FArguments& InArgs)`
`211`	`211`	`.AutoHeight()`
`212`	`212`	`[`
`213`	`213`	`SNew(SBorder)`
`214`		`- .BorderImage(FEditorStyle::GetBrush("NoBorder"))`
	`214`	`+ .BorderImage(FAppStyle::GetBrush("NoBorder"))`
`215`	`215`	`.Padding(PaddingAmount)`
`216`	`216`	`[`
`217`	`217`	`SNew(SBorder)`
`218`		`- .BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder"))`
	`218`	`+ .BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder"))`
`219`	`219`	`.Padding(PaddingAmount)`
`220`	`220`	`[`
`221`	`221`	`SNew(SHorizontalBox)`
`@@ -277,7 +277,7 @@ void SLintWizard::Construct(const FArguments& InArgs)`
`277`	`277`	`TArray<FString> ObjectPaths;`
`278`	`278`	`for (const auto& Asset : AssetList)`
`279`	`279`	`{`
`280`		`- ObjectPaths.Add(Asset.ObjectPath.ToString());`
	`280`	`+ ObjectPaths.Add(Asset.GetObjectPathString());`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`ScopedSlowTask.EnterProgressFrame(0.25f, LOCTEXT("Linter.FixUpRedirects.LoadingRedirectors", "Loading redirectors..."));`
`@@ -287,7 +287,7 @@ void SLintWizard::Construct(const FArguments& InArgs)`
`287`	`287`	`{`
`288`	`288`	`// Transform Objects array to ObjectRedirectors array`
`289`	`289`	`TArray<UObjectRedirector*> Redirectors;`
`290`		`- for (const auto Object : Objects)`
	`290`	`+ for (auto&& Object : Objects)`
`291`	`291`	`{`
`292`	`292`	`auto Redirector = CastChecked<UObjectRedirector>(Object);`
`293`	`293`	`Redirectors.Add(Redirector);`
`@@ -318,12 +318,12 @@ void SLintWizard::Construct(const FArguments& InArgs)`
`318`	`318`	`.Padding(PaddingAmount)`
`319`	`319`	`[`
`320`	`320`	`SNew(SBorder)`
`321`		`- .BorderImage(FEditorStyle::GetBrush("NoBorder"))`
	`321`	`+ .BorderImage(FAppStyle::GetBrush("NoBorder"))`
`322`	`322`	`.Padding(PaddingAmount)`
`323`	`323`	`.Visibility_Lambda([&](){ return (MapAssetDataList.Num() > 0) ? EVisibility::SelfHitTestInvisible : EVisibility::Collapsed; })`
`324`	`324`	`[`
`325`	`325`	`SNew(SBorder)`
`326`		`- .BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder"))`
	`326`	`+ .BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder"))`
`327`	`327`	`.Padding(PaddingAmount)`
`328`	`328`	`[`
`329`	`329`	`SNew(SVerticalBox)`
`@@ -425,11 +425,11 @@ void SLintWizard::Construct(const FArguments& InArgs)`
`425`	`425`	`[`
`426`	`426`	`SNew(SBorder)`
`427`	`427`	`.Visibility(EVisibility::Collapsed)`
`428`		`- .BorderImage(FEditorStyle::GetBrush("NoBorder"))`
	`428`	`+ .BorderImage(FAppStyle::GetBrush("NoBorder"))`
`429`	`429`	`.Padding(PaddingAmount)`
`430`	`430`	`[`
`431`	`431`	`SNew(SBorder)`
`432`		`- .BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder"))`
	`432`	`+ .BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder"))`
`433`	`433`	`.Padding(PaddingAmount)`
`434`	`434`	`[`
`435`	`435`	`SNew(SVerticalBox)`
`@@ -518,7 +518,7 @@ void SLintWizard::Construct(const FArguments& InArgs)`
`518`	`518`	`FString CommandLine = FString::Printf(TEXT("ZipProjectUp %s -project=\"%s\" -install=\"%s\""), UATFlags, ProjectPath, FinalFileName);`
`519`	`519`
`520`	`520`	`IUATHelperModule::Get().CreateUatTask(CommandLine, PlatformName, LOCTEXT("ZipTaskName", "Zipping Up Project"),`
`521`		`- LOCTEXT("ZipTaskShortName", "Zip Project Task"), FEditorStyle::GetBrush(TEXT("MainFrame.CookContent")));`
	`521`	`+ LOCTEXT("ZipTaskShortName", "Zip Project Task"), FAppStyle::GetBrush(TEXT("MainFrame.CookContent")));`
`522`	`522`	`}`
`523`	`523`
`524`	`524`	`FGlobalTabmanager::Get()->TryInvokeTab(FName("LinterTab"))->RequestCloseTab();`
`@@ -547,7 +547,7 @@ void SLintWizard::Construct(const FArguments& InArgs)`
`547`	`547`	`FContentBrowserModule& ContentBrowserModule = FModuleManager::Get().LoadModuleChecked<FContentBrowserModule>("ContentBrowser");`
`548`	`548`	`TArray<FAssetData> AssetDatas;`
`549`	`549`	`FARFilter Filter;`
`550`		`- Filter.ClassNames.Add(UWorld::StaticClass()->GetFName());`
	`550`	`+ Filter.ClassPaths.Add(FTopLevelAssetPath(UWorld::StaticClass()));`
`551`	`551`	`Filter.bRecursivePaths = true;`
`552`	`552`	`Filter.PackagePaths.Add(TEXT("/Game"));`
`553`	`553`	`AssetRegistryModule.Get().GetAssets(Filter, AssetDatas);`
Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,11 @@ void SStepWidget::Construct(const FArguments& Args)`
`57`	`57`	`ChildSlot`
`58`	`58`	`[`
`59`	`59`	`SNew(SBorder)`
`60`		`- .BorderImage(FEditorStyle::GetBrush("NoBorder"))`
	`60`	`+ .BorderImage(FAppStyle::GetBrush("NoBorder"))`
`61`	`61`	`.Padding(PaddingAmount)`
`62`	`62`	`[`
`63`	`63`	`SNew(SBorder)`
`64`		`- .BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder"))`
	`64`	`+ .BorderImage(FAppStyle::GetBrush("ToolPanel.GroupBorder"))`
`65`	`65`	`.Padding(PaddingAmount)`
`66`	`66`	`[`
`67`	`67`	`SNew(SHorizontalBox)`