fixed 4.15 build

Roberto De Ioris · Roberto De Ioris · commit 0dcbb7e868a1 · 2018-07-18T12:25:56.000+02:00
diff --git a/Source/PythonConsole/Private/SPythonLog.h b/Source/PythonConsole/Private/SPythonLog.h
@@ -6,6 +6,7 @@
 #include "SlateCore.h"
 #include "UnrealEnginePython.h"
 #include "Runtime/Slate/Public/Widgets/Input/SMultiLineEditableTextBox.h"
+#include "Runtime/Slate/Public/Widgets/Input/SEditableTextBox.h"
 
 class FPythonLogTextLayoutMarshaller;
 class SSearchBox;
diff --git a/Source/PythonEditor/Private/PYRichTextSyntaxHighlighterTextLayoutMarshaller.h b/Source/PythonEditor/Private/PYRichTextSyntaxHighlighterTextLayoutMarshaller.h
@@ -1,7 +1,7 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 #pragma once
 
-
+#include "Runtime/SlateCore/Public/Styling/SlateTypes.h"
 #include "PythonSyntaxTokenizer.h"
 #include "PlainTextLayoutMarshaller.h"
 #include "ITextDecorator.h"
diff --git a/Source/PythonEditor/Private/PythonEditorCustomization.h b/Source/PythonEditor/Private/PythonEditorCustomization.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include "UnrealEd.h"
 #include "PythonEditorCustomization.generated.h"
 
 USTRUCT()
diff --git a/Source/PythonEditor/Private/PythonProjectEditorToolbar.h b/Source/PythonEditor/Private/PythonProjectEditorToolbar.h
@@ -2,6 +2,9 @@
 
 #pragma once
 
