Fix includes for unity build, and merge prs from origin

Author: Drakynfly

.gitignore

@@ -0,0 +1,83 @@
+# Visual Studio 2015 user specific files
+.vs/
+
+# Rider C++
+.idea/
+Plugins/Developer/RiderLink/
+
+# Visual Studio 2015 database file
+*.VC.db
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+*.ipa
+
+# These project files can be generated by the engine
+*.xcodeproj
+*.xcworkspace
+*.sln
+*.suo
+*.opensdf
+*.sdf
+*.VC.db
+*.VC.opendb
+
+# Precompiled Assets
+SourceArt/**/*.png
+SourceArt/**/*.tga
+
+# Binary Files
+Binaries/*
+Plugins/*/Binaries/*
+
+# Builds
+Build/*
+
+# Whitelist PakBlacklist-<BuildConfiguration>.txt files
+!Build/*/
+Build/*/**
+!Build/*/PakBlacklist*.txt
+
+# Don't ignore icon files in Build
+!Build/**/*.ico
+
+# Built data for maps
+*_BuiltData.uasset
+
+# Configuration files generated by the Editor
+Saved/*
+
+# Compiled source files for the engine to use
+Intermediate/*
+Plugins/*/Intermediate/*
+
+# Cache files for the editor to use
+DerivedDataCache/*
+*.DotSettings*
+*DotSettings*

Linter.uplugin

@@ -10,17 +10,16 @@
 	"DocsURL": "http://discord.gamemak.in",
 	"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/content/ca0639af6339476da86fa3bcf15de8ec",
 	"SupportURL": "http://discord.gamemak.in",
-	"EngineVersion": "4.26.0",
 	"CanContainContent": true,
-	"Installed": true,
+	"Installed": false,
+	"EnabledByDefault": true,
 	"Modules": [
 		{
 			"Name": "Linter",
 			"Type": "Editor",
 			"LoadingPhase": "PreDefault",
 			"WhitelistPlatforms": [
 				"Win64",
-				"Win32",
 				"Mac",
 				"Linux"
 			],
@@ -35,7 +34,6 @@
 			"LoadingPhase": "PreDefault",
 			"WhitelistPlatforms": [
 				"Win64",
-				"Win32",
 				"Mac",
 				"Linux"
 			],
@@ -50,7 +48,6 @@
 			"LoadingPhase": "PreDefault",
 			"WhitelistPlatforms": [
 				"Win64",
-				"Win32",
 				"Mac",
 				"Linux"
 			],

Source/GamemakinLinter/GamemakinLinter.Build.cs

@@ -6,8 +6,9 @@ public class GamemakinLinter : ModuleRules
 {
     public GamemakinLinter(ReadOnlyTargetRules Target) : base(Target)
     {
-        PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;		
-		
+        PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
+        bUseUnity = false;
+
 		PublicDependencyModuleNames.AddRange(
 			new string[]
 			{
@@ -17,13 +18,13 @@ public GamemakinLinter(ReadOnlyTargetRules Target) : base(Target)
 				"Linter"
 			}
 		);
-			
-		
+
+
 		PrivateDependencyModuleNames.AddRange(
 			new string[]
             {
 
 			}
 		);
     }
-}
+}

Source/GamemakinLinter/Public/GamemakinLinter.h

@@ -1,8 +1,6 @@
 // Copyright 2019-2020 Gamemakin LLC. All Rights Reserved.
 #pragma once
 
-#include "Modules/ModuleManager.h"
-
 DECLARE_LOG_CATEGORY_EXTERN(LogGamemakinLinter, Verbose, All);
 
 class GAMEMAKINLINTER_API FGamemakinLinterModule : public IModuleInterface

Source/Linter/Linter.Build.cs

@@ -6,16 +6,17 @@ public class Linter : ModuleRules
 {
     public Linter(ReadOnlyTargetRules Target) : base(Target)
     {
-        PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;		
-		
+        PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
+        bUseUnity = false;
+
 		PublicDependencyModuleNames.AddRange(
 			new string[]
 			{
 				"Core",
 			}
 		);
-			
-		
+
+
 		PrivateDependencyModuleNames.AddRange(
 			new string[]
             {
@@ -36,7 +37,7 @@ public Linter(ReadOnlyTargetRules Target) : base(Target)
 				"DesktopPlatform",
 				"Json",
                 "UATHelper"
-				// ... add private dependencies that you statically link with here ...	
+				// ... add private dependencies that you statically link with here ...
 			}
 		);
 
@@ -47,4 +48,4 @@ public Linter(ReadOnlyTargetRules Target) : base(Target)
 #endif
 
     }
-}
+}

Source/Linter/Private/BatchRenameTool/BatchRenameTool.cpp

@@ -15,6 +15,7 @@
 #include "Framework/Notifications/NotificationManager.h"
 #include "Logging/MessageLog.h"
 #include "Logging/TokenizedMessage.h"
+#include "Widgets/Layout/SSeparator.h"
 
 #define LOCTEXT_NAMESPACE "LinterBatchRenamer"
 
@@ -32,7 +33,7 @@ FDlgBatchRenameTool::FDlgBatchRenameTool(const TArray<FAssetData> Assets)
 			.AutoCenter(EAutoCenter::PreferredWorkArea)
 			.ClientSize(FVector2D(350, 165));
 
-		TSharedPtr<SBorder> DialogWrapper =
+		const TSharedPtr<SBorder> DialogWrapper =
 			SNew(SBorder)
 			.BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder"))
 			.Padding(4.0f)
@@ -48,9 +49,9 @@ FDlgBatchRenameTool::EResult FDlgBatchRenameTool::ShowModal()
 {
 	//Show Dialog
 	GEditor->EditorAddModalWindow(DialogWindow.ToSharedRef());
-	EResult UserResponse = (EResult)DialogWidget->GetUserResponse();
+	const EResult UserResponse = (EResult)DialogWidget->GetUserResponse();
 
-	if (UserResponse == EResult::Confirm)
+	if (UserResponse == Confirm)
 	{
 		Prefix = DialogWidget->PrefixTextBox->GetText().ToString();
 		Suffix = DialogWidget->SuffixTextBox->GetText().ToString();
@@ -63,10 +64,10 @@ FDlgBatchRenameTool::EResult FDlgBatchRenameTool::ShowModal()
 		// If no information is given, treat as canceled
 		if (Prefix.IsEmpty() && Suffix.IsEmpty() && Find.IsEmpty())
 		{
-			return EResult::Cancel;
+			return Cancel;
 		}
 
-		FAssetToolsModule& AssetToolsModule = FModuleManager::LoadModuleChecked<FAssetToolsModule>("AssetTools");
+		const FAssetToolsModule& AssetToolsModule = FModuleManager::LoadModuleChecked<FAssetToolsModule>("AssetTools");
 		TArray<FAssetRenameData> AssetsAndNames;
 
 		for (auto AssetIt = SelectedAssets.CreateConstIterator(); AssetIt; ++AssetIt)
@@ -317,4 +318,4 @@ FDlgBatchRenameTool::EResult SDlgBatchRenameTool::GetUserResponse() const
 	return UserResponse;
 }
 
-#undef LOCTEXT_NAMESPACE
+#undef LOCTEXT_NAMESPACE

Source/Linter/Private/LintRule.cpp

@@ -5,9 +5,7 @@
 #include "Materials/Material.h"
 #include "Kismet2/BlueprintEditorUtils.h"
 #include "Engine/Blueprint.h"
-#include "AssetData.h"
 #include "Modules/ModuleManager.h"
-#include "IAssetRegistry.h"
 #include "IAssetTools.h"
 #include "AssetRegistryModule.h"
 
@@ -58,18 +56,18 @@ FName ULintRule::GetRuleBasedObjectVariantName_Implementation(UObject* ObjectToL
 	}
 
 	{
-		UMaterialInterface* MI = Cast<UMaterialInterface>(ObjectToLint);
+		const UMaterialInterface* MI = Cast<UMaterialInterface>(ObjectToLint);
 		if (MI != nullptr)
 		{
-#if ENGINE_MINOR_VERSION >= 25
+#if ENGINE_MINOR_VERSION >= 25 || ENGINE_MAJOR_VERSION >= 5
 			TMicRecursionGuard RecursionGuard;
 #else
 			UMaterialInterface::TMicRecursionGuard RecursionGuard;
 #endif
 			const UMaterial* Material = MI->GetMaterial_Concurrent(RecursionGuard);
 			if (Material != nullptr)
 			{
-				if (Material->MaterialDomain == EMaterialDomain::MD_PostProcess)
+				if (Material->MaterialDomain == MD_PostProcess)
 				{
 					return "PostProcess";
 				}
@@ -78,10 +76,10 @@ FName ULintRule::GetRuleBasedObjectVariantName_Implementation(UObject* ObjectToL
 	}
 
 	{
-		UBlueprint* Blueprint = Cast<UBlueprint>(ObjectToLint);
+		const UBlueprint* Blueprint = Cast<UBlueprint>(ObjectToLint);
 		if (Blueprint != nullptr)
 		{
-			if (Blueprint->BlueprintType == EBlueprintType::BPTYPE_MacroLibrary)
+			if (Blueprint->BlueprintType == BPTYPE_MacroLibrary)
 			{
 				return "MacroLibrary";
 			}
@@ -132,7 +130,7 @@ TArray<TSharedPtr<FLintRuleViolation>> FLintRuleViolation::AllRuleViolationsWith
 	// This should really be done when the structs are first created
 	TArray<TSharedPtr<FLintRuleViolation>> SharedViolations;
 	TArray<FLintRuleViolation> Violations = AllRuleViolationsWithViolator(RuleViolationCollection, SearchViolator);
-	for (FLintRuleViolation Violation : Violations)
+	for (const FLintRuleViolation Violation : Violations)
 	{
 		SharedViolations.Push(TSharedPtr<FLintRuleViolation>(new FLintRuleViolation(Violation)));
 	}
@@ -237,7 +235,7 @@ TMultiMap<const ULintRule*, TSharedPtr<FLintRuleViolation>> FLintRuleViolation::
 
 bool FLintRuleViolation::PopulateAssetData()
 {
-	IAssetRegistry& AssetRegistry = FModuleManager::LoadModuleChecked<FAssetRegistryModule>("AssetRegistry").Get();
+	const IAssetRegistry& AssetRegistry = FModuleManager::LoadModuleChecked<FAssetRegistryModule>("AssetRegistry").Get();
 	TArray<FAssetRenameData> AssetRenameData;
 
 	if (Violator.IsValid())
@@ -247,4 +245,4 @@ bool FLintRuleViolation::PopulateAssetData()
 	}
 
 	return false;
-}
+}