Adapt to new changes in qtbase

- Remove more math functions
- Renamed enum in QLibraryInfo
- Use float instead of qreal in QColor

Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: Ic3120d1776f01943e38395a1a30d62bf6f5ccc36
Reviewed-by: Christian Tismer <tismer@stackless.com>

4 files changed, 24 insertions, 30 deletions

diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index 2bed158a9..2cbfe638b 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -51,14 +51,9 @@
     <custom-type name="PyTypeObject"/>
     <custom-type name="PyUnicode"/>
     <custom-type name="list of QAbstractAnimation"/>
-
-    <function signature="qAcos(qreal)"/>
-    <function signature="qAsin(qreal)" since="4.6"/>
-    <function signature="qAtan(qreal)" since="4.6"/>
-    <function signature="qAtan2(qreal,qreal)" since="4.6"/>
-    <function signature="qChecksum(const char*,uint)"/>
-    <function signature="qExp(qreal)" since="4.6"/>
-    <function signature="qFabs(qreal)" since="4.6"/>
+<!--
+    <function signature="qChecksum(QByteArrayView data, Qt::ChecksumType)"/>
+-->
     <function signature="qFastCos(qreal)" since="4.6"/>
     <function signature="qFastSin(qreal)" since="4.6"/>
     <function signature="qFuzzyCompare(double,double)"/>
@@ -68,7 +63,6 @@
     <function signature="qIsNaN(double)"/>
     <function signature="qIsNull(double)"/>
     <!-- Qt5: gone <function signature="qRound(qreal)"/> -->
-    <function signature="qTan(qreal)" since="4.6"/>
     <function signature="qtTrId(const char*,int)" since="4.6"/>
     <function signature="qVersion()"/>
     <function signature="qCompress(const uchar*,qsizetype,int)"/>
@@ -2166,7 +2160,7 @@
       <enum-type name="OSType"/>
   </value-type>
   <object-type name="QLibraryInfo">
-    <enum-type name="LibraryLocation"/>
+    <enum-type name="LibraryPath"/>
     <modify-function signature="build()">
         <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="qlibraryinfo_build"/>
     </modify-function>
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
index 4c32e4821..56a998cb3 100644
--- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
@@ -834,7 +834,7 @@
             </insert-template>
         </inject-code>
     </modify-function>
-    <modify-function signature="getCmykF(qreal*,qreal*,qreal*,qreal*,qreal*)const">
+    <modify-function signature="getCmykF(float*,float*,float*,float*,float*)const">
         <modify-argument index="0">
             <replace-type modified-type="PyObject*"/>
         </modify-argument>
@@ -857,7 +857,7 @@
 
         <inject-code class="target" position="beginning">
             <insert-template name="fix_number*,number*,number*,number*,number*">
-                <replace from="$TYPE" to="qreal"/>
+                <replace from="$TYPE" to="float"/>
             </insert-template>
         </inject-code>
     </modify-function>
@@ -884,7 +884,7 @@
             </insert-template>
         </inject-code>
     </modify-function>
-    <modify-function signature="getHslF(qreal*,qreal*,qreal*,qreal*)const" since="4.6">
+    <modify-function signature="getHslF(float*,float*,float*,float*)const" since="4.6">
         <modify-argument index="0">
             <replace-type modified-type="PyObject*"/>
         </modify-argument>
@@ -903,7 +903,7 @@
         </modify-argument>
         <inject-code class="target" position="beginning">
             <insert-template name="fix_number*,number*,number*,number*">
-                <replace from="$TYPE" to="qreal"/>
+                <replace from="$TYPE" to="float"/>
             </insert-template>
         </inject-code>
     </modify-function>
@@ -930,7 +930,7 @@
             </insert-template>
         </inject-code>
     </modify-function>
-    <modify-function signature="getHsvF(qreal*,qreal*,qreal*,qreal*)const">
+    <modify-function signature="getHsvF(float*,float*,float*,float*)const">
         <modify-argument index="0">
             <replace-type modified-type="PyObject*"/>
         </modify-argument>
@@ -949,7 +949,7 @@
         </modify-argument>
         <inject-code class="target" position="beginning">
             <insert-template name="fix_number*,number*,number*,number*">
-                <replace from="$TYPE" to="qreal"/>
+                <replace from="$TYPE" to="float"/>
             </insert-template>
         </inject-code>
     </modify-function>
@@ -976,7 +976,7 @@
             </insert-template>
         </inject-code>
     </modify-function>
-    <modify-function signature="getRgbF(qreal*,qreal*,qreal*,qreal*)const">
+    <modify-function signature="getRgbF(float*,float*,float*,float*)const">
         <modify-argument index="0">
             <replace-type modified-type="PyObject*"/>
         </modify-argument>
