Linux and OSX fixes

Roberto De Ioris · Roberto De Ioris · commit 74d9f2feb346 · 2018-02-17T19:07:56.000+01:00
diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySPythonMultiColumnTableRow.h b/Source/UnrealEnginePython/Private/Slate/UEPySPythonMultiColumnTableRow.h
@@ -19,10 +19,10 @@ class SPythonMultiColumnTableRow : public SMultiColumnTableRow<TSharedPtr<struct
     void Construct(const FArguments& InArgs, const TSharedRef<STableViewBase>& InOwnerTableView, PyObject *in_py_self)
     {
         SetPyObject(in_py_self);
-        SMultiColumnTableRow<TSharedPtr<struct FPythonItem> >::Construct(FSuperRowType::FArguments(), InOwnerTableView);
+        SMultiColumnTableRow<TSharedPtr<struct FPythonItem>>::Construct(FSuperRowType::FArguments(), InOwnerTableView);
     }
 
-    TSharedRef<SWidget> SPythonMultiColumnTableRow::GenerateWidgetForColumn(const FName& ColumnName)
+    TSharedRef<SWidget> GenerateWidgetForColumn(const FName& ColumnName)
     {
         FScopePythonGIL gil;
 
@@ -57,7 +57,7 @@ class SPythonMultiColumnTableRow : public SMultiColumnTableRow<TSharedPtr<struct
     }
 
 
