first round of 4.23 patches

Author: rdeioris

Source/UnrealEnginePython/Private/Slate/UEPyFMenuBuilder.cpp

@@ -2,10 +2,10 @@
 
 #include "Wrappers/UEPyESlateEnums.h"
 
-static PyObject *py_ue_fmenu_builder_begin_section(ue_PyFMenuBuilder *self, PyObject * args)
+static PyObject* py_ue_fmenu_builder_begin_section(ue_PyFMenuBuilder* self, PyObject* args)
 {
-	char *name;
-	char *text;
+	char* name;
+	char* text;
 	if (!PyArg_ParseTuple(args, "ss:begin_section", &name, &text))
 		return nullptr;
 
@@ -14,27 +14,31 @@ static PyObject *py_ue_fmenu_builder_begin_section(ue_PyFMenuBuilder *self, PyOb
 	Py_RETURN_NONE;
 }
 
-static PyObject *py_ue_fmenu_builder_end_section(ue_PyFMenuBuilder *self, PyObject * args)
+static PyObject* py_ue_fmenu_builder_end_section(ue_PyFMenuBuilder* self, PyObject* args)
 {
 	self->menu_builder.EndSection();
 
 	Py_RETURN_NONE;
 }
 
-static PyObject *py_ue_fmenu_builder_make_widget(ue_PyFMenuBuilder *self, PyObject * args)
+static PyObject* py_ue_fmenu_builder_make_widget(ue_PyFMenuBuilder* self, PyObject* args)
 {
-	ue_PySWidget *ret = (ue_PySWidget *)PyObject_New(ue_PySWidget, &ue_PySWidgetType);
+	ue_PySWidget* ret = (ue_PySWidget*)PyObject_New(ue_PySWidget, &ue_PySWidgetType);
 	new (&ret->Widget) TSharedRef<SWidget>(self->menu_builder.MakeWidget());
-	return (PyObject *)ret;
+	return (PyObject*)ret;
 }
 
-static PyObject *py_ue_fmenu_builder_add_menu_entry(ue_PyFMenuBuilder *self, PyObject * args)
+static PyObject* py_ue_fmenu_builder_add_menu_entry(ue_PyFMenuBuilder* self, PyObject* args)
 {
-	char *label;
-	char *tooltip;
-	PyObject *py_callable;
-	PyObject *py_obj = nullptr;
+	char* label;
+	char* tooltip;
+	PyObject* py_callable;
+	PyObject* py_obj = nullptr;
+#if ENGINE_MINOR_VERSION >= 23
+	int ui_action_type = (int)EUserInterfaceActionType::Button;
+#else
 	int ui_action_type = EUserInterfaceActionType::Button;
+#endif
 	if (!PyArg_ParseTuple(args, "ssO|Oi:add_menu_entry", &label, &tooltip, &py_callable, &py_obj, &ui_action_type))
 		return nullptr;
 
@@ -58,17 +62,21 @@ static PyObject *py_ue_fmenu_builder_add_menu_entry(ue_PyFMenuBuilder *self, PyO
 	}
 
 	self->menu_builder.AddMenuEntry(FText::FromString(UTF8_TO_TCHAR(label)), FText::FromString(UTF8_TO_TCHAR(tooltip)), FSlateIcon(), FUIAction(handler), NAME_None,
+#if ENGINE_MINOR_VERSION >= 23
+		(EUserInterfaceActionType)ui_action_type);
+#else
 		(EUserInterfaceActionType::Type)ui_action_type);
+#endif
 
 	Py_RETURN_NONE;
 }
 
