more 4.20 fixes

Roberto De Ioris · Roberto De Ioris · commit 4507d6edf2ca · 2018-07-26T19:17:27.000+02:00
diff --git a/Source/PythonConsole/Private/SPythonLog.h b/Source/PythonConsole/Private/SPythonLog.h
@@ -2,7 +2,7 @@
 
 #pragma once
 #include "Runtime/Slate/Public/Framework/Text/BaseTextLayoutMarshaller.h"
-#include "TextFilterExpressionEvaluator.h"
+#include "Runtime/Core/Public/Misc/TextFilterExpressionEvaluator.h"
 #include "Runtime/SlateCore/Public/SlateCore.h"
 #include "UnrealEnginePython.h"
 #include "Runtime/Slate/Public/Widgets/Input/SMultiLineEditableTextBox.h"
diff --git a/Source/PythonEditor/Private/PYRichTextSyntaxHighlighterTextLayoutMarshaller.h b/Source/PythonEditor/Private/PYRichTextSyntaxHighlighterTextLayoutMarshaller.h
@@ -3,7 +3,7 @@
 
 #include "Runtime/SlateCore/Public/Styling/SlateTypes.h"
 #include "PythonSyntaxTokenizer.h"
-#include "PlainTextLayoutMarshaller.h"
+#include "Runtime/Slate/Public/Framework/Text/PlainTextLayoutMarshaller.h"
 #include "ITextDecorator.h"
 #include "PythonEditorStyle.h"
 
diff --git a/Source/PythonEditor/Private/PythonEditor.cpp b/Source/PythonEditor/Private/PythonEditor.cpp
@@ -1,6 +1,6 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
-#include "ModuleManager.h"
+#include "Runtime/Core/Public/Modules/ModuleManager.h"
 #include "AssetToolsModule.h"
 #include "AssetEditorToolkit.h"
 #include "LevelEditor.h"