+#include "PythonProjectEditor.h"
+#include "Runtime/Slate/Public/Framework/MultiBox/MultiBoxBuilder.h"
+
 class FPythonProjectEditorToolbar : public TSharedFromThis<FPythonProjectEditorToolbar>
 {
 public:
diff --git a/Source/PythonEditor/Private/PythonProjectItem.h b/Source/PythonEditor/Private/PythonProjectItem.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include "UnrealEd.h"
 #include "PythonProjectItem.generated.h"
 
 /** Types of project items. Note that the enum ordering determines the tree sorting */
diff --git a/Source/PythonEditor/Private/PythonSyntaxTokenizer.h b/Source/PythonEditor/Private/PythonSyntaxTokenizer.h
@@ -1,6 +1,8 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 #pragma once
 
+#include "Runtime/Slate/Public/Framework/Text/SyntaxTokenizer.h"
+
 /**
  * Tokenize the text based upon the given rule set
  */
diff --git a/Source/PythonEditor/Private/SPythonEditableText.cpp b/Source/PythonEditor/Private/SPythonEditableText.cpp
@@ -2,6 +2,7 @@
 
 #include "SPythonEditableText.h"
 #include "PythonEditorStyle.h"
+#include "Runtime/Slate/Public/Framework/Application/SlateApplication.h"
 
 
 void SPythonEditableText::Construct(const FArguments& InArgs)
diff --git a/Source/PythonEditor/Private/SPythonEditor.cpp b/Source/PythonEditor/Private/SPythonEditor.cpp
@@ -9,6 +9,7 @@
 #include "Runtime/Slate/Public/Widgets/Layout/SGridPanel.h"
 #include "PythonEditorStyle.h"
 #include "Runtime/Slate/Public/Widgets/Text/STextBlock.h"
+#include "Runtime/Slate/Public/Widgets/Layout/SScrollBar.h"
 #include "UnrealEnginePython.h"
 
 
diff --git a/Source/PythonEditor/Private/SPythonEditor.h b/Source/PythonEditor/Private/SPythonEditor.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include "SlateCore.h"
+#include "Runtime/Slate/Public/Widgets/Layout/SScrollBar.h"
 
 class SPythonEditor : public SCompoundWidget
 {
diff --git a/Source/UnrealEnginePython/Private/UEPyEditor.cpp b/Source/UnrealEnginePython/Private/UEPyEditor.cpp
@@ -676,13 +676,15 @@ PyObject *py_unreal_engine_rename_asset(PyObject * self, PyObject * args)
 	FAssetToolsModule& AssetToolsModule = FModuleManager::LoadModuleChecked<FAssetToolsModule>("AssetTools");
 
 	TArray<FAssetRenameData> AssetsAndNames;
+	FString Destination = FString(UTF8_TO_TCHAR(destination));
+
+#if ENGINE_MINOR_VERSION > 15
 	FAssetRenameData RenameData;
 	RenameData.Asset = asset.GetAsset();
 
-	FString Destination = FString(UTF8_TO_TCHAR(destination));
-
 	if (Destination.StartsWith("/"))
 	{
+
 		RenameData.NewPackagePath = FPackageName::GetLongPackagePath(Destination);
 		RenameData.NewName = FPackageName::GetShortName(Destination);
 	}
@@ -696,6 +698,9 @@ PyObject *py_unreal_engine_rename_asset(PyObject * self, PyObject * args)
 	{
 		RenameData.bOnlyFixSoftReferences = true;
 	}
+#else
+	FAssetRenameData RenameData(TWeakObjectPtr<UObject>(asset.GetAsset()), FPackageName::GetLongPackagePath(UTF8_TO_TCHAR(path)), Destination.StartsWith("/") ? FPackageName::GetShortName(Destination) : Destination);
+#endif
 
 	AssetsAndNames.Add(RenameData);
 #if ENGINE_MINOR_VERSION < 19
diff --git a/Source/UnrealEnginePython/Public/PythonSmartDelegate.h b/Source/UnrealEnginePython/Public/PythonSmartDelegate.h
@@ -3,6 +3,7 @@
 #include "UnrealEnginePython.h"
 #if WITH_EDITOR
 #include "Factories/Factory.h"
+#include "Runtime/SlateCore/Public/Widgets/SWindow.h"
 #endif
 
 class FPythonSmartDelegate : public TSharedFromThis<FPythonSmartDelegate>

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,9 @@`
`2`	`2`
`3`	`3`	`#pragma once`
`4`	`4`
	`5`	`+#include "PythonProjectEditor.h"`
	`6`	`+#include "Runtime/Slate/Public/Framework/MultiBox/MultiBoxBuilder.h"`
	`7`	`+`
`5`	`8`	`class FPythonProjectEditorToolbar : public TSharedFromThis<FPythonProjectEditorToolbar>`
`6`	`9`	`{`
`7`	`10`	`public:`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`#pragma once`
`4`	`4`
`5`	`5`	`#include "SlateCore.h"`
	`6`	`+#include "Runtime/Slate/Public/Widgets/Layout/SScrollBar.h"`
`6`	`7`
`7`	`8`	`class SPythonEditor : public SCompoundWidget`
`8`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -676,13 +676,15 @@ PyObject py_unreal_engine_rename_asset(PyObject self, PyObject * args)`
`676`	`676`	`FAssetToolsModule& AssetToolsModule = FModuleManager::LoadModuleChecked<FAssetToolsModule>("AssetTools");`
`677`	`677`
`678`	`678`	`TArray<FAssetRenameData> AssetsAndNames;`
	`679`	`+ FString Destination = FString(UTF8_TO_TCHAR(destination));`
	`680`	`+`
	`681`	`+#if ENGINE_MINOR_VERSION > 15`
`679`	`682`	`FAssetRenameData RenameData;`
`680`	`683`	`RenameData.Asset = asset.GetAsset();`
`681`	`684`
`682`		`- FString Destination = FString(UTF8_TO_TCHAR(destination));`
`683`		`-`
`684`	`685`	`if (Destination.StartsWith("/"))`
`685`	`686`	`{`
	`687`	`+`
`686`	`688`	`RenameData.NewPackagePath = FPackageName::GetLongPackagePath(Destination);`
`687`	`689`	`RenameData.NewName = FPackageName::GetShortName(Destination);`
`688`	`690`	`}`
`@@ -696,6 +698,9 @@ PyObject py_unreal_engine_rename_asset(PyObject self, PyObject * args)`
`696`	`698`	`{`
`697`	`699`	`RenameData.bOnlyFixSoftReferences = true;`
`698`	`700`	`}`
	`701`	`+#else`
	`702`	`+ FAssetRenameData RenameData(TWeakObjectPtr<UObject>(asset.GetAsset()), FPackageName::GetLongPackagePath(UTF8_TO_TCHAR(path)), Destination.StartsWith("/") ? FPackageName::GetShortName(Destination) : Destination);`
	`703`	`+#endif`
`699`	`704`
`700`	`705`	`AssetsAndNames.Add(RenameData);`
`701`	`706`	`#if ENGINE_MINOR_VERSION < 19`