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/Iterator/BPy_AdjacencyIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
index b3bdcabcfb0..9f5f8d07e26 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
@@ -186,9 +186,11 @@ PyTypeObject AdjacencyIterator_Type = {
     sizeof(BPy_AdjacencyIterator),                         /* 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/Iterator/BPy_ChainPredicateIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
index ef6d2fd8944..e4cd1cd073b 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
@@ -167,9 +167,11 @@ PyTypeObject ChainPredicateIterator_Type = {
     sizeof(BPy_ChainPredicateIterator),                         /* tp_basicsize */
     0,                                                          /* tp_itemsize */
     (destructor)ChainPredicateIterator_dealloc,                 /* 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/Iterator/BPy_ChainSilhouetteIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
index 6f442eb0c10..9aa8984f4af 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
@@ -121,9 +121,11 @@ PyTypeObject ChainSilhouetteIterator_Type = {
     sizeof(BPy_ChainSilhouetteIterator),                         /* 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/Iterator/BPy_ChainingIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
index f2a485964a0..f2441fa9d18 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
@@ -255,9 +255,11 @@ PyTypeObject ChainingIterator_Type = {
     sizeof(BPy_ChainingIterator),                         /* 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/Iterator/BPy_CurvePointIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
index e50d60002a9..ff710e931d4 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
@@ -135,9 +135,11 @@ PyTypeObject CurvePointIterator_Type = {
     sizeof(BPy_CurvePointIterator),                         /* 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/Iterator/BPy_Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
index 557436935d0..d0de53fa424 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
@@ -210,9 +210,11 @@ PyTypeObject Interface0DIterator_Type = {
     sizeof(BPy_Interface0DIterator),                         /* 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/Iterator/BPy_SVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
index 95def64989c..c0db79858b7 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
@@ -162,9 +162,11 @@ PyTypeObject SVertexIterator_Type = {
     sizeof(BPy_SVertexIterator),                         /* 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/Iterator/BPy_StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
index 8549e81a9b8..ceb0d2a7546 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
@@ -293,9 +293,11 @@ PyTypeObject StrokeVertexIterator_Type = {
     sizeof(BPy_StrokeVertexIterator),                         /* 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/Iterator/BPy_ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
index b515d3b9564..e01bbe928ce 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
@@ -240,9 +240,11 @@ PyTypeObject ViewEdgeIterator_Type = {
     sizeof(BPy_ViewEdgeIterator),                         /* 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/Iterator/BPy_orientedViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
index 3cc73820177..735746e33be 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
@@ -144,9 +144,11 @@ PyTypeObject orientedViewEdgeIterator_Type = {
     sizeof(BPy_orientedViewEdgeIterator),                         /* 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 */