Creates QFlags types at runtime.

2 files changed, 42 insertions, 2 deletions

diff --git a/libpyside/pysideqflags.cpp b/libpyside/pysideqflags.cpp
index 2794520f6..f7ab7d630 100644
--- a/libpyside/pysideqflags.cpp
+++ b/libpyside/pysideqflags.cpp
@@ -21,8 +21,20 @@
 */
 
 #include "pysideqflags.h"
+#include <sbkenum.h>
 
 extern "C" {
+    struct SbkConverter;
+
+    /**
+     * Type of all QFlags
+     */
+    struct PySideQFlagsType
+    {
+        PyHeapTypeObject super;
+        SbkConverter* converter;
+    };
+
     #define PYSIDE_QFLAGS(X) reinterpret_cast<PySideQFlagsObject*>(X)
 
     PyObject* PySideQFlagsNew(PyTypeObject *type, PyObject *args, PyObject *kwds)
@@ -89,6 +101,24 @@ namespace PySide
 {
 namespace QFlags
 {
+    PyTypeObject* create(const char* name, PyNumberMethods* numberMethods)
+    {
+        PyTypeObject* type = reinterpret_cast<PyTypeObject*>(new PySideQFlagsType);
+        ::memset(type, 0, sizeof(PySideQFlagsType));
+        Py_TYPE(type) = &PyType_Type;
+        type->tp_basicsize = sizeof(PySideQFlagsObject);
+        type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_CHECKTYPES;
+        type->tp_name = name;
+        type->tp_new = &PySideQFlagsNew;
+        type->tp_as_number = numberMethods;
+        type->tp_richcompare = &PySideQFlagsRichCompare;
+
+        if (PyType_Ready(type) < 0)
+            return 0;
+
+        return type;
+    }
+
     PySideQFlagsObject* newObject(long value, PyTypeObject* type)
     {
         PySideQFlagsObject* qflags = PyObject_New(PySideQFlagsObject, type);
diff --git a/libpyside/pysideqflags.h b/libpyside/pysideqflags.h
index 6eb91d319..496e84b94 100644
--- a/libpyside/pysideqflags.h
+++ b/libpyside/pysideqflags.h
@@ -24,10 +24,10 @@
 #define PYSIDE_QFLAGS_H
 
 #include <sbkpython.h>
-#include <pysidemacros.h>
+#include "pysidemacros.h"
 
 
-extern "C" 
+extern "C"
 {
     struct PYSIDE_API PySideQFlagsObject {
         PyObject_HEAD
@@ -43,7 +43,17 @@ namespace PySide
 {
 namespace QFlags
 {
+    /**
+     * Creates a new QFlags type.
+     */
+    PYSIDE_API PyTypeObject* create(const char* name, PyNumberMethods* numberMethods);
+    /**
+     * Creates a new QFlags instance of type \p type and value \p value.
+     */
     PYSIDE_API PySideQFlagsObject* newObject(long value, PyTypeObject* type);
+    /**
+     * Returns the value held by a QFlag.
+     */
     PYSIDE_API long getValue(PySideQFlagsObject* self);
 }
 }