App: remove some more deprecated Py2 code

and remove deprecated void from function signature and replace 0 or NULL with nullptr
FreeCAD · Apr 26, 2021 · 44e82ac · 44e82ac
1 parent af16ab0
commit 44e82ac
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 293 deletions.
diff --git a/src/App/Expression.cpp b/src/App/Expression.cpp
@@ -527,9 +527,6 @@ Py::Object pyFromQuantity(const Quantity &quantity) {
     int i;
     switch(essentiallyInteger(v,l,i)) {
     case 1:
-#if PY_MAJOR_VERSION < 3
-        return Py::Int(i);
-#endif
     case 2:
         return Py::Long(l);
     default:

diff --git a/src/App/FeaturePythonPyImp.h b/src/App/FeaturePythonPyImp.h
@@ -65,7 +65,7 @@
     { \
     }
 
-#elif PY_MAJOR_VERSION >= 3
+#else
 #define PYTHON_TYPE_IMP(_class_, _subclass_) \
     PyTypeObject _class_::Type = { \
         PyVarObject_HEAD_INIT(&PyType_Type, 0) \
@@ -85,30 +85,6 @@
     _class_::~_class_() \
     { \
     }
-
-#else
-
-#define PYTHON_TYPE_IMP(_class_, _subclass_) \
-    PyTypeObject _class_::Type = { \
-        PyObject_HEAD_INIT(&PyType_Type) \
-        0, \
-        ""#_class_"",  \
-        sizeof(_class_),  \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_CLASS, \
-        ""#_class_"", \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, \
-        &_subclass_::Type, \
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 \
-    }; \
-    _class_::_class_(Base::BaseClass *pcObject, PyTypeObject *T) \
-        : _subclass_(reinterpret_cast<_subclass_::PointerType>(pcObject), T) \
-    { \
-    } \
-    _class_::~_class_() \
-    { \
-    }
-
 #endif
 
 namespace App