-    FReply SPythonMultiColumnTableRow::OnMouseButtonDoubleClick(const FGeometry& InMyGeometry, const FPointerEvent& InMouseEvent)
+    FReply OnMouseButtonDoubleClick(const FGeometry& InMyGeometry, const FPointerEvent& InMouseEvent)
     {
         FScopePythonGIL gil;
 
@@ -108,4 +108,4 @@ typedef struct {
 
 void ue_python_init_spython_multicolumn_table_row(PyObject *);
 
-ue_PySPythonMultiColumnTableRow *py_ue_is_spython_multicolumn_table_row(PyObject *);
+ue_PySPythonMultiColumnTableRow *py_ue_is_spython_multicolumn_table_row(PyObject *);
diff --git a/Source/UnrealEnginePython/Private/UEPyEnumsImporter.cpp b/Source/UnrealEnginePython/Private/UEPyEnumsImporter.cpp
@@ -2,8 +2,8 @@
 
 static PyObject *ue_PyEnumsImporter_getattro(ue_PyEnumsImporter *self, PyObject *attr_name)
 {
-	PyObject *ret = PyObject_GenericGetAttr((PyObject *)self, attr_name);
-	if (!ret)
+	PyObject *py_attr = PyObject_GenericGetAttr((PyObject *)self, attr_name);
+	if (!py_attr)
 	{
 		if (PyUnicodeOrString_Check(attr_name))
 		{
@@ -20,7 +20,7 @@ static PyObject *ue_PyEnumsImporter_getattro(ue_PyEnumsImporter *self, PyObject
 			}
 		}
 	}
-	return ret;
+	return py_attr;
 }
 
 static PyTypeObject ue_PyEnumsImporterType = {
@@ -71,4 +71,4 @@ PyObject *py_ue_new_enumsimporter()
 {
 	ue_PyEnumsImporter *ret = (ue_PyEnumsImporter *)PyObject_New(ue_PyEnumsImporter, &ue_PyEnumsImporterType);
 	return (PyObject *)ret;
-}
+}
diff --git a/Source/UnrealEnginePython/Private/UEPyUClassesImporter.cpp b/Source/UnrealEnginePython/Private/UEPyUClassesImporter.cpp
@@ -2,8 +2,8 @@
 
 static PyObject *ue_PyUClassesImporter_getattro(ue_PyUClassesImporter *self, PyObject *attr_name)
 {
-	PyObject *ret = PyObject_GenericGetAttr((PyObject *)self, attr_name);
-	if (!ret)
+	PyObject *py_attr = PyObject_GenericGetAttr((PyObject *)self, attr_name);
+	if (!py_attr)
 	{
 		if (PyUnicodeOrString_Check(attr_name))
 		{
@@ -20,7 +20,7 @@ static PyObject *ue_PyUClassesImporter_getattro(ue_PyUClassesImporter *self, PyO
 			}
 		}
 	}
-	return ret;
+	return py_attr;
 }
 
 static PyTypeObject ue_PyUClassesImporterType = {
@@ -71,4 +71,4 @@ PyObject *py_ue_new_uclassesimporter()
 {
 	ue_PyUClassesImporter *ret = (ue_PyUClassesImporter *)PyObject_New(ue_PyUClassesImporter, &ue_PyUClassesImporterType);
 	return (PyObject *)ret;
-}
+}
diff --git a/Source/UnrealEnginePython/Private/UEPyUStructsImporter.cpp b/Source/UnrealEnginePython/Private/UEPyUStructsImporter.cpp
@@ -1,8 +1,8 @@
 #include "UnrealEnginePythonPrivatePCH.h"
 
 static PyObject *ue_PyUStructsImporter_getattro(ue_PyUStructsImporter *self, PyObject *attr_name) {
-	PyObject *ret = PyObject_GenericGetAttr((PyObject *)self, attr_name);
-	if (!ret) {
+	PyObject *py_attr = PyObject_GenericGetAttr((PyObject *)self, attr_name);
+	if (!py_attr) {
 		if (PyUnicodeOrString_Check(attr_name)) {
 			char *attr = PyUnicode_AsUTF8(attr_name);
 			if (attr[0] != '_') {
@@ -15,7 +15,7 @@ static PyObject *ue_PyUStructsImporter_getattro(ue_PyUStructsImporter *self, PyO
 			}
 		}
 	}
-	return ret;
+	return py_attr;
 }
 
 static PyTypeObject ue_PyUStructsImporterType = {
@@ -64,4 +64,4 @@ void ue_python_init_ustructsimporter(PyObject *ue_module) {
 PyObject *py_ue_new_ustructsimporter() {
 	ue_PyUStructsImporter *ret = (ue_PyUStructsImporter *)PyObject_New(ue_PyUStructsImporter, &ue_PyUStructsImporterType);
 	return (PyObject *)ret;
-}
+}
diff --git a/Source/UnrealEnginePython/Private/UObject/UEPyPhysics.cpp b/Source/UnrealEnginePython/Private/UObject/UEPyPhysics.cpp
@@ -457,11 +457,11 @@ PyObject *py_ue_destructible_apply_damage(ue_PyUObject * self, PyObject * args)
 #if ENGINE_MINOR_VERSION < 18
 				destructible = (UDestructibleComponent *)actor->GetComponentByClass(UDestructibleComponent::StaticClass());
 #else
-				for (UActorComponent *component : actor->GetComponents())
+				for (UActorComponent *checked_component : actor->GetComponents())
 				{
-					if (Cast<IDestructibleInterface>(component))
+					if (Cast<IDestructibleInterface>(checked_component))
 					{
-						destructible = (IDestructibleInterface *)component;
+						destructible = (IDestructibleInterface *)checked_component;
 						break;
 					}
 				}
@@ -500,4 +500,4 @@ PyObject *py_ue_destructible_apply_damage(ue_PyUObject * self, PyObject * args)
 	}
 
 	Py_RETURN_NONE;
-}
+}
diff --git a/Source/UnrealEnginePython/Private/Wrappers/UEPyESlateEnums.cpp b/Source/UnrealEnginePython/Private/Wrappers/UEPyESlateEnums.cpp
@@ -77,7 +77,7 @@ void ue_python_init_eslate_enums(PyObject *ue_module)
     };
 
 #if ENGINE_MINOR_VERSION > 15
-#define ADD_NATIVE_ENUM(EnumType, EnumVal) add_native_enum(#EnumType "." #EnumVal, (uint8)##EnumType::Type::##EnumVal)
+#define ADD_NATIVE_ENUM(EnumType, EnumVal) add_native_enum(#EnumType "." #EnumVal, (uint8)EnumType::Type::EnumVal)
     ADD_NATIVE_ENUM(EUserInterfaceActionType, None           );
     ADD_NATIVE_ENUM(EUserInterfaceActionType, Button         );
     ADD_NATIVE_ENUM(EUserInterfaceActionType, ToggleButton   );

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@ class SPythonMultiColumnTableRow : public SMultiColumnTableRow<TSharedPtr<struct`
`19`	`19`	`void Construct(const FArguments& InArgs, const TSharedRef<STableViewBase>& InOwnerTableView, PyObject *in_py_self)`
`20`	`20`	`{`
`21`	`21`	`SetPyObject(in_py_self);`
`22`		`- SMultiColumnTableRow<TSharedPtr<struct FPythonItem> >::Construct(FSuperRowType::FArguments(), InOwnerTableView);`
	`22`	`+ SMultiColumnTableRow<TSharedPtr<struct FPythonItem>>::Construct(FSuperRowType::FArguments(), InOwnerTableView);`
`23`	`23`	`}`
`24`	`24`
`25`		`- TSharedRef<SWidget> SPythonMultiColumnTableRow::GenerateWidgetForColumn(const FName& ColumnName)`
	`25`	`+ TSharedRef<SWidget> GenerateWidgetForColumn(const FName& ColumnName)`
`26`	`26`	`{`
`27`	`27`	`FScopePythonGIL gil;`
`28`	`28`
`@@ -57,7 +57,7 @@ class SPythonMultiColumnTableRow : public SMultiColumnTableRow<TSharedPtr<struct`
`57`	`57`	`}`
`58`	`58`
`59`	`59`
`60`		`- FReply SPythonMultiColumnTableRow::OnMouseButtonDoubleClick(const FGeometry& InMyGeometry, const FPointerEvent& InMouseEvent)`
	`60`	`+ FReply OnMouseButtonDoubleClick(const FGeometry& InMyGeometry, const FPointerEvent& InMouseEvent)`
`61`	`61`	`{`
`62`	`62`	`FScopePythonGIL gil;`
`63`	`63`
`@@ -108,4 +108,4 @@ typedef struct {`
`108`	`108`
`109`	`109`	`void ue_python_init_spython_multicolumn_table_row(PyObject *);`
`110`	`110`
`111`		`-ue_PySPythonMultiColumnTableRow py_ue_is_spython_multicolumn_table_row(PyObject );`
	`111`	`+ue_PySPythonMultiColumnTableRow py_ue_is_spython_multicolumn_table_row(PyObject );`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`static PyObject ue_PyEnumsImporter_getattro(ue_PyEnumsImporter self, PyObject *attr_name)`
`4`	`4`	`{`
`5`		`- PyObject ret = PyObject_GenericGetAttr((PyObject )self, attr_name);`
`6`		`- if (!ret)`
	`5`	`+ PyObject py_attr = PyObject_GenericGetAttr((PyObject )self, attr_name);`
	`6`	`+ if (!py_attr)`
`7`	`7`	`{`
`8`	`8`	`if (PyUnicodeOrString_Check(attr_name))`
`9`	`9`	`{`
`@@ -20,7 +20,7 @@ static PyObject ue_PyEnumsImporter_getattro(ue_PyEnumsImporter self, PyObject`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`
`23`		`- return ret;`
	`23`	`+ return py_attr;`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`static PyTypeObject ue_PyEnumsImporterType = {`
`@@ -71,4 +71,4 @@ PyObject *py_ue_new_enumsimporter()`
`71`	`71`	`{`
`72`	`72`	`ue_PyEnumsImporter ret = (ue_PyEnumsImporter )PyObject_New(ue_PyEnumsImporter, &ue_PyEnumsImporterType);`
`73`	`73`	`return (PyObject *)ret;`
`74`		`-}`
	`74`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`static PyObject ue_PyUClassesImporter_getattro(ue_PyUClassesImporter self, PyObject *attr_name)`
`4`	`4`	`{`
`5`		`- PyObject ret = PyObject_GenericGetAttr((PyObject )self, attr_name);`
`6`		`- if (!ret)`
	`5`	`+ PyObject py_attr = PyObject_GenericGetAttr((PyObject )self, attr_name);`
	`6`	`+ if (!py_attr)`
`7`	`7`	`{`
`8`	`8`	`if (PyUnicodeOrString_Check(attr_name))`
`9`	`9`	`{`
`@@ -20,7 +20,7 @@ static PyObject ue_PyUClassesImporter_getattro(ue_PyUClassesImporter self, PyO`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`
`23`		`- return ret;`
	`23`	`+ return py_attr;`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`static PyTypeObject ue_PyUClassesImporterType = {`
`@@ -71,4 +71,4 @@ PyObject *py_ue_new_uclassesimporter()`
`71`	`71`	`{`
`72`	`72`	`ue_PyUClassesImporter ret = (ue_PyUClassesImporter )PyObject_New(ue_PyUClassesImporter, &ue_PyUClassesImporterType);`
`73`	`73`	`return (PyObject *)ret;`
`74`		`-}`
	`74`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`#include "UnrealEnginePythonPrivatePCH.h"`
`2`	`2`
`3`	`3`	`static PyObject ue_PyUStructsImporter_getattro(ue_PyUStructsImporter self, PyObject *attr_name) {`
`4`		`- PyObject ret = PyObject_GenericGetAttr((PyObject )self, attr_name);`
`5`		`- if (!ret) {`
	`4`	`+ PyObject py_attr = PyObject_GenericGetAttr((PyObject )self, attr_name);`
	`5`	`+ if (!py_attr) {`
`6`	`6`	`if (PyUnicodeOrString_Check(attr_name)) {`
`7`	`7`	`char *attr = PyUnicode_AsUTF8(attr_name);`
`8`	`8`	`if (attr[0] != '_') {`
`@@ -15,7 +15,7 @@ static PyObject ue_PyUStructsImporter_getattro(ue_PyUStructsImporter self, PyO`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`}`
`18`		`- return ret;`
	`18`	`+ return py_attr;`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`static PyTypeObject ue_PyUStructsImporterType = {`
`@@ -64,4 +64,4 @@ void ue_python_init_ustructsimporter(PyObject *ue_module) {`
`64`	`64`	`PyObject *py_ue_new_ustructsimporter() {`
`65`	`65`	`ue_PyUStructsImporter ret = (ue_PyUStructsImporter )PyObject_New(ue_PyUStructsImporter, &ue_PyUStructsImporterType);`
`66`	`66`	`return (PyObject *)ret;`
`67`		`-}`
	`67`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -457,11 +457,11 @@ PyObject py_ue_destructible_apply_damage(ue_PyUObject self, PyObject * args)`
`457`	`457`	`#if ENGINE_MINOR_VERSION < 18`
`458`	`458`	`destructible = (UDestructibleComponent *)actor->GetComponentByClass(UDestructibleComponent::StaticClass());`
`459`	`459`	`#else`
`460`		`- for (UActorComponent *component : actor->GetComponents())`
	`460`	`+ for (UActorComponent *checked_component : actor->GetComponents())`
`461`	`461`	`{`
`462`		`- if (Cast<IDestructibleInterface>(component))`
	`462`	`+ if (Cast<IDestructibleInterface>(checked_component))`
`463`	`463`	`{`
`464`		`- destructible = (IDestructibleInterface *)component;`
	`464`	`+ destructible = (IDestructibleInterface *)checked_component;`
`465`	`465`	`break;`
`466`	`466`	`}`
`467`	`467`	`}`
`@@ -500,4 +500,4 @@ PyObject py_ue_destructible_apply_damage(ue_PyUObject self, PyObject * args)`
`500`	`500`	`}`
`501`	`501`
`502`	`502`	`Py_RETURN_NONE;`
`503`		`-}`
	`503`	`+}`