From d8e24b439d4b801f97363cf61ced4834970fe96f Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Thu, 20 Aug 2020 10:02:25 +0200
Subject: Remove QStringRef

Port the remaining XML parser code in shiboken to QStringView.
Remove the QStringRef type.

The QStringView-related refactoring of QXmlStreamAttributes
somehow exposed the value() methods of its base class (QList),
which cause compilation errors. Remove them.

Task-number: QTBUG-84319
Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: If01516f962eddcc0591ccaff322843f2fc040549
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
---
 sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'sources/pyside2/PySide2/QtCore/typesystem_core_common.xml')

diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index 8325a06e4..05dc7185b 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -263,11 +263,6 @@
     </conversion-rule>
   </primitive-type>
 
-  <primitive-type name="QStringRef">
-    <conversion-rule>
-        <native-to-target file="../glue/qtcore.cpp" snippet="return-pyunicode-qstringref"/>
-    </conversion-rule>
-  </primitive-type>
   <primitive-type name="QChar">
     <conversion-rule>
         <native-to-target file="../glue/qtcore.cpp" snippet="return-pyunicode-qchar"/>
@@ -2708,6 +2703,9 @@
     <modify-function signature="push_front(QXmlStreamAttribute)" remove="all"/>
     <modify-function signature="pop_front()" remove="all"/>
     <modify-function signature="toList()const" remove="all"/>
+    <!-- Remove methods from QList -->
+    <modify-function signature="value(qsizetype,const QXmlStreamAttribute&amp;) const" remove="all"/>
+    <modify-function signature="value(qsizetype) const" remove="all"/>
     <modify-function signature="fromList(const QList&lt;QXmlStreamAttribute&gt; &amp;)" remove="all"/>
     <modify-function signature="operator+=(QVector&lt;QXmlStreamAttribute&gt;)" remove="all"/>
     <!-- Expose operator==, != inherited from QList, which the parser does
-- 
cgit v1.2.3