Updated variable types to new FObject style, rather than UObject style

Author: boristsr

Source/UnrealEnginePython/Private/PythonDelegate.cpp

@@ -2,6 +2,7 @@
 #include "PythonDelegate.h"
 #include "UEPyModule.h"
 #include "UEPyCallable.h"
+#include "UObject/UEPyUPropertyBackwardsCompatibility.h"
 
 UPythonDelegate::UPythonDelegate()
 {
@@ -37,10 +38,10 @@ void UPythonDelegate::ProcessEvent(UFunction *function, void *Parms)
 		py_args = PyTuple_New(signature->NumParms);
 		Py_ssize_t argn = 0;
 
-		TFieldIterator<UProperty> PArgs(signature);
+		TFieldIterator<FProperty> PArgs(signature);
 		for (; PArgs && argn < signature->NumParms && ((PArgs->PropertyFlags & (CPF_Parm | CPF_ReturnParm)) == CPF_Parm); ++PArgs)
 		{
-			UProperty *prop = *PArgs;
+			FProperty *prop = *PArgs;
 			PyObject *arg = ue_py_convert_property(prop, (uint8 *)Parms, 0);
 			if (!arg)
 			{
@@ -63,7 +64,7 @@ void UPythonDelegate::ProcessEvent(UFunction *function, void *Parms)
 	// currently useless as events do not return a value
 	/*
 	if (signature_set) {
-		UProperty *return_property = signature->GetReturnProperty();
+		FProperty *return_property = signature->GetReturnProperty();
 		if (return_property && signature->ReturnValueOffset != MAX_uint16) {
 			if (!ue_py_convert_pyobject(ret, return_property, (uint8 *)Parms)) {
 				UE_LOG(LogPython, Error, TEXT("Invalid return value type for delegate"));

Source/UnrealEnginePython/Private/PythonFunction.cpp

@@ -1,6 +1,7 @@
 
 #include "PythonFunction.h"
 #include "UEPyModule.h"
+#include "UObject/UEPyUPropertyBackwardsCompatibility.h"
 
 
 void UPythonFunction::SetPyCallable(PyObject *callable)
@@ -30,7 +31,7 @@ void UPythonFunction::CallPythonCallable(FFrame& Stack, RESULT_DECL)
 
 	// count the number of arguments
 	Py_ssize_t argn = (Context && !is_static) ? 1 : 0;
-	TFieldIterator<UProperty> IArgs(function);
+	TFieldIterator<FProperty> IArgs(function);
 	for (; IArgs && ((IArgs->PropertyFlags & (CPF_Parm | CPF_ReturnParm)) == CPF_Parm); ++IArgs) {
 		argn++;
 	}
@@ -56,7 +57,7 @@ void UPythonFunction::CallPythonCallable(FFrame& Stack, RESULT_DECL)
 
 	// is it a blueprint call ?
 	if (*Stack.Code == EX_EndFunctionParms) {
-		for (UProperty *prop = (UProperty *)function->Children; prop; prop = (UProperty *)prop->Next) {
+		for (FProperty *prop = (FProperty *)function->Children; prop; prop = (FProperty *)prop->Next) {
 			if (prop->PropertyFlags & CPF_ReturnParm)
 				continue;
 			if (!on_error) {
@@ -75,7 +76,7 @@ void UPythonFunction::CallPythonCallable(FFrame& Stack, RESULT_DECL)
 		//UE_LOG(LogPython, Warning, TEXT("BLUEPRINT CALL"));
 		frame = (uint8 *)FMemory_Alloca(function->PropertiesSize);
 		FMemory::Memzero(frame, function->PropertiesSize);
-		for (UProperty *prop = (UProperty *)function->Children; *Stack.Code != EX_EndFunctionParms; prop = (UProperty *)prop->Next) {
+		for (FProperty *prop = (FProperty *)function->Children; *Stack.Code != EX_EndFunctionParms; prop = (FProperty *)prop->Next) {
 			Stack.Step(Stack.Object, prop->ContainerPtrToValuePtr<uint8>(frame));
 			if (prop->PropertyFlags & CPF_ReturnParm)
 				continue;
@@ -107,7 +108,7 @@ void UPythonFunction::CallPythonCallable(FFrame& Stack, RESULT_DECL)
 	}
 
 	// get return value (if required)
-	UProperty *return_property = function->GetReturnProperty();
+	FProperty *return_property = function->GetReturnProperty();
 	if (return_property && function->ReturnValueOffset != MAX_uint16) {
 #if defined(UEPY_MEMORY_DEBUG)
 		UE_LOG(LogPython, Warning, TEXT("FOUND RETURN VALUE"));

Source/UnrealEnginePython/Private/UEPyAssetUserData.cpp

@@ -8,7 +8,7 @@ PyObject *py_ue_asset_import_data(ue_PyUObject * self, PyObject * args)
 	ue_py_check(self);
 
 	UStruct *u_struct = (UStruct *)self->ue_object->GetClass();
-	UClassProperty *u_property = (UClassProperty *)u_struct->FindPropertyByName(TEXT("AssetImportData"));
+	FClassProperty *u_property = (FClassProperty *)u_struct->FindPropertyByName(TEXT("AssetImportData"));
 	if (!u_property)
 	{
 		return PyErr_Format(PyExc_Exception, "UObject does not have asset import data.");
@@ -47,7 +47,7 @@ PyObject *py_ue_asset_import_data_set_sources(ue_PyUObject * self, PyObject * ar
 	TArray<FString> filenames;
 
 	UStruct *u_struct = (UStruct *)self->ue_object->GetClass();
-	UClassProperty *u_property = (UClassProperty *)u_struct->FindPropertyByName(TEXT("AssetImportData"));
+	FClassProperty *u_property = (FClassProperty *)u_struct->FindPropertyByName(TEXT("AssetImportData"));
 	if (!u_property)
 	{
 		return PyErr_Format(PyExc_Exception, "UObject does not have asset import data.");