@@ -995,7 +995,7 @@
         </modify-argument>
         <inject-code class="target" position="beginning">
             <insert-template name="fix_number*,number*,number*,number*">
-                <replace from="$TYPE" to="qreal"/>
+                <replace from="$TYPE" to="float"/>
             </insert-template>
         </inject-code>
     </modify-function>
diff --git a/sources/pyside2/PySide2/glue/qtgui.cpp b/sources/pyside2/PySide2/glue/qtgui.cpp
index 2a139fe69..869fb9dc4 100644
--- a/sources/pyside2/PySide2/glue/qtgui.cpp
+++ b/sources/pyside2/PySide2/glue/qtgui.cpp
@@ -170,34 +170,34 @@ PyObject *args = PyTuple_GET_ITEM(%1, 1);
 switch (%CPPSELF.spec()) {
     case QColor::Rgb:
     {
-        qreal r, g, b, a;
+        float r, g, b, a;
         %CPPSELF.getRgbF(&r, &g, &b, &a);
         %PYARG_0 = Py_BuildValue("(ON(s(ffff)))", Py_TYPE(%PYSELF), PyTuple_New(0),
-                                 "setRgbF", float(r), float(g), float(b), float(a));
+                                 "setRgbF", r, g, b, a);
         break;
     }
     case QColor::Hsv:
     {
-        qreal h, s, v, a;
+        float h, s, v, a;
         %CPPSELF.getHsvF(&h, &s, &v, &a);
         %PYARG_0 = Py_BuildValue("(ON(s(ffff)))", Py_TYPE(%PYSELF), PyTuple_New(0),
-                                 "setHsvF", float(h), float(s), float(v), float(a));
+                                 "setHsvF", h, s, v, a);
         break;
     }
     case QColor::Cmyk:
     {
-        qreal c, m, y, k, a;
+        float c, m, y, k, a;
         %CPPSELF.getCmykF(&c, &m, &y, &k, &a);
         %PYARG_0 = Py_BuildValue("(ON(s(fffff)))", Py_TYPE(%PYSELF), PyTuple_New(0),
-                                 "setCmykF", float(c), float(m), float(y), float(k), float(a));
+                                 "setCmykF", c, m, y, k, a);
         break;
     }
     case QColor::Hsl:
     {
-        qreal h, s, l, a;
+        float h, s, l, a;
         %CPPSELF.getHslF(&h, &s, &l, &a);
         %PYARG_0 = Py_BuildValue("(ON(s(ffff)))", Py_TYPE(%PYSELF), PyTuple_New(0),
-                                 "setHslF", float(h), float(s), float(l), float(a));
+                                 "setHslF", h, s, l, a);
         break;
     }
     default:
diff --git a/sources/pyside2/PySide2/templates/gui_common.xml b/sources/pyside2/PySide2/templates/gui_common.xml
index 7cedd5af9..fb8e66881 100644
--- a/sources/pyside2/PySide2/templates/gui_common.xml
+++ b/sources/pyside2/PySide2/templates/gui_common.xml
@@ -88,7 +88,7 @@
         switch(%CPPSELF.spec()) {
           case QColor::Rgb:
           {
-              qreal r, g, b, a;
+              float r, g, b, a;
               %CPPSELF.getRgbF(&amp;r, &amp;g, &amp;b, &amp;a);
               QString repr = QString::asprintf("PySide2.QtGui.QColor.fromRgbF(%.6f, %.6f, %.6f, %.6f)", r, g, b, a);
               %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr));
@@ -96,7 +96,7 @@
           }
           case QColor::Hsv:
           {
-              qreal h, s, v, a;
+              float h, s, v, a;
               %CPPSELF.getHsvF(&amp;h, &amp;s, &amp;v, &amp;a);
               QString repr = QString::asprintf("PySide2.QtGui.QColor.fromHsvF(%.6f, %.6f, %.6f, %.6f)", h, s, v, a);
               %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr));
@@ -104,7 +104,7 @@
           }
           case QColor::Cmyk:
           {
-              qreal c, m, y, k, a;
+              float c, m, y, k, a;
               %CPPSELF.getCmykF(&amp;c, &amp;m, &amp;y, &amp;k, &amp;a);
               QString repr = QString::asprintf("PySide2.QtGui.QColor.fromCmykF(%.6f, %.6f, %.6f, %.6f, %.6f)", c, m, y, k, a);
               %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr));
@@ -112,7 +112,7 @@
           }
           case QColor::Hsl:
           {
-              qreal h, s, l, a;
+              float h, s, l, a;
               %CPPSELF.getHslF(&amp;h, &amp;s, &amp;l, &amp;a);
               QString repr = QString::asprintf("PySide2.QtGui.QColor.fromHslF(%.6f, %.6f, %.6f, %.6f)", h, s, l, a);
               %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr));