diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-04 10:36:15 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-09 10:26:40 +0000 |
| commit | 8f7de769636f36bcf371c472480adab75a32e0bf (patch) | |
| tree | 69d4c4bf6bd1602decf7a5bd9075934494379ece | |
| parent | 685a71f75c64ea778920c3ad8a967cfe1462e8b6 (diff) | |
Clean up some warnings
- Remove QByteArray::replace()
- Remove QTextList::isEmpty()
- Adapt signature of QWidget::enterEvent()
- Adapt signature of QTextBoundaryFinder
- Remove free math functions which were changed to templates
in Qt 6.
Todo what about the free funcs...qSin(), etc.
they are now templates
Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: Ic72b2853a000726aaa307bc3790a9b2824bf6b62
Reviewed-by: Christian Tismer <tismer@stackless.com>
3 files changed, 3 insertions, 9 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index d7eaf84d6..2bed158a9 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -1805,9 +1805,6 @@ <modify-function signature="append(const char*)" remove="all"/> <modify-function signature="prepend(const char*)" remove="all"/> <modify-function signature="replace(QByteArray,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(char,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>(const char*,QByteArray)" remove="all"/> @@ -2035,7 +2032,7 @@ <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"/> diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index f8716b727..4c32e4821 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -1267,10 +1267,7 @@ <object-type name="QTextItem"> <enum-type name="RenderFlag" flags="RenderFlags"/> </object-type> - <object-type name="QTextList" > - <!--### Obsolete in 4.3--> - <modify-function signature="isEmpty()const" remove="all"/> - </object-type> + <object-type name="QTextList"/> <object-type name="QTextObject"/> <object-type name="QTextObjectInterface" > <modify-function signature="drawObject(QPainter*,QRectF,QTextDocument*,int,QTextFormat)"> diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml index 512f540f4..c0d760586 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml @@ -2026,7 +2026,7 @@ <rename to="event"/> </modify-argument> </modify-function> - <modify-function signature="enterEvent(QEvent*)"> + <modify-function signature="enterEvent(QEnterEvent*)"> <modify-argument index="1" invalidate-after-use="yes"> <rename to="event"/> </modify-argument> |