From 01b43dc3d93e632c3c42fb8e1105f200b9cee2ae Mon Sep 17 00:00:00 2001
From: Christian Tismer <tismer@stackless.com>
Date: Tue, 13 Aug 2019 11:15:52 +0200
Subject: Add QtCore.Slot.__signature__ and much more manually

The signature of QtCore.Slot and other classes could not automatically
be generated because the function is not generated by cppgenerator.cpp .
We add it manually in the C++ code into the generation process.

The case of QtCore.Slot had diverse follow-up issues to be solved:

- Classes which did not inherit from Shiboken were not generated.
  This is a long-standing omission and creates very many new
  simple types.

- The arity of Slot has default arguments after the varargs parameter
  "*types". This needed an extended Python parser analysis that fixes
  the arguments given to the inspect module, accordingly.

- The signature generation was completely new implemented and
  relies no longer on the restricted syntax of a Python (2) function
  but generates signatures directly as Parameter instances.

Implemented classes with hand-made signatures:

    QtCore.ClassInfo
    QtCore.MetaFunction,
    QtCore.MetaSignal
    QtCore.Property
    QtCore.Signal
    QtCore.SignalInstance
    QtCore.Slot
    QtQml.ListProperty
    QtQml.VolatileBool

As a side effect, many more subtypes were published.
Enums are done, which concludes this work.

Fixes: PYSIDE-945
Fixes: PYSIDE-1052
Change-Id: Ic09f02ece3a90325519e42e4e39719beb0c27ae9
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp')

diff --git a/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp b/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp
index db297db7c..6427e5198 100644
--- a/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp
+++ b/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp
@@ -41,6 +41,7 @@
 
 // shiboken
 #include <shiboken.h>
+#include <signature.h>
 
 // pyside
 #include <pyside.h>
@@ -469,12 +470,22 @@ PyTypeObject *QtQml_VolatileBoolTypeF(void)
     return type;
 }
 
+static const char *PropertyList_SignatureStrings[] = {
+    "PySide2.QtQml.ListProperty(type:type,append:typing.Callable,"
+        "at:typing.Callable=None,clear:typing.Callable=None,count:typing.Callable=None)",
+    nullptr}; // Sentinel
+
+static const char *VolatileBool_SignatureStrings[] = {
+    "PySide2.QtQml.VolatileBool.get()->bool",
+    "PySide2.QtQml.VolatileBool.set(a:object)",
+    nullptr}; // Sentinel
+
 void PySide::initQmlSupport(PyObject *module)
 {
     ElementFactory<PYSIDE_MAX_QML_TYPES - 1>::init();
 
     // Export QmlListProperty type
-    if (PyType_Ready(PropertyListTypeF()) < 0) {
+    if (SbkSpecial_Type_Ready(module, PropertyListTypeF(), PropertyList_SignatureStrings) < 0) {
         PyErr_Print();
         qWarning() << "Error initializing PropertyList type.";
         return;
@@ -484,7 +495,7 @@ void PySide::initQmlSupport(PyObject *module)
     PyModule_AddObject(module, PepType_GetNameStr(PropertyListTypeF()),
                        reinterpret_cast<PyObject *>(PropertyListTypeF()));
 
-    if (PyType_Ready(QtQml_VolatileBoolTypeF()) < 0) {
+    if (SbkSpecial_Type_Ready(module, QtQml_VolatileBoolTypeF(), VolatileBool_SignatureStrings) < 0) {
         PyErr_Print();
         qWarning() << "Error initializing VolatileBool type.";
         return;
-- 
cgit v1.2.3