-static PyObject *py_ue_fmenu_builder_add_sub_menu(ue_PyFMenuBuilder *self, PyObject * args)
+static PyObject* py_ue_fmenu_builder_add_sub_menu(ue_PyFMenuBuilder* self, PyObject* args)
 {
-	char *label;
-	char *tooltip;
-	PyObject *py_callable;
-	PyObject *py_bool = nullptr;
+	char* label;
+	char* tooltip;
+	PyObject* py_callable;
+	PyObject* py_bool = nullptr;
 	if (!PyArg_ParseTuple(args, "ssO|O:add_sub_menu", &label, &tooltip, &py_callable, &py_bool))
 		return nullptr;
 
@@ -77,7 +85,7 @@ static PyObject *py_ue_fmenu_builder_add_sub_menu(ue_PyFMenuBuilder *self, PyObj
 		return PyErr_Format(PyExc_Exception, "argument is not callable");
 	}
 
-	
+
 	TSharedRef<FPythonSlateDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewStaticSlateDelegate(py_callable);
 
 	FNewMenuDelegate menu_delegate;
@@ -89,9 +97,9 @@ static PyObject *py_ue_fmenu_builder_add_sub_menu(ue_PyFMenuBuilder *self, PyObj
 	Py_RETURN_NONE;
 }
 
-static PyObject *py_ue_fmenu_builder_add_menu_separator(ue_PyFMenuBuilder *self, PyObject * args)
+static PyObject* py_ue_fmenu_builder_add_menu_separator(ue_PyFMenuBuilder* self, PyObject* args)
 {
-	char *name = nullptr;
+	char* name = nullptr;
 
 	if (!PyArg_ParseTuple(args, "|s:add_menu_separator", &name))
 		return nullptr;
@@ -107,9 +115,9 @@ static PyObject *py_ue_fmenu_builder_add_menu_separator(ue_PyFMenuBuilder *self,
 }
 
 #if WITH_EDITOR
-static PyObject *py_ue_fmenu_builder_add_asset_actions(ue_PyFMenuBuilder *self, PyObject * args)
+static PyObject* py_ue_fmenu_builder_add_asset_actions(ue_PyFMenuBuilder* self, PyObject* args)
 {
-	PyObject *py_assets;
+	PyObject* py_assets;
 
 	if (!PyArg_ParseTuple(args, "O:add_asset_actions", &py_assets))
 		return nullptr;
@@ -120,10 +128,10 @@ static PyObject *py_ue_fmenu_builder_add_asset_actions(ue_PyFMenuBuilder *self,
 		return PyErr_Format(PyExc_Exception, "argument is not iterable");
 	}
 
-	TArray<UObject *> u_objects;
-	while (PyObject *item = PyIter_Next(py_assets))
+	TArray<UObject*> u_objects;
+	while (PyObject * item = PyIter_Next(py_assets))
 	{
-		UObject *u_object = ue_py_check_type<UObject>(item);
+		UObject* u_object = ue_py_check_type<UObject>(item);
 		if (u_object)
 		{
 			u_objects.Add(u_object);
@@ -142,7 +150,7 @@ static PyObject *py_ue_fmenu_builder_add_asset_actions(ue_PyFMenuBuilder *self,
 }
 #endif
 
-static PyObject *py_ue_fmenu_builder_add_search_widget(ue_PyFMenuBuilder *self, PyObject * args)
+static PyObject* py_ue_fmenu_builder_add_search_widget(ue_PyFMenuBuilder* self, PyObject* args)
 {
 	self->menu_builder.AddSearchWidget();
 
@@ -164,13 +172,13 @@ static PyMethodDef ue_PyFMenuBuilder_methods[] = {
 };
 
 
-static PyObject *ue_PyFMenuBuilder_str(ue_PyFMenuBuilder *self)
+static PyObject* ue_PyFMenuBuilder_str(ue_PyFMenuBuilder* self)
 {
 	return PyUnicode_FromFormat("<unreal_engine.FMenuBuilder '%p'}>",
 		&self->menu_builder);
 }
 
-static void ue_py_fmenu_builder_dealloc(ue_PyFMenuBuilder *self)
+static void ue_py_fmenu_builder_dealloc(ue_PyFMenuBuilder* self)
 {
 #if PY_MAJOR_VERSION < 3
 	self->ob_type->tp_free((PyObject*)self);
@@ -210,14 +218,14 @@ static PyTypeObject ue_PyFMenuBuilderType = {
 	ue_PyFMenuBuilder_methods,             /* tp_methods */
 };
 
-static int ue_py_fmenu_builder_init(ue_PyFMenuBuilder *self, PyObject *args, PyObject *kwargs)
+static int ue_py_fmenu_builder_init(ue_PyFMenuBuilder* self, PyObject* args, PyObject* kwargs)
 {
 	new(&self->menu_builder) FMenuBuilder(true, nullptr);
 	return 0;
 }
 
 
-void ue_python_init_fmenu_builder(PyObject *ue_module)
+void ue_python_init_fmenu_builder(PyObject* ue_module)
 {
 	ue_PyFMenuBuilderType.tp_new = PyType_GenericNew;
 
@@ -227,12 +235,12 @@ void ue_python_init_fmenu_builder(PyObject *ue_module)
 		return;
 
 	Py_INCREF(&ue_PyFMenuBuilderType);
-	PyModule_AddObject(ue_module, "FMenuBuilder", (PyObject *)&ue_PyFMenuBuilderType);
+	PyModule_AddObject(ue_module, "FMenuBuilder", (PyObject*)& ue_PyFMenuBuilderType);
 }
 
-PyObject *py_ue_new_fmenu_builder(FMenuBuilder menu_builder)
+PyObject* py_ue_new_fmenu_builder(FMenuBuilder menu_builder)
 {
-	ue_PyFMenuBuilder *ret = (ue_PyFMenuBuilder *)PyObject_New(ue_PyFMenuBuilder, &ue_PyFMenuBuilderType);
+	ue_PyFMenuBuilder* ret = (ue_PyFMenuBuilder*)PyObject_New(ue_PyFMenuBuilder, &ue_PyFMenuBuilderType);
 	new(&ret->menu_builder) FMenuBuilder(menu_builder);
-	return (PyObject *)ret;
+	return (PyObject*)ret;
 }