refactor

Author: JanPlath

src/PythonQtMisc.cpp

@@ -115,32 +115,3 @@ 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

@@ -122,10 +122,33 @@ class PythonQtArgumentFrame
   quint64* nextPODPtr();
 
   template<typename Class>
-  void* establishPersistentPtr(void* alreadyAllocatedPtr, const Class& value);
-  
+  void* 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* establishPersistentViewPtr(void* alreadyAllocatedPtr, const Class& value);
+  void* 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());
+    }
+  }
 
 private:
   PythonQtArgumentFrame();