diff --git a/Source/PythonEditor/Private/PythonEditorStyle.h b/Source/PythonEditor/Private/PythonEditorStyle.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "SlateStyle.h"
+#include "Runtime/SlateCore/Public/Styling/SlateStyle.h"
 
 class FPythonEditorStyle
 {
diff --git a/Source/PythonEditor/Private/PythonProjectEditor.h b/Source/PythonEditor/Private/PythonProjectEditor.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "WorkflowCentricApplication.h"
+#include "Editor/Kismet/Public/WorkflowOrientedApp/WorkflowCentricApplication.h"
 #include "Editor/Kismet/Public/WorkflowOrientedApp/WorkflowTabManager.h"
 #include "Runtime/Launch/Resources/Version.h"
 
diff --git a/Source/PythonEditor/Private/PythonProjectEditorCommands.h b/Source/PythonEditor/Private/PythonProjectEditorCommands.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "Commands.h"
+#include "Runtime/Slate/Public/Framework/Commands/Commands.h"
 
 class FPythonProjectEditorCommands : public TCommands<FPythonProjectEditorCommands>
 {
diff --git a/Source/PythonEditor/Private/PythonSyntaxTokenizer.cpp b/Source/PythonEditor/Private/PythonSyntaxTokenizer.cpp
@@ -1,7 +1,7 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
 #include "PythonSyntaxTokenizer.h"
-#include "BreakIterator.h"
+#include "Runtime/Core/Public/Internationalization/BreakIterator.h"
 
 TSharedRef< FPythonSyntaxTokenizer > FPythonSyntaxTokenizer::Create(TArray<FRule> InRules)
 {
diff --git a/Source/PythonEditor/Private/SPythonEditableText.h b/Source/PythonEditor/Private/SPythonEditableText.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "SMultiLineEditableText.h"
+#include "Runtime/Slate/Public/Widgets/Text/SMultiLineEditableText.h"
 
 class SPythonEditableText : public SMultiLineEditableText
 {
diff --git a/Source/PythonEditor/Private/WhiteSpaceTextRun.h b/Source/PythonEditor/Private/WhiteSpaceTextRun.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "SlateTextRun.h"
+#include "Runtime/Slate/Public/Framework/Text/SlateTextRun.h"
 
 class FWhiteSpaceTextRun : public FSlateTextRun
 {
diff --git a/Source/UnrealEnginePython/Private/PyCommandlet.cpp b/Source/UnrealEnginePython/Private/PyCommandlet.cpp
@@ -7,7 +7,7 @@
 #include "Editor.h"
 #endif
 
-#include "Regex.h"
+#include "Runtime/Core/Public/Internationalization/Regex.h"
 
 UPyCommandlet::UPyCommandlet(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
diff --git a/Source/UnrealEnginePython/Private/Slate/UEPyFSlateStyleSet.cpp b/Source/UnrealEnginePython/Private/Slate/UEPyFSlateStyleSet.cpp
@@ -1,6 +1,6 @@
 
 #include "UEPyFSlateStyleSet.h"
-#include "SlateTypes.h"
+#include "Runtime/SlateCore/Public/Styling/SlateTypes.h"
 #include "Runtime/SlateCore/Public/Styling/SlateStyleRegistry.h"
 #include "Runtime/SlateCore/Public/Sound/SlateSound.h"
 #include "Map.h"
diff --git a/Source/UnrealEnginePython/Private/UObject/UEPySequencer.cpp b/Source/UnrealEnginePython/Private/UObject/UEPySequencer.cpp
@@ -11,7 +11,7 @@
 #include "Editor/Sequencer/Public/ISequencer.h"
 #include "Editor/Sequencer/Public/ISequencerModule.h"
 #include "Editor/UnrealEd/Public/Toolkits/AssetEditorManager.h"
-#include "Private/LevelSequenceEditorToolkit.h"
+#include "LevelSequenceEditor/Private/LevelSequenceEditorToolkit.h"
 #include "Tracks/MovieSceneCameraCutTrack.h"
 #if ENGINE_MINOR_VERSION < 20
 #include "Sections/IKeyframeSection.h"
diff --git a/Source/UnrealEnginePython/Private/UObject/UEPyUserDefinedStruct.cpp b/Source/UnrealEnginePython/Private/UObject/UEPyUserDefinedStruct.cpp
@@ -2,7 +2,8 @@
 
 
 #if WITH_EDITOR
-#include "Classes/UserDefinedStructure/UserDefinedStructEditorData.h"
+#include "Runtime/Engine/Classes/Engine/UserDefinedStruct.h"
+#include "Editor/UnrealEd/Classes/UserDefinedStructure/UserDefinedStructEditorData.h"
 #include "Public/Kismet2/StructureEditorUtils.h"
 
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`#pragma once`
`4`	`4`
`5`		`-#include "SlateStyle.h"`
	`5`	`+#include "Runtime/SlateCore/Public/Styling/SlateStyle.h"`
`6`	`6`
`7`	`7`	`class FPythonEditorStyle`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`#pragma once`
`4`	`4`
`5`		`-#include "Commands.h"`
	`5`	`+#include "Runtime/Slate/Public/Framework/Commands/Commands.h"`
`6`	`6`
`7`	`7`	`class FPythonProjectEditorCommands : public TCommands<FPythonProjectEditorCommands>`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.`
`2`	`2`
`3`	`3`	`#include "PythonSyntaxTokenizer.h"`
`4`		`-#include "BreakIterator.h"`
	`4`	`+#include "Runtime/Core/Public/Internationalization/BreakIterator.h"`
`5`	`5`
`6`	`6`	`TSharedRef< FPythonSyntaxTokenizer > FPythonSyntaxTokenizer::Create(TArray<FRule> InRules)`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`#pragma once`
`4`	`4`
`5`		`-#include "SMultiLineEditableText.h"`
	`5`	`+#include "Runtime/Slate/Public/Widgets/Text/SMultiLineEditableText.h"`
`6`	`6`
`7`	`7`	`class SPythonEditableText : public SMultiLineEditableText`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`#pragma once`
`4`	`4`
`5`		`-#include "SlateTextRun.h"`
	`5`	`+#include "Runtime/Slate/Public/Framework/Text/SlateTextRun.h"`
`6`	`6`
`7`	`7`	`class FWhiteSpaceTextRun : public FSlateTextRun`
`8`	`8`	`{`