no more PCH

Roberto De Ioris · Roberto De Ioris · commit fabb4c236995 · 2018-07-18T11:17:20.000+02:00
diff --git a/Source/PythonAutomation/PythonAutomation.Build.cs b/Source/PythonAutomation/PythonAutomation.Build.cs
@@ -12,6 +12,8 @@ public PythonAutomation(TargetInfo Target)
 #endif
     {
         PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
+        string enableUnityBuild = System.Environment.GetEnvironmentVariable("UEP_ENABLE_UNITY_BUILD");
+        bFasterWithoutUnity = string.IsNullOrEmpty(enableUnityBuild);
 
         PrivateIncludePaths.AddRange(
             new string[] {
diff --git a/Source/PythonConsole/Private/PyFbxFactory.cpp b/Source/PythonConsole/Private/PyFbxFactory.cpp
@@ -1,4 +1,3 @@
-#include "PythonConsolePrivatePCH.h"
 
 #include "PyFbxFactory.h"
 #include "FbxMeshUtils.h"
diff --git a/Source/PythonConsole/Private/PythonConsoleModule.cpp b/Source/PythonConsole/Private/PythonConsoleModule.cpp
@@ -1,6 +1,6 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
-#include "PythonConsolePrivatePCH.h"
+#include "PythonConsoleModule.h"
 #include "SPythonConsole.h"
 #include "SPythonLog.h"
 #include "Editor/WorkspaceMenuStructure/Public/WorkspaceMenuStructureModule.h"
diff --git a/Source/PythonConsole/Private/PythonConsolePrivatePCH.h b/Source/PythonConsole/Private/PythonConsolePrivatePCH.h
diff --git a/Source/PythonConsole/Private/PythonScriptFactory.cpp b/Source/PythonConsole/Private/PythonScriptFactory.cpp
@@ -1,4 +1,3 @@
-#include "PythonConsolePrivatePCH.h"
 
 #include "PythonScriptFactory.h"
 #include "PythonScript.h"
diff --git a/Source/PythonConsole/Private/SPythonConsole.cpp b/Source/PythonConsole/Private/SPythonConsole.cpp
@@ -1,6 +1,6 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
-#include "PythonConsolePrivatePCH.h"
+#include "SPythonConsole.h"
 #include "PythonConsoleModule.h"
 #include "SPythonConsole.h"
 #include "SPythonLog.h"
diff --git a/Source/PythonConsole/Private/SPythonConsole.h b/Source/PythonConsole/Private/SPythonConsole.h
@@ -2,6 +2,9 @@
 
 #pragma once
 
+#include "SlateCore.h"
+#include "EditorStyle.h"
+#include "PythonConsoleModule.h"
 
 /**
  * Debug console widget, designed to be summoned on top of a viewport or window
@@ -10,14 +13,14 @@ class SPythonConsole : public SCompoundWidget
 {
 public:
 
-	SLATE_BEGIN_ARGS( SPythonConsole )	
+	SLATE_BEGIN_ARGS(SPythonConsole)
 	{
 	}
 
 	SLATE_END_ARGS()
 
-	/** Constructs this widget */
-	void Construct( const FArguments& InArgs, const EPythonConsoleStyle::Type InStyle, FPythonConsoleModule* PythonConsoleModule, const FPythonConsoleDelegates* PythonConsoleDelegates );
+		/** Constructs this widget */
+		void Construct(const FArguments& InArgs, const EPythonConsoleStyle::Type InStyle, FPythonConsoleModule* PythonConsoleModule, const FPythonConsoleDelegates* PythonConsoleDelegates);
 
 	/** Call to set focus to this debug console's editable text box */
 	void SetFocusToEditableText();
diff --git a/Source/PythonConsole/Private/SPythonLog.cpp b/Source/PythonConsole/Private/SPythonLog.cpp
@@ -1,14 +1,17 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
-#include "PythonConsolePrivatePCH.h"
 #include "SPythonLog.h"
 #include "SScrollBorder.h"
 #include "GameFramework/GameMode.h"
 #include "Engine/LocalPlayer.h"
 #include "GameFramework/GameState.h"
 #include "SSearchBox.h"
 #include "Runtime/Launch/Resources/Version.h"
-//#include "UnrealEnginePython.h"
+#include "Runtime/Slate/Public/Framework/Text/SlateTextLayout.h"
+#include "Editor/EditorStyle/Public/Classes/EditorStyleSettings.h"
+#include "SlateBasics.h"
+#include "EditorStyle.h"
+
 #define LOCTEXT_NAMESPACE "PythonConsole"
 
 
diff --git a/Source/PythonConsole/Private/SPythonLog.h b/Source/PythonConsole/Private/SPythonLog.h
@@ -3,8 +3,9 @@
 #pragma once
 #include "BaseTextLayoutMarshaller.h"
 #include "TextFilterExpressionEvaluator.h"
-
-#include "UnrealEnginePython/Public/UnrealEnginePython.h"
+#include "SlateCore.h"
+#include "UnrealEnginePython.h"
+#include "Runtime/Slate/Public/Widgets/Input/SMultiLineEditableTextBox.h"
 
 class FPythonLogTextLayoutMarshaller;
 class SSearchBox;
diff --git a/Source/PythonConsole/PythonConsole.Build.cs b/Source/PythonConsole/PythonConsole.Build.cs
@@ -11,6 +11,10 @@ public PythonConsole(ReadOnlyTargetRules Target) : base(Target)
     public PythonConsole(TargetInfo Target)
 #endif
     {
+        PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
+        string enableUnityBuild = System.Environment.GetEnvironmentVariable("UEP_ENABLE_UNITY_BUILD");
+        bFasterWithoutUnity = string.IsNullOrEmpty(enableUnityBuild);
+
         PrivateIncludePaths.AddRange(
             new string[] {
                 "PythonConsole/Private",
diff --git a/Source/PythonEditor/Private/DirectoryScanner.cpp b/Source/PythonEditor/Private/DirectoryScanner.cpp
@@ -1,7 +1,8 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
-#include "PythonEditorPrivatePCH.h"
 #include "DirectoryScanner.h"
+#include "Runtime/Core/Public/Misc/IQueuedWork.h"
+#include "Runtime/Core/Public/GenericPlatform/GenericPlatformFile.h"
 #include "PythonProjectItem.h"
 
 TArray<FDirectoryScannerCommand*> FDirectoryScanner::CommandQueue;
diff --git a/Source/PythonEditor/Private/PYRichTextSyntaxHighlighterTextLayoutMarshaller.cpp b/Source/PythonEditor/Private/PYRichTextSyntaxHighlighterTextLayoutMarshaller.cpp
@@ -1,8 +1,8 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
-#include "PythonEditorPrivatePCH.h"
 #include "PYRichTextSyntaxHighlighterTextLayoutMarshaller.h"
 #include "WhiteSpaceTextRun.h"
+#include "Runtime/Launch/Resources/Version.h"
 
 FPYRichTextSyntaxHighlighterTextLayoutMarshaller::FPYRichTextSyntaxHighlighterTextLayoutMarshaller(TSharedPtr< FPythonSyntaxTokenizer > InTokenizer, const FSyntaxTextStyle& InSyntaxTextStyle)
 	: Tokenizer(MoveTemp(InTokenizer))
diff --git a/Source/PythonEditor/Private/PYRichTextSyntaxHighlighterTextLayoutMarshaller.h b/Source/PythonEditor/Private/PYRichTextSyntaxHighlighterTextLayoutMarshaller.h
@@ -5,6 +5,7 @@
 #include "PythonSyntaxTokenizer.h"
 #include "PlainTextLayoutMarshaller.h"
 #include "ITextDecorator.h"
+#include "PythonEditorStyle.h"
 
 
 class  FPYRichTextSyntaxHighlighterTextLayoutMarshaller : public FPlainTextLayoutMarshaller
diff --git a/Source/PythonEditor/Private/PythonEditor.cpp b/Source/PythonEditor/Private/PythonEditor.cpp
@@ -1,10 +1,13 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
-#include "PythonEditorPrivatePCH.h"
 #include "ModuleManager.h"
 #include "AssetToolsModule.h"
 #include "AssetEditorToolkit.h"
 #include "LevelEditor.h"
+#include "PythonEditorStyle.h"
+#include "PythonProjectEditor.h"
+#include "PythonProject.h"
+#include "Runtime/Slate/Public/Framework/MultiBox/MultiBoxBuilder.h"
 
 static const FName PythonEditorTabName( TEXT( "PythonEditor" ) );
 
diff --git a/Source/PythonEditor/Private/PythonEditorCustomization.cpp b/Source/PythonEditor/Private/PythonEditorCustomization.cpp
@@ -1,6 +1,5 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
-#include "PythonEditorPrivatePCH.h"
 #include "PythonEditorCustomization.h"
 
 UPythonEditorCustomization::UPythonEditorCustomization(const FObjectInitializer& ObjectInitializer)
diff --git a/Source/PythonEditor/Private/PythonEditorPrivatePCH.h b/Source/PythonEditor/Private/PythonEditorPrivatePCH.h
diff --git a/Source/PythonEditor/Private/PythonEditorStyle.cpp b/Source/PythonEditor/Private/PythonEditorStyle.cpp
@@ -1,7 +1,11 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
-#include "PythonEditorPrivatePCH.h"
+#include "PythonEditorStyle.h"
 #include "EditorStyleSet.h"
+#include "SlateCore.h"
+#include "Runtime/SlateCore/Public/Styling/SlateStyle.h"
+#include "Runtime/Projects/Public/Interfaces/IPluginManager.h"
+
 
 TSharedPtr< FSlateStyleSet > FPythonEditorStyle::StyleSet = nullptr;
 
@@ -33,12 +37,12 @@ static const FVector2D Icon267x140(170.0f, 50.0f);
 void FPythonEditorStyle::Initialize()
 {
 	// Only register once
-	if( StyleSet.IsValid() )
+	if (StyleSet.IsValid())
 	{
 		return;
 	}
 
-	StyleSet = MakeShareable(new FSlateStyleSet("PythonEditor") );
+	StyleSet = MakeShareable(new FSlateStyleSet("PythonEditor"));
 
 	StyleSet->SetContentRoot(IPluginManager::Get().FindPlugin("UnrealEnginePython")->GetBaseDir() / TEXT("Resources"));
 
@@ -64,7 +68,7 @@ void FPythonEditorStyle::Initialize()
 		StyleSet->Set("PythonEditor.PEP8ize.Small", new IMAGE_BRUSH("UI/Excute_x40", Icon16x16));
 	}
 
-	const FSlateFontInfo Consolas10  = TTF_FONT("Font/DroidSansMono", 9);
+	const FSlateFontInfo Consolas10 = TTF_FONT("Font/DroidSansMono", 9);
 
 	const FTextBlockStyle NormalText = FTextBlockStyle()
 		.SetFont(Consolas10)
@@ -88,28 +92,28 @@ void FPythonEditorStyle::Initialize()
 		StyleSet->Set("SyntaxHighlight.PY.Define", FTextBlockStyle(NormalText).SetColorAndOpacity(FLinearColor(FColor(0xffa6e22a)))); // light grey
 
 
-		StyleSet->Set("TextEditor.Border", new BOX_BRUSH("UI/TextEditorBorder", FMargin(4.0f/16.0f), FLinearColor(0.02f,0.02f,0.02f,1)));
+		StyleSet->Set("TextEditor.Border", new BOX_BRUSH("UI/TextEditorBorder", FMargin(4.0f / 16.0f), FLinearColor(0.02f, 0.02f, 0.02f, 1)));
 
 		const FEditableTextBoxStyle EditableTextBoxStyle = FEditableTextBoxStyle()
-			.SetBackgroundImageNormal( FSlateNoResource() )
-			.SetBackgroundImageHovered( FSlateNoResource() )
-			.SetBackgroundImageFocused( FSlateNoResource() )
-			.SetBackgroundImageReadOnly( FSlateNoResource() );
-		
+			.SetBackgroundImageNormal(FSlateNoResource())
+			.SetBackgroundImageHovered(FSlateNoResource())
+			.SetBackgroundImageFocused(FSlateNoResource())
+			.SetBackgroundImageReadOnly(FSlateNoResource());
+
 		StyleSet->Set("TextEditor.EditableTextBox", EditableTextBoxStyle);
 	}
 
 	// Project editor
 	{
-		StyleSet->Set("ProjectEditor.Border", new BOX_BRUSH("UI/TextEditorBorder", FMargin(4.0f/16.0f), FLinearColor(0.048f,0.048f,0.048f,1)));
+		StyleSet->Set("ProjectEditor.Border", new BOX_BRUSH("UI/TextEditorBorder", FMargin(4.0f / 16.0f), FLinearColor(0.048f, 0.048f, 0.048f, 1)));
 
-		StyleSet->Set("ProjectEditor.Icon.Project", new IMAGE_BRUSH("UI/FolderClosed", Icon16x16, FLinearColor(0.25f,0.25f,0.25f,1)));
-		StyleSet->Set("ProjectEditor.Icon.Folder", new IMAGE_BRUSH("UI/FolderClosed", Icon16x16, FLinearColor(0.25f,0.25f,0.25f,1)));
+		StyleSet->Set("ProjectEditor.Icon.Project", new IMAGE_BRUSH("UI/FolderClosed", Icon16x16, FLinearColor(0.25f, 0.25f, 0.25f, 1)));
+		StyleSet->Set("ProjectEditor.Icon.Folder", new IMAGE_BRUSH("UI/FolderClosed", Icon16x16, FLinearColor(0.25f, 0.25f, 0.25f, 1)));
 		StyleSet->Set("ProjectEditor.Icon.File", new IMAGE_BRUSH("UI/PythonEditor_16x", Icon16x16));
 		StyleSet->Set("ProjectEditor.Icon.GenericFile", new IMAGE_BRUSH("UI/GenericFile", Icon16x16));
 	}
 
-	FSlateStyleRegistry::RegisterSlateStyle( *StyleSet.Get() );
+	FSlateStyleRegistry::RegisterSlateStyle(*StyleSet.Get());
 }
 
 #undef IMAGE_BRUSH
@@ -120,17 +124,17 @@ void FPythonEditorStyle::Initialize()
 
 void FPythonEditorStyle::Shutdown()
 {
-	if( StyleSet.IsValid() )
+	if (StyleSet.IsValid())
 	{
-		FSlateStyleRegistry::UnRegisterSlateStyle( *StyleSet.Get() );
-		ensure( StyleSet.IsUnique() );
+		FSlateStyleRegistry::UnRegisterSlateStyle(*StyleSet.Get());
+		ensure(StyleSet.IsUnique());
 		StyleSet.Reset();
 	}
 }
 
 const ISlateStyle& FPythonEditorStyle::Get()
 {
-	return *( StyleSet.Get() );
+	return *(StyleSet.Get());
 }
 
 const FName& FPythonEditorStyle::GetStyleSetName()
diff --git a/Source/PythonEditor/Private/PythonProject.cpp b/Source/PythonEditor/Private/PythonProject.cpp
@@ -1,6 +1,7 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
-#include "PythonEditorPrivatePCH.h"
+#include "PythonProject.h"
+#include "UnrealEnginePython.h"
 
 
 UPythonProject::UPythonProject(const FObjectInitializer& ObjectInitializer)
diff --git a/Source/PythonEditor/Private/PythonProjectEditor.cpp b/Source/PythonEditor/Private/PythonProjectEditor.cpp
@@ -1,12 +1,18 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
-#include "PythonEditorPrivatePCH.h"
+#include "PythonProjectEditor.h"
 #include "SPythonEditor.h"
 #include "SPythonProjectEditor.h"
 #include "SDockTab.h"
 #include "PythonProjectEditorToolbar.h"
 #include "Editor/Kismet/Public/WorkflowOrientedApp/WorkflowUObjectDocuments.h"
 #include "Editor/Kismet/Public/WorkflowOrientedApp/ApplicationMode.h"
+#include "PythonProjectItem.h"
+#include "PythonEditorStyle.h"
+#include "PythonProject.h"
+#include "PythonProjectEditorCommands.h"
+#include "Runtime/Core/Public/HAL/PlatformFilemanager.h"
+#include "Runtime/Core/Public/Misc/MessageDialog.h"
 #define LOCTEXT_NAMESPACE "PythonEditor"
 
 TWeakPtr<FPythonProjectEditor> FPythonProjectEditor::PythonEditor;
diff --git a/Source/PythonEditor/Private/PythonProjectEditorCommands.cpp b/Source/PythonEditor/Private/PythonProjectEditorCommands.cpp
@@ -1,7 +1,7 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
-#include "PythonEditorPrivatePCH.h"
-
+#include "PythonProjectEditorCommands.h"
+#include "PythonEditorStyle.h"
 
 #define LOCTEXT_NAMESPACE "PythonProjectEditorCommands"
 
diff --git a/Source/PythonEditor/Private/PythonProjectEditorToolbar.cpp b/Source/PythonEditor/Private/PythonProjectEditorToolbar.cpp
@@ -1,10 +1,12 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
-#include "PythonEditorPrivatePCH.h"
 #include "PythonProjectEditorToolbar.h"
 #include "LevelEditorActions.h"
 #include "SourceCodeNavigation.h"
 #include "EditorStyleSet.h"
+#include "Runtime/Slate/Public/Framework/MultiBox/MultiBoxExtender.h"
+#include "PythonProjectEditor.h"
+#include "PythonProjectEditorCommands.h"
 
 
 void FPythonProjectEditorToolbar::AddEditorToolbar(TSharedPtr<FExtender> Extender)
diff --git a/Source/PythonEditor/Private/PythonProjectItem.cpp b/Source/PythonEditor/Private/PythonProjectItem.cpp
@@ -1,6 +1,5 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
-#include "PythonEditorPrivatePCH.h"
 #include "PythonProjectItem.h"
 #include "DirectoryScanner.h"
 #include "Developer/DirectoryWatcher/Public/IDirectoryWatcher.h"
diff --git a/Source/PythonEditor/Private/PythonSyntaxTokenizer.cpp b/Source/PythonEditor/Private/PythonSyntaxTokenizer.cpp
@@ -1,6 +1,5 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
-#include "PythonEditorPrivatePCH.h"
 #include "PythonSyntaxTokenizer.h"
 #include "BreakIterator.h"
 
diff --git a/Source/PythonEditor/Private/SProjectViewItem.cpp b/Source/PythonEditor/Private/SProjectViewItem.cpp
@@ -1,9 +1,9 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
-#include "PythonEditorPrivatePCH.h"
 #include "SProjectViewItem.h"
 #include "SInlineEditableTextBlock.h"
 #include "BreakIterator.h"
+#include "PythonEditorStyle.h"
 
 #define LOCTEXT_NAMESPACE "ProjectViewItem"
 
diff --git a/Source/PythonEditor/Private/SProjectViewItem.h b/Source/PythonEditor/Private/SProjectViewItem.h
@@ -2,6 +2,9 @@
 
 #pragma once
 
+#include "SlateCore.h"
+#include "PythonProjectItem.h"
+
 class SProjectViewItem : public SCompoundWidget
 {
 public:
diff --git a/Source/PythonEditor/Private/SPythonEditableText.cpp b/Source/PythonEditor/Private/SPythonEditableText.cpp
@@ -1,7 +1,7 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
-#include "PythonEditorPrivatePCH.h"
 #include "SPythonEditableText.h"
+#include "PythonEditorStyle.h"
 
 
 void SPythonEditableText::Construct(const FArguments& InArgs)
diff --git a/Source/PythonEditor/Private/SPythonEditor.cpp b/Source/PythonEditor/Private/SPythonEditor.cpp
diff --git a/Source/PythonEditor/Private/SPythonEditor.h b/Source/PythonEditor/Private/SPythonEditor.h
diff --git a/Source/PythonEditor/Private/SPythonProjectEditor.cpp b/Source/PythonEditor/Private/SPythonProjectEditor.cpp
diff --git a/Source/PythonEditor/Private/SPythonProjectEditor.h b/Source/PythonEditor/Private/SPythonProjectEditor.h
diff --git a/Source/PythonEditor/Private/WhiteSpaceTextRun.cpp b/Source/PythonEditor/Private/WhiteSpaceTextRun.cpp
diff --git a/Source/PythonEditor/PythonEditor.Build.cs b/Source/PythonEditor/PythonEditor.Build.cs

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ public PythonAutomation(TargetInfo Target)`
`12`	`12`	`#endif`
`13`	`13`	`{`
`14`	`14`	`PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;`
	`15`	`+ string enableUnityBuild = System.Environment.GetEnvironmentVariable("UEP_ENABLE_UNITY_BUILD");`
	`16`	`+ bFasterWithoutUnity = string.IsNullOrEmpty(enableUnityBuild);`
`15`	`17`
`16`	`18`	`PrivateIncludePaths.AddRange(`
`17`	`19`	`new string[] {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#include "PythonConsolePrivatePCH.h"`
`2`	`1`
`3`	`2`	`#include "PyFbxFactory.h"`
`4`	`3`	`#include "FbxMeshUtils.h"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#include "PythonConsolePrivatePCH.h"`
`2`	`1`
`3`	`2`	`#include "PythonScriptFactory.h"`
`4`	`3`	`#include "PythonScript.h"`