From 0187d2b17dd5d35d645b70a2cf08c7100c0d6a14 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 12 Sep 2018 09:45:30 +0200
Subject: PySide2: Silence warnings about not finding functions for
 modification

- codecForHtml(), mightBeRichText(), convertFromPlainText() are now
  in qtextdocument.h
- QSortFilterProxyModel: using QObject::parent; is not seen by Clang
- QCoreApplication::"winEventFilter() is a left-over from Qt 4
- Member template QMetaEnum fromType() is ignored by Clang
- QGraphicsScene::drawItems() is removed a few lines above
  the failing modification

Fixes:
signature 'winEventFilter(MSG*,long*)' for function modification in 'QCoreApplication' not found.
signature 'fromType()' for function modification in 'QMetaEnum' not found.
signature 'parent()const' for function modification in 'QSortFilterProxyModel' not found.
signature 'codecForHtml(QByteArray)' (specified as 'codecForHtml(const QByteArray&)') for function modification in 'Qt' not found.
signature 'mightBeRichText(QString)' (specified as 'mightBeRichText(const QString&)') for function modification in 'Qt' not found.
signature 'convertFromPlainText(QString,Qt::WhiteSpaceMode)' (specified as 'convertFromPlainText(const QString&,Qt::WhiteSpaceMode)') for function modification in 'Qt' not found.
signature 'drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*,QWidget*)' for function modification in 'QGraphicsScene' not found.

Change-Id: I7fcae940999890b490d0793d160c722924dea6ec
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 .../PySide2/QtCore/typesystem_core_common.xml      | 36 ----------------------
 .../QtWidgets/typesystem_widgets_common.xml        |  7 -----
 2 files changed, 43 deletions(-)

(limited to 'sources/pyside2')

diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index 19e571169..75056ea06 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -1040,11 +1040,6 @@
     <enum-type name="WindowType" flags="WindowFlags"/>
     <enum-type name="CursorMoveStyle" since="4.8" revision="4800"/>
 
-   <!--### These functions are part of QtGui, not QtCore -->
-    <modify-function signature="codecForHtml(const QByteArray&amp;)" remove="all"/>
-    <modify-function signature="mightBeRichText(const QString&amp;)" remove="all"/>
-    <modify-function signature="convertFromPlainText(const QString&amp;,Qt::WhiteSpaceMode)" remove="all"/>
-    <!--### -->
   </namespace-type>
 
   <add-function signature="qAbs(double)" return-type="double">
@@ -2168,9 +2163,6 @@
     </extra-includes>
   </object-type>
   <object-type name="QSortFilterProxyModel">
-    <!-- ### This reimplementation of "QObject::parent()" is used in C++ only
-         when "using QObject::parent;" is not available. It's useless in Python. -->
-    <modify-function signature="parent()const" remove="all"/>
     <extra-includes>
       <include file-name="QItemSelection" location="global"/>
       <include file-name="QStringList" location="global"/>
@@ -3456,31 +3448,6 @@
         <define-ownership owner="c++"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="winEventFilter(MSG*,long*)">
-      <modify-argument index="2">
-        <remove-argument />
-        <conversion-rule class="native">
-            long *%out = new long;
-            %out = 0;
-        </conversion-rule>
-      </modify-argument>
-      <modify-argument index="return">
-        <replace-type modified-type="PyObject"/>
-        <conversion-rule class="native">
-            %RETURN_TYPE %out = false;
-            if (PySequence_Check(%PYARG_0) &amp;&amp; (PySequence_Size(%PYARG_0) == 2)) {
-                Shiboken::AutoDecRef pyResult(PySequence_GetItem(%PYARG_0, 0));
-                %out = %CONVERTTOCPP[bool](pyResult);
-            }
-        </conversion-rule>
-      </modify-argument>
-      <inject-code position="end">
-      %PYARG_0 = PyTuple_New(2);
-      PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](%0));
-      PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[long](*result_out));
-      delete result_out;
-      </inject-code>
-    </modify-function>
   </object-type>
   <object-type name="QSettings">
     <enum-type name="Format"/>
@@ -3959,9 +3926,6 @@
     </modify-function>
     <!-- This isn't part of Qt public API -->
     <modify-function signature="enclosingMetaObject()const" remove="all" />
-    <!-- Qt5.5: "template<typename T> static QMetaEnum fromType()" is not understood by the compiler.
-         We therefore ignore this 5.5 addition for now: -->
-    <modify-function signature="fromType()" since="5.5" remove="all" />
   </value-type>
 
   <!-- From Qt4.6 -->
diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
index dbc5c8848..9c21493da 100644
--- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
+++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
@@ -1875,13 +1875,6 @@
         </inject-code>
     </modify-function>
 
-    <!-- use glue code -->
-    <modify-function signature="drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*,QWidget*)">
-        <modify-argument index="2">
-            <remove-argument/>
-        </modify-argument>
-    </modify-function>
-
     <modify-function signature="clear()">
         <inject-code>
             const QList&lt;QGraphicsItem*> items = %CPPSELF.items();
-- 
cgit v1.2.3