diff options
Diffstat (limited to 'sources/pyside2/PySide2/QtCore/typesystem_core_common.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 489 |
1 files changed, 54 insertions, 435 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 62928f3cf..144e16ffc 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -51,15 +51,9 @@ <custom-type name="PyTypeObject"/> <custom-type name="PyUnicode"/> <custom-type name="list of QAbstractAnimation"/> - <custom-type name="list of QAbstractState"/> - - <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)"/> @@ -69,14 +63,11 @@ <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="qrand()"/> - <function signature="qsrand(uint)"/> - <function signature="qCompress(const uchar*,int,int)"/> + <function signature="qCompress(const uchar*,qsizetype,int)"/> <function signature="qCompress(const QByteArray&,int)"/> - <function signature="qUncompress(const uchar*,int)"/> + <function signature="qUncompress(const uchar*,qsizetype)"/> <function signature="qUncompress(const QByteArray&)"/> <inject-code class="native" position="beginning" file="../glue/qtcore.cpp" snippet="include-pyside"/> @@ -170,7 +161,6 @@ <enum-type name="QtMsgType"/> - <enum-type name="QCborSimpleType" since="5.12"/> <enum-type name="QCborKnownTags" since="5.12"/> @@ -189,6 +179,8 @@ <primitive-type name="long long"/> <primitive-type name="qlonglong" target-lang-api-name="PyLong"/> <primitive-type name="qulonglong" target-lang-api-name="PyLong"/> + <primitive-type name="qsizetype" target-lang-api-name="PyLong"/> + <primitive-type name="size_t" target-lang-api-name="PyLong"/> <primitive-type name="short"/> <primitive-type name="signed short"/> <primitive-type name="signed short int"/> @@ -256,17 +248,18 @@ <native-to-target file="../glue/qtcore.cpp" snippet="return-pyunicode"/> <target-to-native> <add-conversion type="PyUnicode" file="../glue/qtcore.cpp" snippet="conversion-pyunicode"/> - <add-conversion type="PyString" check="py2kStrCheck(%in)" file="../glue/qtcore.cpp" snippet="conversion-pystring"/> <add-conversion type="Py_None" file="../glue/qtcore.cpp" snippet="conversion-pynone"/> </target-to-native> </conversion-rule> </primitive-type> - <primitive-type name="QStringRef"> + <primitive-type name="QStringView" target-lang-api-name="PyUnicode" view-on="QString"> + <include file-name="QStringView" location="global"/> <conversion-rule> - <native-to-target file="../glue/qtcore.cpp" snippet="return-pyunicode-qstringref"/> + <native-to-target file="../glue/qtcore.cpp" snippet="return-pyunicode"/> </conversion-rule> </primitive-type> + <primitive-type name="QChar"> <conversion-rule> <native-to-target file="../glue/qtcore.cpp" snippet="return-pyunicode-qchar"/> @@ -354,7 +347,7 @@ <include file-name="qcborstream.h" location="global"/> <value-type name="StringResult" generate="no"/> <!-- 64bit (qsizetype = long long) --> - <modify-function signature="readStringChunk(char*,long long)" remove="all"/> + <modify-function signature="readStringChunk(char*,qsizetype)" remove="all"/> <!-- 32bit (qsizetype = int) --> <modify-function signature="readStringChunk(char*,int)" remove="all"/> </object-type> @@ -405,6 +398,7 @@ </conversion-rule> </container-type> + <!-- FIXME: Which one is it going to be? --> <container-type name="QList" type="list"> <include file-name="QList" location="global"/> <conversion-rule> @@ -419,21 +413,6 @@ </conversion-rule> </container-type> - <container-type name="QVector" type="vector"> - <include file-name="QVector" location="global"/> - <conversion-rule> - <native-to-target> - <insert-template name="cppvector_to_pylist_conversion"/> - </native-to-target> - <target-to-native> - <add-conversion type="PySequence"> - <insert-template name="pyseq_to_cppvector_conversion"/> - </add-conversion> - </target-to-native> - </conversion-rule> - - </container-type> - <container-type name="QStack" type="stack"> <include file-name="QStack" location="global"/> <conversion-rule> @@ -462,20 +441,6 @@ </conversion-rule> </container-type> - <container-type name="QLinkedList" type="linked-list"> - <include file-name="QLinkedList" location="global"/> - <conversion-rule> - <native-to-target> - <insert-template name="cpplist_to_pylist_conversion"/> - </native-to-target> - <target-to-native> - <add-conversion type="PySequence"> - <insert-template name="pyseq_to_cpplist_conversion"/> - </add-conversion> - </target-to-native> - </conversion-rule> - </container-type> - <container-type name="QHash" type="hash"> <include file-name="QHash" location="global"/> <!-- Include to make enum flags work. --> @@ -550,15 +515,11 @@ <rejection class="" enum-name="enum_1"/> <rejection class="" enum-name="enum_2"/> <rejection class="" enum-name="QtValidLicenseForXmlModule"/> - <rejection class="" enum-name="QtValidLicenseForXmlPatternsModule"/> <rejection class="" enum-name="QtValidLicenseForActiveQtModule"/> <rejection class="" enum-name="QtValidLicenseForCoreModule"/> - <rejection class="" enum-name="QtValidLicenseForQt3SupportLightModule"/> - <rejection class="" enum-name="QtValidLicenseForQt3SupportModule"/> <rejection class="" enum-name="QtValidLicenseForNetworkModule"/> <rejection class="" enum-name="QtValidLicenseForSvgModule"/> <rejection class="" enum-name="QtValidLicenseForGuiModule"/> - <rejection class="" enum-name="QtValidLicenseForScriptModule"/> <rejection class="" enum-name="QtValidLicenseForHelpModule"/> <!-- Internal --> <rejection class="QAbstractFileEngine"/> <!-- @@ -634,6 +595,7 @@ <enum-type name="PenCapStyle"/> <enum-type name="PenJoinStyle"/> <enum-type name="PenStyle"/> + <enum-type name="ReturnByValueConstant" since="6.0"/> <enum-type name="ScreenOrientation" flags="ScreenOrientations" since="5.0"/> <enum-type name="ScrollBarPolicy"/> <enum-type name="ScrollPhase" since="5.2"/> @@ -747,7 +709,7 @@ </add-function> </value-type> <value-type name="QLineF"> - <enum-type name="IntersectType"/> + <enum-type name="IntersectionType"/> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> @@ -774,7 +736,7 @@ </insert-template> </inject-code> </add-function> - <modify-function signature="intersect(QLineF,QPointF*)const"> + <modify-function signature="intersects(const QLineF &,QPointF*)const"> <modify-argument index="2"> <remove-argument /> </modify-argument> @@ -831,7 +793,6 @@ <extra-includes> <include file-name="datetime.h" location="global"/> </extra-includes> - <enum-type name="MonthNameType"/> <add-function signature="__repr__" return-type="PyObject"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> @@ -852,7 +813,7 @@ <add-function signature="toPython()" return-type="PyObject"> <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qdate-topython"/> </add-function> - <modify-function signature="getDate(int*,int*,int*)" > + <modify-function signature="getDate(int*,int*,int*)const" > <modify-argument index="1"> <remove-argument/> </modify-argument> @@ -1314,8 +1275,6 @@ <rename to="format"/> </modify-argument> </modify-function> - <!-- Qt5: ignore the new QStringRef versions, int arg is gone --> - <modify-function signature="toUInt(QStringRef,bool*)const" remove="all"/> <modify-function signature="toUInt(QString,bool*)const"> <modify-argument index="2"> <remove-argument /> @@ -1328,8 +1287,6 @@ <insert-template name="fix_args,bool*"/> </inject-code> </modify-function> - <!-- Qt5: ignore the new QStringRef versions, int arg is gone --> - <modify-function signature="toULongLong(QStringRef,bool*)const" remove="all"/> <modify-function signature="toULongLong(QString,bool*)const"> <modify-argument index="2"> <remove-argument /> @@ -1342,8 +1299,6 @@ <insert-template name="fix_args,bool*"/> </inject-code> </modify-function> - <!-- Qt5: ignore the new QStringRef versions --> - <modify-function signature="toDouble(QStringRef,bool*)const" remove="all"/> <modify-function signature="toDouble(QString,bool*)const"> <modify-argument index="2"> <remove-argument /> @@ -1356,8 +1311,6 @@ <insert-template name="fix_args,bool*"/> </inject-code> </modify-function> - <!-- Qt5: ignore the new QStringRef versions --> - <modify-function signature="toFloat(QStringRef,bool*)const" remove="all"/> <modify-function signature="toFloat(QString,bool*)const"> <modify-argument index="2"> <remove-argument /> @@ -1370,8 +1323,6 @@ <insert-template name="fix_args,bool*"/> </inject-code> </modify-function> - <!-- Qt5: ignore the new QStringRef versions, int arg is gone --> - <modify-function signature="toInt(QStringRef,bool*)const" remove="all"/> <modify-function signature="toInt(QString,bool*)const"> <modify-argument index="2"> <remove-argument /> @@ -1383,8 +1334,6 @@ <insert-template name="fix_args,bool*"/> </inject-code> </modify-function> - <!-- Qt5: ignore the new QStringRef versions, int arg is gone --> - <modify-function signature="toLongLong(QStringRef,bool*)const" remove="all"/> <modify-function signature="toLongLong(QString,bool*)const"> <modify-argument index="2"> <remove-argument /> @@ -1396,8 +1345,6 @@ <insert-template name="fix_args,bool*"/> </inject-code> </modify-function> - <!-- Qt5: ignore the new QStringRef versions, int arg is gone --> - <modify-function signature="toShort(QStringRef,bool*)const" remove="all"/> <modify-function signature="toShort(QString,bool*)const"> <modify-argument index="2"> <remove-argument /> @@ -1409,8 +1356,6 @@ <insert-template name="fix_args,bool*"/> </inject-code> </modify-function> - <!-- Qt5: ignore the new QStringRef versions, int arg is gone --> - <modify-function signature="toUShort(QStringRef,bool*)const" remove="all"/> <modify-function signature="toUShort(QString,bool*)const"> <modify-argument index="2"> <remove-argument /> @@ -1509,7 +1454,7 @@ <enum-type name="CheckIndexOption" flags="CheckIndexOptions" since="5.11"/> <enum-type name="LayoutChangeHint"/> <!-- This function was replaced by a added function --> - <modify-function signature="createIndex(int,int,void*)const" remove="all"/> + <modify-function signature="createIndex(int,int,const void*)const" remove="all"/> <!-- This function is the same as createIndex(int, int, int)const --> <modify-function signature="createIndex(int,int,quintptr)const"> <modify-argument index="3"> @@ -1560,6 +1505,10 @@ </object-type> <value-type name="QItemSelection"> <include file-name="QList" location="global"/> + <!-- Expose operator==, != inherited from QList, which the parser does + not see due to the TMP expression of the return type. --> + <add-function signature="operator==(const QItemSelection&)" return-type="bool"/> + <add-function signature="operator!=(const QItemSelection&)" return-type="bool"/> </value-type> <object-type name="QItemSelectionModel"> @@ -1590,10 +1539,6 @@ <reference-count action="set"/> </modify-argument> </modify-function> - <!--### Obsolete in 4.3--> - <modify-function signature="clear()" remove="all"/> - <modify-function signature="filterChanged()" remove="all"/> - <!--### End of obsolete section --> </object-type> <object-type name="QIdentityProxyModel"/> <object-type name="QTransposeProxyModel" since="5.13"/> @@ -1735,12 +1680,6 @@ <replace-default-expression with="QString()"/> </modify-argument> </add-function> - <add-function signature="findChildren(PyTypeObject*,const QRegExp&)" return-type="PySequence*" > - <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qobject-findchildren"/> - <modify-argument index="return"> - <parent index="this" action="add"/> - </modify-argument> - </add-function> <add-function signature="findChildren(PyTypeObject*,const QRegularExpression&)" return-type="PySequence*" > <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qobject-findchildren"/> <modify-argument index="return"> @@ -1823,64 +1762,8 @@ </inject-code> </add-function> </value-type> - <value-type name="QRegExp"> - <enum-type name="CaretMode"/> - <enum-type name="PatternSyntax"/> - <extra-includes> - <include file-name="QStringList" location="global"/> - </extra-includes> - <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="repr_code"> - <replace from="%REPR_FORMAT" to="'%s', %i, %i"/> - <replace from="%REPR_ARGS" to="qPrintable(%CPPSELF.pattern()), (int)%CPPSELF.caseSensitivity(), (int)%CPPSELF.patternSyntax()"/> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="__reduce__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="reduce_code"> - <replace from="%REDUCE_FORMAT" to="sii"/> - <replace from="%REDUCE_ARGS" to="qPrintable(%CPPSELF.pattern()), (int)%CPPSELF.caseSensitivity(), (int)%CPPSELF.patternSyntax()"/> - </insert-template> - </inject-code> - </add-function> - <add-function signature="replace(QString,QString)" return-type="QString"> - <modify-argument index="1"> - <rename to="sourceString"/> - </modify-argument> - <modify-argument index="2"> - <rename to="after"/> - </modify-argument> - <inject-documentation format="target" mode="append"> - Replaces every occurrence of the regular expression in *sourceString* with *after*. - Returns a new Python string with the modified contents. For example: - - :: - - s = "Banana" - re = QRegExp("a[mn]") - s = re.replace(s, "ox") - # s == "Boxoxa" - - - For regular expressions containing capturing parentheses, occurrences of \1, \2, ..., in *after* - are replaced with rx.cap(1), cap(2), ... - - :: - - t = "A <i>bon mot</i>." - re = QRegExp("<i>([^<]*)</i>") - t = re.replace(t, "\\emph{\\1}") - # t == "A \\emph{bon mot}." - - </inject-documentation> - <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qregexp-replace"/> - </add-function> - </value-type> - <value-type name="QRegularExpression"> + <enum-type name="WildcardConversionOption" flags="WildcardConversionOptions" since="6.0"/> <enum-type name="MatchOption" flags="MatchOptions"/> <enum-type name="MatchType"/> <enum-type name="PatternOption" flags="PatternOptions"/> @@ -1920,58 +1803,23 @@ </extra-includes> <!-- ### These overloads must be removed accept strings with \x00 in their contents --> - <modify-function signature="append(const char*,int)" remove="all"/> <modify-function signature="append(const char*)" remove="all"/> - <modify-function signature="append(QString)" remove="all"/> - <modify-function signature="contains(const char*)const" remove="all"/> - <modify-function signature="count(const char*)const" remove="all"/> - <modify-function signature="endsWith(const char*)const" remove="all"/> - <modify-function signature="indexOf(const char*,int)const" remove="all"/> - <modify-function signature="indexOf(char,int)const" remove="all"/> - <modify-function signature="indexOf(QString,int)const" remove="all"/> - <modify-function signature="insert(int,const char*)" remove="all"/> - <modify-function signature="insert(int,char)" remove="all"/> - <modify-function signature="insert(int,const char*,int)" since="4.6" remove="all"/> - <modify-function signature="insert(int,QString)" remove="all"/> - <modify-function signature="lastIndexOf(const char*,int)const" remove="all"/> - <modify-function signature="lastIndexOf(QString,int)const" remove="all"/> - <modify-function signature="lastIndexOf(char,int)const" remove="all"/> <modify-function signature="prepend(const char*)" remove="all"/> - <modify-function signature="prepend(const char*,int)" since="4.6" remove="all"/> - <modify-function signature="replace(QByteArray,const char*)" remove="all"/> - <modify-function signature="replace(const char*,int,const char*,int)" remove="all"/> - <modify-function signature="replace(QString,const char*)" remove="all"/> - <modify-function signature="replace(const char*,QByteArray)" remove="all"/> - <modify-function signature="replace(const char*,const char*)" remove="all"/> - <modify-function signature="replace(int,int,const char*)" remove="all"/> - <modify-function signature="replace(int,int,const char*,int)" since="4.6" remove="all"/> - <modify-function signature="replace(char,const char*)" remove="all"/> - <modify-function signature="replace(char,QString)" remove="all"/> - <modify-function signature="startsWith(const char*)const" remove="all"/> - <modify-function signature="operator==(QString)const" remove="all"/> <modify-function signature="operator==(const char*,QByteArray)" remove="all"/> <modify-function signature="operator==(QByteArray,const char*)" remove="all"/> - <modify-function signature="operator>(QString)const" remove="all"/> <modify-function signature="operator>(const char*,QByteArray)" remove="all"/> <modify-function signature="operator>(QByteArray,const char*)" remove="all"/> - <modify-function signature="operator>=(QString)const" remove="all"/> <modify-function signature="operator>=(const char*,QByteArray)" remove="all"/> <modify-function signature="operator>=(QByteArray,const char*)" remove="all"/> - <modify-function signature="operator<(QString)const" remove="all"/> <modify-function signature="operator<(const char*,QByteArray)" remove="all"/> - <modify-function signature="operator<=(QString)const" remove="all"/> <modify-function signature="operator<=(const char*,QByteArray)" remove="all"/> <modify-function signature="operator<=(QByteArray,const char*)" remove="all"/> - <modify-function signature="operator!=(QString)const" remove="all"/> <modify-function signature="operator!=(const char*,QByteArray)" remove="all"/> <modify-function signature="operator!=(QByteArray,const char*)" remove="all"/> - <modify-function signature="operator+=(QString)" remove="all"/> <modify-function signature="operator+=(const char*)" remove="all"/> <modify-function signature="operator+(QByteArray,const char*)" remove="all"/> <modify-function signature="operator+(const char*,QByteArray)" remove="all"/> <modify-function signature="operator+(QByteArray,const char*)" remove="all"/> - <modify-function signature="operator+(QString,QByteArray)" remove="all"/> - <modify-function signature="operator+(QByteArray,QString)" remove="all"/> <add-function signature="operator+(PyBytes,QByteArray)"> <inject-code file="../glue/qtcore.cpp" snippet="qbytearray-operatorplus-1"/> </add-function> @@ -2016,10 +1864,6 @@ </insert-template> </inject-code> </add-function> - <modify-function signature="QByteArray(const char*,int)"> - <!-- Keep \x00 bytes passed in python strings --> - <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qbytearray-1"/> - </modify-function> <add-function signature="QByteArray(PyByteArray)"> <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qbytearray-2"/> </add-function> @@ -2056,16 +1900,18 @@ <modify-function signature="operator<=(const char*,QByteArray)" remove="all"/> <modify-function signature="operator>(const char*,QByteArray)" remove="all"/> <modify-function signature="operator>=(const char*,QByteArray)" remove="all"/> - <modify-function signature="operator[](int)const" remove="all"/> - <modify-function signature="operator[](uint)const" remove="all"/> <!-- Those types have the same representation in Python, an overload would be useless and cause overflow errors. --> <modify-function signature="setNum(uint,int)" remove="all"/> <modify-function signature="setNum(ushort,int)" remove="all"/> <modify-function signature="setNum(float,char,int)" remove="all"/> <modify-function signature="setNum(short,int)" remove="all"/> + <modify-function signature="setNum(long,int)" remove="all"/> + <modify-function signature="setNum(ulong,int)" remove="all"/> <modify-function signature="setNum(qulonglong,int)" remove="all"/> <modify-function signature="number(uint,int)" remove="all"/> + <modify-function signature="number(long,int)" remove="all"/> + <modify-function signature="number(ulong,int)" remove="all"/> <modify-function signature="number(qulonglong,int)" remove="all"/> <!--### --> @@ -2147,16 +1993,6 @@ </inject-code> </modify-function> <!-- QByteArray(const char *) do the job of this constructor --> - <modify-function signature="QByteArray(const char*,int)" remove="all"/> - <modify-function signature="fromRawData(const char*,int)"> - <modify-argument index="1"> - <replace-type modified-type="PyBytes"/> - </modify-argument> - <modify-argument index="2"> - <remove-argument /> - </modify-argument> - <inject-code class="target" file="../glue/qtcore.cpp" snippet="qbytearray-fromrawdata"/> - </modify-function> <modify-function signature="toDouble(bool*)const"> <modify-argument index="1"> <remove-argument/> @@ -2192,18 +2028,24 @@ <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qbytearray-msetitem"/> </add-function> </value-type> + <primitive-type name="QByteArrayView" view-on="QByteArray" since="6.0"> + <conversion-rule> + <native-to-target file="../glue/qtcore.cpp" snippet="return-pybytes"/> + </conversion-rule> + </primitive-type> + <value-type name="QTextBoundaryFinder"> <enum-type name="BoundaryReason" flags="BoundaryReasons"/> <enum-type name="BoundaryType"/> <!-- There's no QChar in PySide --> - <modify-function signature="QTextBoundaryFinder(QTextBoundaryFinder::BoundaryType,const QChar*,int,unsigned char*,int)" remove="all"/> + <modify-function signature="QTextBoundaryFinder(QTextBoundaryFinder::BoundaryType,const QChar*,qsizetype,unsigned char*,qsizetype)" remove="all"/> </value-type> <object-type name="QXmlStreamEntityResolver"/> <!-- Qt5: had to move QAbstractEventDispatcher into os-specific files because of Windows --> <object-type name="QAbstractNativeEventFilter"> <!-- see QWidget::nativeEvent(), QWindow::nativeEvent() --> - <modify-function signature="nativeEventFilter(const QByteArray&,void*,long*)"> + <modify-function signature="nativeEventFilter(const QByteArray&,void*,qintptr*)"> <modify-argument index="3"> <remove-argument/> <conversion-rule class="native"> @@ -2231,7 +2073,7 @@ <object-type name="QFileDevice" since="5.0"> <enum-type name="FileError"/> <enum-type name="FileTime" since="5.10"/> - <enum-type name="MemoryMapFlags"/> + <enum-type name="MemoryMapFlag" flags="MemoryMapFlags"/> <enum-type name="Permission" flags="Permissions"/> <enum-type name="FileHandleFlag" flags="FileHandleFlags"/> <extra-includes> @@ -2243,7 +2085,7 @@ </modify-argument> <inject-code file="../glue/qtcore.cpp" snippet="qfiledevice-unmap"/> </modify-function> - <modify-function signature="map(qint64,qint64,QFileDevice::MemoryMapFlags)"> + <modify-function signature="map(qint64,qint64,QFlags<QFileDevice::MemoryMapFlag>)"> <modify-argument index="return"> <replace-type modified-type="PyObject"/> </modify-argument> @@ -2252,8 +2094,8 @@ <modify-function signature="flush()" allow-thread="yes"/> </object-type> <object-type name="QFile"> - <modify-function signature="open(QFlags<QIODevice::OpenModeFlag>)" allow-thread="yes"/> - <modify-function signature="open(int,QFlags<QIODevice::OpenModeFlag>,QFlags<QFileDevice::FileHandleFlag>)" allow-thread="yes"/> + <modify-function signature="open(QFlags<QIODeviceBase::OpenModeFlag>)" allow-thread="yes"/> + <modify-function signature="open(int,QFlags<QIODeviceBase::OpenModeFlag>,QFlags<QFileDevice::FileHandleFlag>)" allow-thread="yes"/> <modify-function signature="copy(const QString&)" allow-thread="yes"/> <modify-function signature="copy(const QString&,const QString&)" allow-thread="yes"/> <modify-function signature="link(const QString&)" allow-thread="yes"/> @@ -2267,8 +2109,7 @@ <object-type name="QFileSelector"/> <object-type name="QIODevice"> - <enum-type name="OpenModeFlag" flags="OpenMode"/> - <modify-function signature="open(QFlags<QIODevice::OpenModeFlag>)" allow-thread="yes"/> + <modify-function signature="open(QFlags<QIODeviceBase::OpenModeFlag>)" allow-thread="yes"/> <modify-function signature="close()" allow-thread="yes"/> <modify-function signature="seek(qint64)" allow-thread="yes"/> <modify-function signature="readAll()" allow-thread="yes"/> @@ -2315,9 +2156,12 @@ <inject-code class="native" position="end" file="../glue/qtcore.cpp" snippet="return-readData"/> </modify-function> </object-type> + <value-type name="QIODeviceBase" since="6.0"> + <enum-type name="OpenModeFlag" flags="OpenMode"/> + </value-type> <object-type name="QCryptographicHash"> <enum-type name="Algorithm"/> - <modify-function signature="addData(const char*,int)"> + <modify-function signature="addData(const char*,qsizetype)"> <modify-argument index="2"> <remove-argument /> </modify-argument> @@ -2328,7 +2172,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> @@ -2413,40 +2257,7 @@ <include file-name="QUrl" location="global"/> </extra-includes> </object-type> - <object-type name="QTextCodec"> - <enum-type name="ConversionFlag" flags="ConversionFlags"/> - - <object-type name="ConverterState"> - <include file-name="QTextCodec" location="global"/> - <modify-function signature="ConverterState(QFlags<QTextCodec::ConversionFlag>)"> - <modify-argument index="1"> - <replace-default-expression with="QTextCodec::DefaultConversion"/> - </modify-argument> - </modify-function> - </object-type> - - <modify-function signature="setCodecForLocale(QTextCodec*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <!-- fromUnicode(QString) does the job --> - <modify-function signature="fromUnicode(const QChar*,int,QTextCodec::ConverterState*)const" remove="all"/> - <modify-function signature="convertFromUnicode(const QChar*,int,QTextCodec::ConverterState*)const" remove="all"/> - <!-- this causes a warning that I cannot avoid. See suppressed warning at the end. --> - </object-type> - <object-type name="QTextDecoder"> - <!-- ### toUnicode(QByteArray) does the job --> - <modify-function signature="toUnicode(const char*,int)" remove="all"/> - <modify-function signature="toUnicode(QString*,const char*,int)" remove="all"/> - <!-- ### --> - </object-type> - <object-type name="QTextEncoder"> - <!-- fromUnicode(QString) does the job --> - <modify-function signature="fromUnicode(const QChar*,int)" remove="all"/> - </object-type> <object-type name="QTimeLine"> - <enum-type name="CurveShape"/> <enum-type name="Direction"/> <enum-type name="State"/> </object-type> @@ -2500,7 +2311,6 @@ <modify-function signature="readAllStandardOutput()" allow-thread="yes"/> <modify-function signature="readAllStandardError()" allow-thread="yes"/> <modify-function signature="execute(QString,QStringList)" allow-thread="yes"/> - <modify-function signature="execute(QString)" allow-thread="yes"/> <modify-function signature="startDetached(QString,QStringList,QString,qint64*)"> <modify-argument index="4"> <remove-argument /> @@ -2510,15 +2320,6 @@ </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qprocess-startdetached"/> </modify-function> - <!-- Function removed because on windows it returns a win32 specific structure --> - <modify-function signature="pid()const" remove="all"/> - <add-function signature="pid()" return-type="long"> - <inject-code file="../glue/qtcore.cpp" snippet="qprocess-pid"/> - </add-function> - <!--### Obsolete in 4.3--> - <modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/> - <modify-function signature="readChannelMode()const" remove="all"/> - <!-- ### --> </object-type> <object-type name="QSignalMapper"/> @@ -2568,7 +2369,6 @@ <!-- blocking functions --> <modify-function signature="processEvents(QFlags<QEventLoop::ProcessEventsFlag>,int)" allow-thread="yes"/> <modify-function signature="processEvents(QFlags<QEventLoop::ProcessEventsFlag>)" allow-thread="yes"/> - <modify-function signature="flush()" allow-thread="yes"/> <modify-function signature="sendEvent(QObject*,QEvent*)" allow-thread="yes"/> <modify-function signature="sendPostedEvents(QObject*,int)" allow-thread="yes"/> <modify-function signature="instance()"> @@ -2594,15 +2394,6 @@ <extra-includes> <include file-name="QStringList" location="global"/> </extra-includes> - <!--### Obsolete in 4.3--> - <modify-function signature="setSystemIniPath(const QString&)" remove="all"/> - <modify-function signature="setUserIniPath(const QString&)" remove="all"/> - <!--### Obsolete in 4.3--> - <modify-function signature="iniCodec()const"> - <modify-argument index="return"> - <define-ownership class="target" owner="default"/> - </modify-argument> - </modify-function> <!-- PYSIDE-1010: We remove the original implementation of value() to include the optional parameter --> <modify-function signature="value(const QString&,const QVariant&)const" remove="all"/> @@ -2791,14 +2582,14 @@ <enum-type name="RealNumberNotation"/> <enum-type name="Status"/> <!-- Removed because it expect QString to be mutable --> - <modify-function signature="QTextStream(QString*,QFlags<QIODevice::OpenModeFlag>)" remove="all"/> + <modify-function signature="QTextStream(QString*,QFlags<QIODeviceBase::OpenModeFlag>)" remove="all"/> <!-- Qt5.5: Removed because it expect QString to be mutable --> <modify-function signature="readLineInto(QString*,qint64)" since="5.5" remove="all"/> <!-- Removed because we use the non-const version --> - <modify-function signature="QTextStream(const QByteArray&,QFlags<QIODevice::OpenModeFlag>)" remove="all"/> + <modify-function signature="QTextStream(const QByteArray&,QFlags<QIODeviceBase::OpenModeFlag>)" remove="all"/> <!-- Removed because it expect QString to be mutable --> - <modify-function signature="setString(QString*,QFlags<QIODevice::OpenModeFlag>)" remove="all"/> + <modify-function signature="setString(QString*,QFlags<QIODeviceBase::OpenModeFlag>)" remove="all"/> <modify-function signature="operator<<(const void*)" remove="all"/> <modify-function signature="operator<<(float)" remove="all"/> @@ -2875,8 +2666,14 @@ <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&) const" remove="all"/> <modify-function signature="fromList(const QList<QXmlStreamAttribute> &)" remove="all"/> <modify-function signature="operator+=(QVector<QXmlStreamAttribute>)" remove="all"/> + <!-- Expose operator==, != inherited from QList, which the parser does + not see due to the TMP expression of the return type. --> + <add-function signature="operator==(const QXmlStreamAttributes&)" return-type="bool"/> + <add-function signature="operator!=(const QXmlStreamAttributes&)" return-type="bool"/> </value-type> <value-type name="QXmlStreamNamespaceDeclaration"/> <value-type name="QXmlStreamNotationDeclaration"/> @@ -2889,11 +2686,6 @@ <object-type name="QXmlStreamWriter"> <!-- Removed because it expect QString to be mutable --> <modify-function signature="QXmlStreamWriter(QString*)" remove="all"/> - <modify-function signature="codec()const"> - <modify-argument index="return"> - <define-ownership class="target" owner="default"/> - </modify-argument> - </modify-function> </object-type> <value-type name="QModelIndex" hash-function="qHash"> <modify-function signature="internalPointer()const"> @@ -2982,61 +2774,6 @@ <enum-type name="State"/> </object-type> - <object-type name="QAbstractState" since="4.6"> - <modify-function signature="machine()const"> - <modify-argument index="this"> - <parent index="return" action="add"/> - </modify-argument> - </modify-function> - </object-type> - - <object-type name="QAbstractTransition" since="4.6"> - <enum-type name="TransitionType" since="5.5"/> - - <modify-function signature="QAbstractTransition(QState*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - - <modify-function signature="addAnimation(QAbstractAnimation*)"> - <modify-argument index="1"> - <reference-count action="add"/> - </modify-argument> - </modify-function> - - <modify-function signature="removeAnimation(QAbstractAnimation*)"> - <modify-argument index="1"> - <reference-count action="remove"/> - </modify-argument> - </modify-function> - - <modify-function signature="setTargetState(QAbstractState*)"> - <modify-argument index="1"> - <reference-count action="set"/> - </modify-argument> - </modify-function> - - <modify-function signature="targetState()const"> - <modify-argument index="return"> - <reference-count action="set" variable-name="setTargetState(QAbstractState*)1"/> - </modify-argument> - </modify-function> - - <modify-function signature="targetStates()const"> - <modify-argument index="return"> - <reference-count action="set" variable-name="setTargetState(QAbstractState*)1"/> - </modify-argument> - </modify-function> - - <modify-function signature="setTargetStates(QList<QAbstractState*>)"> - <modify-argument index="1"> - <reference-count action="set" variable-name="setTargetState(QAbstractState*)1"/> - </modify-argument> - </modify-function> - - </object-type> - <object-type name="QAnimationGroup" since="4.6"> <modify-function signature="addAnimation(QAbstractAnimation*)"> <modify-argument index="1"> @@ -3111,48 +2848,6 @@ </extra-includes> </value-type> - <object-type name="QEventTransition" since="4.6"> - <modify-function signature="QEventTransition(QState*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - - <modify-function signature="QEventTransition(QObject*,QEvent::Type,QState*)"> - <modify-argument index="3"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - - </object-type> - - <object-type name="QFinalState" since="4.6"/> - - <object-type name="QHistoryState" since="4.6"> - <enum-type name="HistoryType"/> - <modify-documentation xpath='description/code'> - <code>machine = QStateMachine() - -s1 = QState() -s11 = QState(s1) -s12 = QState(s1) - -s1h = QHistoryState(s1) -s1h.setDefaultState(s11) - -machine.addState(s1) - -s2 = QState() -machine.addState(s2) - -button = QPushButton() -# Clicking the button will cause the state machine to enter the child state -# that s1 was in the last time s1 was exited, or the history state's default -# state if s1 has never been entered. -s1.addTransition(button.clicked, s1h)</code> - </modify-documentation> - </object-type> - <value-type name="QMargins" since="4.6"/> <value-type name="QMarginsF" since="5.3"/> @@ -3166,82 +2861,6 @@ s1.addTransition(button.clicked, s1h)</code> <object-type name="QSequentialAnimationGroup" since="4.6"/> - <object-type name="QSignalTransition" since="4.6"> - <add-function signature="QSignalTransition(PyObject*,QState*)" return-type="QSignalTransition*"> - <modify-argument index="2"> - <replace-default-expression with="0"/> - </modify-argument> - <inject-code file="../glue/qtcore.cpp" snippet="qsignaltransition"/> - </add-function> - </object-type> - - <object-type name="QState" since="4.6"> - <enum-type name="ChildMode"/> - <enum-type name="RestorePolicy"/> - <modify-function signature="addTransition(QAbstractTransition*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - - <modify-function signature="addTransition(const QObject*,const char*,QAbstractState*)"> - <modify-argument index="return"> - <parent index="this" action="add"/> - </modify-argument> - <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qstate-addtransition-1"/> - </modify-function> - <modify-function signature="addTransition(QAbstractState*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - - <!-- FIXME: the proper signature for this added function would be something like - addTransition(PySide2.QtCore.Signal, QAbstractState*) - but that depends on bug #362. --> - <add-function signature="addTransition(PyObject*,QAbstractState*)" return-type="QSignalTransition*"> - <modify-argument index="return"> - <parent index="this" action="add"/> - </modify-argument> - <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qstate-addtransition-2"/> - </add-function> - - <modify-function signature="removeTransition(QAbstractTransition*)"> - <modify-argument index="1"> - <parent index="this" action="remove"/> - </modify-argument> - </modify-function> - </object-type> - - <object-type name="QStateMachine" since="4.6"> - <enum-type name="Error"/> - <enum-type name="EventPriority"/> - - <value-type name="SignalEvent" since="4.6"/> - <value-type name="WrappedEvent" since="4.6"/> - - <modify-function signature="addState(QAbstractState*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="removeState(QAbstractState*)"> - <modify-argument index="1"> - <parent index="this" action="remove"/> - </modify-argument> - </modify-function> - - <add-function signature="configuration()" return-type="list of QAbstractState" > - <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qstatemachine-configuration"/> - </add-function> - - <!-- Replaced by a added function --> - <modify-function signature="defaultAnimations()const" remove="all"/> - <add-function signature="defaultAnimations()" return-type="list of QAbstractAnimation" > - <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qstatemachine-defaultanimations"/> - </add-function> - </object-type> - <object-type name="QVariantAnimation" since="4.6"/> <value-type name="QVersionNumber" since="5.6"> |