Fixing 4.17 compilation bugs & warnings

ikrima · ikrima · commit 59ed31645931 · 2017-09-08T18:10:27.000-07:00
-Minor issues with incremental compilation with missing headers
diff --git a/Source/PythonConsole/Private/PythonConsoleModule.cpp b/Source/PythonConsole/Private/PythonConsoleModule.cpp
@@ -7,7 +7,7 @@
 #include "SDockTab.h"
 #include "Editor/WorkspaceMenuStructure/Public/WorkspaceMenuStructure.h"
 
-IMPLEMENT_MODULE( FPythonConsoleModule, PythonLog );
+IMPLEMENT_MODULE( FPythonConsoleModule, PythonConsole );
 
 namespace PythonConsoleModule
 {
diff --git a/Source/UnrealEnginePython/Private/PythonScript.cpp b/Source/UnrealEnginePython/Private/PythonScript.cpp
@@ -1,5 +1,4 @@
 #include "UnrealEnginePythonPrivatePCH.h"
-
 #include "PythonScript.h"
 
 static void callback(void *arg) {
diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySFilePathPicker.cpp b/Source/UnrealEnginePython/Private/Slate/UEPySFilePathPicker.cpp
@@ -1,9 +1,8 @@
-#if WITH_EDITOR
-#if ENGINE_MINOR_VERSION > 13
 #include "UnrealEnginePythonPrivatePCH.h"
-
 #include "UEPySFilePathPicker.h"
 
+#if WITH_EDITOR
+#if ENGINE_MINOR_VERSION > 13
 #define sw_file_path_picker StaticCastSharedRef<SFilePathPicker>(self->s_compound_widget.s_widget.s_widget)
 
 
diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySFilePathPicker.h b/Source/UnrealEnginePython/Private/Slate/UEPySFilePathPicker.h
@@ -2,9 +2,9 @@
 
 #include "UnrealEnginePython.h"
 
-
 #include "UEPySCompoundWidget.h"
 
+#if WITH_EDITOR
 #if ENGINE_MINOR_VERSION > 13
 #include "Developer/DesktopWidgets/Public/Widgets/Input/SFilePathPicker.h"
 
@@ -17,3 +17,4 @@ typedef struct {
 
 void ue_python_init_sfile_path_picker(PyObject *);
 #endif
+#endif
diff --git a/Source/UnrealEnginePython/Private/UEPyEditor.cpp b/Source/UnrealEnginePython/Private/UEPyEditor.cpp
@@ -1718,7 +1718,11 @@ PyObject *py_unreal_engine_move_selected_actors_to_level(PyObject *self, PyObjec
 
 	ULevel *level = (ULevel *)py_obj_level->ue_object;
 
+#if ENGINE_MINOR_VERSION >= 17
+    UEditorLevelUtils::MoveSelectedActorsToLevel(level);
+#else
 	GEditor->MoveSelectedActorsToLevel(level);
+#endif
 
 	Py_INCREF(Py_None);
 	return Py_None;
diff --git a/Source/UnrealEnginePython/Public/PythonScript.h b/Source/UnrealEnginePython/Public/PythonScript.h
@@ -1,6 +1,7 @@
 #pragma once
 
-
+#include "CoreMinimal.h"
+#include "UObject/Object.h"
 #include "PythonScript.generated.h"
 
 UCLASS(MinimalAPI)

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#include "SDockTab.h"`
`8`	`8`	`#include "Editor/WorkspaceMenuStructure/Public/WorkspaceMenuStructure.h"`
`9`	`9`
`10`		`-IMPLEMENT_MODULE( FPythonConsoleModule, PythonLog );`
	`10`	`+IMPLEMENT_MODULE( FPythonConsoleModule, PythonConsole );`
`11`	`11`
`12`	`12`	`namespace PythonConsoleModule`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#include "UnrealEnginePythonPrivatePCH.h"`
`2`		`-`
`3`	`2`	`#include "PythonScript.h"`
`4`	`3`
`5`	`4`	`static void callback(void *arg) {`