From c7f9793ff660ed608474d0cab3b31054dbebb458 Mon Sep 17 00:00:00 2001
From: Christian Tismer <tismer@stackless.com>
Date: Thu, 28 Sep 2017 13:10:28 +0200
Subject: Fix the signature of the Q*Application constructor

Q*Application had PySequence as Parameter, although
only QStringList is accepted. That resulted in an implausible error
message when a list of, say, Integers was given.

This patch
 - replaces PySequence by QStringList (one more tuple layer),
 - fixes QCoreApplication to give the same kind of error messages,
 - renames the shiboken function sequenceToArgcArgv to listToArgcArgv
   and changes it to only allow list descendents.

We also changed signature.typing in one line to display List[str] correctly.

I think this belongs more to PySide-331, a fixed qApp.

Task-number: PYSIDE-510
Task-number: PYSIDE-331
Change-Id: Ib256c6a2db05a3db826454e1bf1b4729d59a240b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 .../PySide2/QtCore/glue/qcoreapplication_init.cpp     | 19 +++++++------------
 .../pyside2/PySide2/QtCore/typesystem_core_common.xml |  2 +-
 2 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'sources/pyside2/PySide2/QtCore')

diff --git a/sources/pyside2/PySide2/QtCore/glue/qcoreapplication_init.cpp b/sources/pyside2/PySide2/QtCore/glue/qcoreapplication_init.cpp
index 20e9c4464..fec8cf416 100644
--- a/sources/pyside2/PySide2/QtCore/glue/qcoreapplication_init.cpp
+++ b/sources/pyside2/PySide2/QtCore/glue/qcoreapplication_init.cpp
@@ -41,23 +41,18 @@
 static int QCoreApplicationArgCount;
 static char** QCoreApplicationArgValues;
 
-void QCoreApplication_constructor(PyObject* self, PyObject* args, QCoreApplicationWrapper** cptr)
+void QCoreApplication_constructor(PyObject* self, PyObject* argv, QCoreApplicationWrapper** cptr)
 {
     if (QCoreApplication::instance()) {
         PyErr_SetString(PyExc_RuntimeError, "A QCoreApplication instance already exists.");
         return;
     }
 
-    int numArgs = PyTuple_GET_SIZE(args);
-    if (numArgs != 1
-        || !Shiboken::sequenceToArgcArgv(PyTuple_GET_ITEM(args, 0), &QCoreApplicationArgCount, &QCoreApplicationArgValues, "PySideApp")) {
-        PyErr_BadArgument();
-        return;
+    PyObject *stringlist = PyTuple_GET_ITEM(argv, 0);
+    if (Shiboken::listToArgcArgv(stringlist, &QCoreApplicationArgCount, &QCoreApplicationArgValues, "PySideApp")) {
+        *cptr = new QCoreApplicationWrapper(QCoreApplicationArgCount, QCoreApplicationArgValues);
+        Shiboken::Object::releaseOwnership(reinterpret_cast<SbkObject*>(self));
+        PySide::registerCleanupFunction(&PySide::destroyQCoreApplication);
+        Py_INCREF(self);
     }
-
-    *cptr = new QCoreApplicationWrapper(QCoreApplicationArgCount, QCoreApplicationArgValues);
-
-    Shiboken::Object::releaseOwnership(reinterpret_cast<SbkObject*>(self));
-    PySide::registerCleanupFunction(&PySide::destroyQCoreApplication);
-    Py_INCREF(self);
 }
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index f3bf41923..03991af38 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -3213,7 +3213,7 @@
     in a more convenient form by the :meth:`~QCoreApplication.arguments()`
     method.
     </inject-documentation>
-    <add-function signature="QCoreApplication(PySequence)">
+    <add-function signature="QCoreApplication(QStringList)">
         <inject-code>
             QCoreApplication_constructor(%PYSELF, args, &amp;%0);
         </inject-code>
-- 
cgit v1.2.3