refactoring

Author: JanPlath

src/PythonQtConversion.cpp

@@ -592,21 +592,21 @@ void* PythonQtConv::ConvertPythonToQt(const PythonQtMethodInfo::ParameterInfo& i
     {
       QByteArray bytes = PyObjGetBytesAllowString(obj, strict, ok);
       if (ok) {
-        ptr = ConversionUtils::getPtrAndUpdateCppObject<QByteArray>(alreadyAllocatedCPPObject, frame, bytes);
+        ptr = frame->establishPersistentPtr<QByteArray>(alreadyAllocatedCPPObject, bytes);
       }
     } break;
     case QMetaType::QString:
     {
       QString str = PyObjGetString(obj, strict, ok);
       if (ok) {
-        ptr = ConversionUtils::getPtrAndUpdateCppObject<QString>(alreadyAllocatedCPPObject, frame, str);
+        ptr = frame->establishPersistentPtr<QString>(alreadyAllocatedCPPObject, str);
       }
     } break;
     case QMetaType::QStringList:
     {
       QStringList l = PyObjToStringList(obj, strict, ok);
       if (ok) {
-        ptr = ConversionUtils::getPtrAndUpdateCppObject<QStringList>(alreadyAllocatedCPPObject, frame, l);
+        ptr = frame->establishPersistentPtr<QStringList>(alreadyAllocatedCPPObject, l);
       }
     } break;
 
@@ -660,26 +660,23 @@ void* PythonQtConv::ConvertPythonToQt(const PythonQtMethodInfo::ParameterInfo& i
         // Handle QStringView, which needs a reference to a persistent QString
         QString str = PyObjGetString(obj, strict, ok);
         if (ok) {
-          return ConversionUtils::getPtrAndUpdateCppViewObject<QString, QStringView>(alreadyAllocatedCPPObject, frame,
-            str);
+          return frame->establishPersistentViewPtr<QString, QStringView>(alreadyAllocatedCPPObject, str);
         } else {
           return nullptr;
         }
       } else if (info.typeId == anyStringViewTypeId) {
         // Handle QAnyStringView, which needs a reference to a persistent QString
         QString str = PyObjGetString(obj, strict, ok);
         if (ok) {
-          return ConversionUtils::getPtrAndUpdateCppViewObject<QString, QAnyStringView>(alreadyAllocatedCPPObject,
-            frame, str);
+          return frame->establishPersistentViewPtr<QString, QAnyStringView>(alreadyAllocatedCPPObject, str);
         } else {
           return nullptr;
         }
       } else if (info.typeId == byteArrayViewTypeId) {
         // Handle QByteArrayView, which needs a reference to a persistent QByteArray
         QByteArray ba = PyObjGetBytesAllowString(obj, strict, ok);
         if (ok) {
-          return ConversionUtils::getPtrAndUpdateCppViewObject<QByteArray, QByteArrayView>(alreadyAllocatedCPPObject,
-            frame, ba);
+          return frame->establishPersistentViewPtr<QByteArray, QByteArrayView>(alreadyAllocatedCPPObject, ba);
         } else {
           return nullptr;
         }

src/PythonQtMisc.cpp

@@ -115,3 +115,32 @@ quint64* PythonQtArgumentFrame::nextPODPtr()
   _podArgs.push_back(0);
   return &_podArgs[_podArgs.size() - 1];
 }
+
+template<typename Class>
+void* PythonQtArgumentFrame::establishPersistentPtr(void* alreadyAllocatedPtr, const Class& value)
+{
+  if (alreadyAllocatedPtr) {
+    *reinterpret_cast<Class*>(alreadyAllocatedPtr) = value;
+    return alreadyAllocatedPtr;
+  } else {
+    QVariant* item = nextVariantPtr();
+    *item = QVariant(value);
+    return const_cast<void*>(item->constData());
+  }
+}
+
+template<typename Class, typename ViewClass>
+void* PythonQtArgumentFrame::establishPersistentViewPtr(void* alreadyAllocatedPtr, const Class& value)
+{
+  QVariant* itemStore = nextVariantPtr();
+  *itemStore = QVariant(value);
+  if (alreadyAllocatedPtr) {
+    *reinterpret_cast<ViewClass*>(alreadyAllocatedPtr) =
+      ViewClass(*reinterpret_cast<const Class*>(itemStore->constData()));
+    return alreadyAllocatedPtr;
+  } else {
+    QVariant* item = nextVariantPtr();
+    *item = QVariant::fromValue(ViewClass(*reinterpret_cast<const Class*>(itemStore->constData())));
+    return const_cast<void*>(item->constData());
+  }
+}

src/PythonQtMisc.h

@@ -121,6 +121,12 @@ class PythonQtArgumentFrame
   //! Get next pointer to a POD.
   quint64* nextPODPtr();
 
+  template<typename Class>
+  void* establishPersistentPtr(void* alreadyAllocatedPtr, const Class& value);
+  
+  template<typename Class, typename ViewClass>
+  void* establishPersistentViewPtr(void* alreadyAllocatedPtr, const Class& value);
+
 private:
   PythonQtArgumentFrame();
   ~PythonQtArgumentFrame();
@@ -133,35 +139,4 @@ class PythonQtArgumentFrame
   static PythonQtArgumentFrame* _freeListHead;
 };
 
-namespace ConversionUtils {
-template<typename Class>
-void* getPtrAndUpdateCppObject(void* alreadyAllocatedPtr, PythonQtArgumentFrame* store, const Class& value)
-{
-  if (alreadyAllocatedPtr) {
-    *reinterpret_cast<Class*>(alreadyAllocatedPtr) = value;
-    return alreadyAllocatedPtr;
-  } else {
-    QVariant* item = store->nextVariantPtr();
-    *item = QVariant(value);
-    return const_cast<void*>(item->constData());
-  }
-}
-
-template<typename Class, typename ViewClass>
-void* getPtrAndUpdateCppViewObject(void* alreadyAllocatedPtr, PythonQtArgumentFrame* store, const Class& value)
-{
-  QVariant* itemStore = store->nextVariantPtr();
-  *itemStore = QVariant(value);
-  if (alreadyAllocatedPtr) {
-    *reinterpret_cast<ViewClass*>(alreadyAllocatedPtr) =
-      ViewClass(*reinterpret_cast<const Class*>(itemStore->constData()));
-    return alreadyAllocatedPtr;
-  } else {
-    QVariant* item = store->nextVariantPtr();
-    *item = QVariant::fromValue(ViewClass(*reinterpret_cast<const Class*>(itemStore->constData())));
-    return const_cast<void*>(item->constData());
-  }
-}
-}
-
 #endif