Cleanup: use preprocessor version check for PyTypeObject declaration

While `tp_print` was deprecated, Python 3.8+ uses this for
'tp_vectorcall_offset' which wasn't stated in the comment from
efd71aad4f22ec0073d80b8dd296015d3f395aa8.

Instead of suppressing clang-tidy, use preprocessor a check since
this properly represents the difference between Python versions.

10 files changed, 50 insertions, 30 deletions

diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
index 658c12ecae5..b3f9c225931 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
@@ -59,9 +59,11 @@ PyTypeObject ContourUP1D_Type = {
     sizeof(BPy_ContourUP1D),                         /* tp_basicsize */
     0,                                               /* tp_itemsize */
     nullptr,                                         /* tp_dealloc */
-    /* Incompatible with Python3.8+ (deprecated function).
-     * NOLINTNEXTLINE: modernize-use-nullptr. */
-    0,                                        /* tp_print */
+#if PY_VERSION_HEX >= 0x03080000
+    0, /* tp_vectorcall_offset */
+#else
+    nullptr, /* tp_print */
+#endif
     nullptr,                                  /* tp_getattr */
     nullptr,                                  /* tp_setattr */
     nullptr,                                  /* tp_reserved */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
index 3683159a183..f865fe5013d 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
@@ -75,9 +75,11 @@ PyTypeObject DensityLowerThanUP1D_Type = {
     sizeof(BPy_DensityLowerThanUP1D),                         /* tp_basicsize */
     0,                                                        /* tp_itemsize */
     nullptr,                                                  /* tp_dealloc */
-    /* Incompatible with Python3.8+ (deprecated function).
-     * NOLINTNEXTLINE: modernize-use-nullptr. */
-    0,                                        /* tp_print */
+#if PY_VERSION_HEX >= 0x03080000
+    0, /* tp_vectorcall_offset */
+#else
+    nullptr, /* tp_print */
+#endif
     nullptr,                                  /* tp_getattr */
     nullptr,                                  /* tp_setattr */
     nullptr,                                  /* tp_reserved */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
index a9f3812382b..154b44ff81a 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
@@ -70,9 +70,11 @@ PyTypeObject EqualToChainingTimeStampUP1D_Type = {
     sizeof(BPy_EqualToChainingTimeStampUP1D),                         /* tp_basicsize */
     0,                                                                /* tp_itemsize */
     nullptr,                                                          /* tp_dealloc */
-    /* Incompatible with Python3.8+ (deprecated function).
-     * NOLINTNEXTLINE: modernize-use-nullptr. */
-    0,                                               /* tp_print */
+#if PY_VERSION_HEX >= 0x03080000
+    0, /* tp_vectorcall_offset */
+#else
+    nullptr, /* tp_print */
+#endif
     nullptr,                                         /* tp_getattr */
     nullptr,                                         /* tp_setattr */
     nullptr,                                         /* tp_reserved */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
index 9e2bde8f6c7..2bb9dbaf484 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
@@ -69,9 +69,11 @@ PyTypeObject EqualToTimeStampUP1D_Type = {
     sizeof(BPy_EqualToTimeStampUP1D),                         /* tp_basicsize */
     0,                                                        /* tp_itemsize */
     nullptr,                                                  /* tp_dealloc */
-    /* Incompatible with Python3.8+ (deprecated function).
-     * NOLINTNEXTLINE: modernize-use-nullptr. */
-    0,                                        /* tp_print */
+#if PY_VERSION_HEX >= 0x03080000
+    0, /* tp_vectorcall_offset */
+#else
+    nullptr, /* tp_print */
+#endif
     nullptr,                                  /* tp_getattr */
     nullptr,                                  /* tp_setattr */
     nullptr,                                  /* tp_reserved */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
index ba9a9af429f..7b9923d7b6c 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
@@ -63,9 +63,11 @@ PyTypeObject ExternalContourUP1D_Type = {
     sizeof(BPy_ExternalContourUP1D),                         /* tp_basicsize */
     0,                                                       /* tp_itemsize */
     nullptr,                                                 /* tp_dealloc */
-    /* Incompatible with Python3.8+ (deprecated function).
-     * NOLINTNEXTLINE: modernize-use-nullptr. */
-    0,                                        /* tp_print */
+#if PY_VERSION_HEX >= 0x03080000
+    0, /* tp_vectorcall_offset */
+#else
+    nullptr, /* tp_print */
+#endif
     nullptr,                                  /* tp_getattr */
     nullptr,                                  /* tp_setattr */
     nullptr,                                  /* tp_reserved */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
index c3c73b77c1c..ec1a02e13aa 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
@@ -58,9 +58,11 @@ PyTypeObject FalseUP1D_Type = {
     sizeof(BPy_FalseUP1D),                         /* tp_basicsize */
     0,                                             /* tp_itemsize */
     nullptr,                                       /* tp_dealloc */
-    /* Incompatible with Python3.8+ (deprecated function).
-     * NOLINTNEXTLINE: modernize-use-nullptr. */
-    0,                                        /* tp_print */
+#if PY_VERSION_HEX >= 0x03080000
+    0, /* tp_vectorcall_offset */
+#else
+    nullptr, /* tp_print */
+#endif
     nullptr,                                  /* tp_getattr */
     nullptr,                                  /* tp_setattr */
     nullptr,                                  /* tp_reserved */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
index c16edfff96b..b9a76f91c21 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
@@ -74,9 +74,11 @@ PyTypeObject QuantitativeInvisibilityUP1D_Type = {
     sizeof(BPy_QuantitativeInvisibilityUP1D),                         /* tp_basicsize */
     0,                                                                /* tp_itemsize */
     nullptr,                                                          /* tp_dealloc */
-    /* Incompatible with Python3.8+ (deprecated function).
-     * NOLINTNEXTLINE: modernize-use-nullptr. */
-    0,                                               /* tp_print */
+#if PY_VERSION_HEX >= 0x03080000
+    0, /* tp_vectorcall_offset */
+#else
+    nullptr, /* tp_print */
+#endif
     nullptr,                                         /* tp_getattr */
     nullptr,                                         /* tp_setattr */
     nullptr,                                         /* tp_reserved */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
index 54075f4b444..68f0ea7a913 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
@@ -70,9 +70,11 @@ PyTypeObject ShapeUP1D_Type = {
     sizeof(BPy_ShapeUP1D),                         /* tp_basicsize */
     0,                                             /* tp_itemsize */
     nullptr,                                       /* tp_dealloc */
-    /* Incompatible with Python3.8+ (deprecated function).
-     * NOLINTNEXTLINE: modernize-use-nullptr. */
-    0,                                        /* tp_print */
+#if PY_VERSION_HEX >= 0x03080000
+    0, /* tp_vectorcall_offset */
+#else
+    nullptr, /* tp_print */
+#endif
     nullptr,                                  /* tp_getattr */
     nullptr,                                  /* tp_setattr */
     nullptr,                                  /* tp_reserved */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
index b1b97b10282..362bcc4cea8 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
@@ -58,9 +58,11 @@ PyTypeObject TrueUP1D_Type = {
     sizeof(BPy_TrueUP1D),                         /* tp_basicsize */
     0,                                            /* tp_itemsize */
     nullptr,                                      /* tp_dealloc */
-    /* Incompatible with Python3.8+ (deprecated function).
-     * NOLINTNEXTLINE: modernize-use-nullptr. */
-    0,                                        /* tp_print */
+#if PY_VERSION_HEX >= 0x03080000
+    0, /* tp_vectorcall_offset */
+#else
+    nullptr, /* tp_print */
+#endif
     nullptr,                                  /* tp_getattr */
     nullptr,                                  /* tp_setattr */
     nullptr,                                  /* tp_reserved */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.cpp
index cbeb728de07..9329e3a7628 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.cpp
@@ -71,9 +71,11 @@ PyTypeObject WithinImageBoundaryUP1D_Type = {
     sizeof(BPy_WithinImageBoundaryUP1D),                         /* tp_basicsize */
     0,                                                           /* tp_itemsize */
     nullptr,                                                     /* tp_dealloc */
-    /* Incompatible with Python3.8+ (deprecated function).
-     * NOLINTNEXTLINE: modernize-use-nullptr. */
-    0,                                          /* tp_print */
+#if PY_VERSION_HEX >= 0x03080000
+    0, /* tp_vectorcall_offset */
+#else
+    nullptr, /* tp_print */
+#endif
     nullptr,                                    /* tp_getattr */
     nullptr,                                    /* tp_setattr */
     nullptr,                                    /* tp_reserved */