Fix UE version check

 - FTabManager::InvokeTab is deprecated
 - TMicRecursionGuard

Author: empty2fill

Source/Linter/Private/LintRule.cpp

@@ -8,6 +8,7 @@
 #include "Modules/ModuleManager.h"
 #include "IAssetTools.h"
 #include "AssetRegistryModule.h"
+#include "Misc/EngineVersionComparison.h"
 
 
 ULintRule::ULintRule(const FObjectInitializer& ObjectInitializer)
@@ -59,7 +60,7 @@ FName ULintRule::GetRuleBasedObjectVariantName_Implementation(UObject* ObjectToL
 		const UMaterialInterface* MI = Cast<UMaterialInterface>(ObjectToLint);
 		if (MI != nullptr)
 		{
-#if ENGINE_MINOR_VERSION >= 25 || ENGINE_MAJOR_VERSION >= 5
+#if UE_VERSION_NEWER_THAN(4, 25, 0)
 			TMicRecursionGuard RecursionGuard;
 #else
 			UMaterialInterface::TMicRecursionGuard RecursionGuard;

Source/Linter/Private/LinterContentBrowserExtensions.cpp

@@ -12,6 +12,9 @@
 #include "Framework/Commands/UIAction.h"
 #include "Delegates/IDelegateInstance.h"
 #include "TooltipEditor/TooltipTool.h"
+#include "Linter.h"
+#include "BatchRenameTool/BatchRenameTool.h"
+#include "Misc/EngineVersionComparison.h"
 
 #define LOCTEXT_NAMESPACE "Linter"
 
@@ -51,7 +54,11 @@ void FLinterContentBrowserExtensions::InstallHooks(FLinterModule* LinterModule,
 							{
 								Linter->SetDesiredLintPaths(SelectedPaths);
 							}
+#if UE_VERSION_NEWER_THAN(4, 26, 0)
 							FGlobalTabmanager::Get()->TryInvokeTab(FName("LinterTab"));
+#else
+							FGlobalTabmanager::Get()->InvokeTab(FName("LinterTab"));
+#endif
 						}
 					})),
 					NAME_None,

Source/Linter/Private/UI/LintWizard.cpp

@@ -19,6 +19,15 @@
 #include "FileHelpers.h"
 #include "Logging/MessageLog.h"
 #include "Logging/TokenizedMessage.h"
+#include "ContentBrowserModule.h"
+#include "DesktopPlatformModule.h"
+#include "AssetToolsModule.h"
+#include "Framework/Docking/TabManager.h"
+#include "Widgets/Input/SComboBox.h"
+#include "Widgets/Docking/SDockTab.h"
+#include "Misc/App.h"
+#include "Engine/World.h"
+#include "Misc/EngineVersionComparison.h"
 
 #include "LinterStyle.h"
 #include "LintRuleSet.h"
@@ -88,7 +97,11 @@ void SLintWizard::Construct(const FArguments& InArgs)
 				.FinishButtonText(LOCTEXT("FinishButtonText", "Close"))
 				.OnFinished_Lambda([&]()
 				{
+#if UE_VERSION_NEWER_THAN(4, 26, 0)
 					FGlobalTabmanager::Get()->TryInvokeTab(FName("LinterTab"))->RequestCloseTab();
+#else
+					FGlobalTabmanager::Get()->InvokeTab(FName("LinterTab"))->RequestCloseTab();
+#endif
 				})
 				+ SWizard::Page()
 				.CanShow_Lambda([&]() { return RuleSets.Num() > 0; })
@@ -521,7 +534,15 @@ void SLintWizard::Construct(const FArguments& InArgs)
 																		LOCTEXT("ZipTaskShortName", "Zip Project Task"), FAppStyle::GetBrush(TEXT("MainFrame.CookContent")));
 																}
 
+<<<<<<< HEAD:Source/Linter/Private/UI/LintWizard.cpp
+																FGlobalTabmanager::Get()->TryInvokeTab(FName("LinterTab"))->RequestCloseTab();
+=======
+#if UE_VERSION_NEWER_THAN(4, 26, 0)
 																FGlobalTabmanager::Get()->TryInvokeTab(FName("LinterTab"))->RequestCloseTab();
+#else
+																FGlobalTabmanager::Get()->InvokeTab(FName("LinterTab"))->RequestCloseTab();
+#endif
+>>>>>>> 7384b2d (Fix UE version check):Plugins/Linter/Source/Linter/Private/UI/LintWizard.cpp
 															}
 															return FReply::Handled();
 														})