diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-07-31 11:09:29 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-08-01 10:12:51 +0000 |
| commit | 1571c3a71512e80f02ce4b33b73ae28465a87258 (patch) | |
| tree | c0edb849403a3a27bf13eab74ee3d2cd168dddef | |
| parent | 0f7a3f846e8d844913fff522afdcd4d3fce044f6 (diff) | |
Clean up some unused suppression warnings
Change-Id: I261ec7ec933e21658d357ad1ffbeb4de5b84d13f
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
(cherry picked from commit afaa32e287d1c46168e80cc186d6f560f954dec3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
8 files changed, 5 insertions, 65 deletions
diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml index 60af4c5d9..35ded2153 100644 --- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml +++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml @@ -3368,7 +3368,6 @@ <suppress-warning text="^Anonymous enum.*does not have a type entry.*$"/> <suppress-warning text="Visibility of function '*' modified in class '*'"/> - <suppress-warning text="hiding of function '*' in class '*'"/> <suppress-warning text="Shadowing: *"/> <suppress-warning text="^namespace '.*' does not have a type entry.*$"/> <!-- QCborStreamReader: Suppress warnings about 32/64bit signatures not found depending on qsizetype --> diff --git a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml index 5d84c689d..c5336f44e 100644 --- a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml +++ b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml @@ -1438,8 +1438,6 @@ </inject-code> </add-function> </object-type> - <!-- Qt5.5: suppress this nameless enum --> - <suppress-warning text="enum 'QWheelEvent::DefaultDeltasPerStep' does not have a type entry or is not an enum"/> <object-type name="QWindowStateChangeEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::WindowStateChange"> <add-function signature="__repr__" return-type="PyObject"> @@ -2514,18 +2512,6 @@ </add-function> </value-type> - <suppress-warning text="template baseclass 'QListSpecialMethods<T>' of 'QList' is not known"/> - <suppress-warning text="template baseclass 'QGenericMatrix<float>' of '*' is not known"/> - - <!-- Qt5: note: the unnamed enum cannot be rejected by - <rejection class="QMatrix4x4" enum-name="enum_1"/> - Instead, we have to suppress the warning. Why that? - - Compare also the note at the beginning of typesystem_widgets_common.xml . - This seems to be a related problem with unnamed structures in shiboken. - --> - <suppress-warning text="enum 'QMatrix4x4::enum_1' is specified in typesystem, but not declared"/> - <object-type name="QSessionManager"> <extra-includes> </extra-includes> @@ -2533,9 +2519,6 @@ <!-- ### --> </object-type> - <!-- This enum is present on QtCore --> - <suppress-warning text="enum 'QCoreApplication::ApplicationFlags' is specified in typesystem, but not declared"/> - <!-- Qt5: here the new QWindow stuff and what it pulls in --> <object-type name="QBackingStore"/> <object-type name="QSurface"> diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml index 4fd7f7f24..19770dacf 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml @@ -716,6 +716,4 @@ </object-type> </object-type> - <suppress-warning text="^There's no user provided way.*QOpenGLFunctions_\d_\d.*::glIndex.*$"/> - </typesystem> diff --git a/sources/pyside6/PySide6/QtRemoteObjects/typesystem_remoteobjects.xml b/sources/pyside6/PySide6/QtRemoteObjects/typesystem_remoteobjects.xml index 1894a8bc6..0926b9b25 100644 --- a/sources/pyside6/PySide6/QtRemoteObjects/typesystem_remoteobjects.xml +++ b/sources/pyside6/PySide6/QtRemoteObjects/typesystem_remoteobjects.xml @@ -41,7 +41,8 @@ <suppress-warning text="^.*Typedef used on signal QRemoteObject.*$"/> <suppress-warning text="^QRemoteObjectPendingCallWatcher inherits from a non polymorphic type.*$"/> - <suppress-warning text="Enum 'QRemoteObjectReplica::ConstructorType' (class: QRemoteObjectReplica) does not have a type entry"/> + <suppress-warning text="^Enum 'QRemoteObjectReplica::ConstructorType'.*does not have a type entry.*$"/> + <suppress-warning text="Stripping argument #1 of void QRemoteObjectReplica::QRemoteObjectReplica(QRemoteObjectReplica::ConstructorType) due to unmatched type "QRemoteObjectReplica::ConstructorType" with default expression "DefaultConstructor"."/> <suppress-warning text="skipping field 'QRemoteObjectReplica::d_impl' with unmatched type 'QSharedPointer'"/> <!-- QtNetwork is pulled in via QtRemoteObjectsDepends. --> <suppress-warning text="^Scoped enum 'Q(Ocsp)|(Dtls).*' does not have a type entry.*$"/> diff --git a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml index 2778b745a..7594248da 100644 --- a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml @@ -3364,21 +3364,6 @@ <!-- The above entries may be present in the system or not. Keep this section organized. --> - <!-- This enum is present on QtCore --> - <suppress-warning text="enum 'QCoreApplication::ApplicationFlags' is specified in typesystem, but not declared"/> - <suppress-warning text="QGraphicsEllipseItem::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsItemGroup::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsItem::UserType' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsLineItem::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsPathItem::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsPixmapItem::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsPolygonItem::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsProxyWidget::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsRectItem::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsSimpleTextItem::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsSvgItem::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsTextItem::Type' does not have a type entry or is not an enum"/> - <suppress-warning text="QGraphicsWidget::Type' does not have a type entry or is not an enum"/> <suppress-warning text="signal 'activated' in class 'QCompleter' is overloaded."/> <suppress-warning text="signal 'highlighted' in class 'QCompleter' is overloaded."/> </typesystem> diff --git a/sources/pyside6/tests/pysidetest/typesystem_pysidetest.xml b/sources/pyside6/tests/pysidetest/typesystem_pysidetest.xml index f8a8d2b6b..bd959f7e3 100644 --- a/sources/pyside6/tests/pysidetest/typesystem_pysidetest.xml +++ b/sources/pyside6/tests/pysidetest/typesystem_pysidetest.xml @@ -75,12 +75,4 @@ <smart-pointer-type name="QSharedPointer" type="shared" getter="data" reset-method="reset"/> - <suppress-warning text="type 'QPyTextObject' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> - <!-- Qt5: I never really understood this warning. Probably it is because there - is no way to instantiate the class. Anyway, why must this class emit this warning? - I am not a C++ warrior, so I'd prefer if it would say "it is ok if you see this warning!". - Well, maybe somebody will enlighten me, and I'll change this comment. - I'd actually prefer an implementation that avoids generating this message, but I still failed - doing so :-( - --> </typesystem> diff --git a/sources/shiboken6/tests/otherbinding/typesystem_other.xml b/sources/shiboken6/tests/otherbinding/typesystem_other.xml index 4081548fc..ade1c8bad 100644 --- a/sources/shiboken6/tests/otherbinding/typesystem_other.xml +++ b/sources/shiboken6/tests/otherbinding/typesystem_other.xml @@ -17,8 +17,4 @@ <typedef-type name="ValueWithUnitIntInch" source="ValueWithUnit<int,LengthUnit::Inch>"/> <typedef-type name="ValueWithUnitIntMillimeter" source="ValueWithUnit<int,LengthUnit::Millimeter>"/> <value-type name="OtherValueWithUnitUser"/> - - <suppress-warning text="signature 'operator!=(ByteArray,const char*)' for function modification in 'ByteArray' not found." /> - <suppress-warning text="signature 'operator+(ByteArray,const char*)' for function modification in 'ByteArray' not found." /> - <suppress-warning text="signature 'operator==(ByteArray,const char*)' for function modification in 'ByteArray' not found." /> </typesystem> diff --git a/sources/shiboken6/tests/samplebinding/typesystem_sample.xml b/sources/shiboken6/tests/samplebinding/typesystem_sample.xml index 25d303a27..90543a630 100644 --- a/sources/shiboken6/tests/samplebinding/typesystem_sample.xml +++ b/sources/shiboken6/tests/samplebinding/typesystem_sample.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <typesystem package="sample"> - <suppress-warning text="Duplicate type entry: 'sample'" /> - <suppress-warning text="Duplicate type entry: 'SampleNamespace'" /> - <primitive-type name="ObjectType::Identifier"/> <primitive-type name="std::nullptr_t"/> @@ -430,7 +427,7 @@ </value-type> <value-type name="ClassWithFunctionPointer"> - <suppress-warning text="skipping function 'ClassWithFunctionPointer::callFunctionPointer', unmatched parameter type 'void (*)(void*)'" /> + <suppress-warning text="^skipping function 'void ClassWithFunctionPointer::callFunctionPointer.*$" /> </value-type> <value-type name="IntArray" generate="no"/> @@ -2417,20 +2414,9 @@ <suppress-warning text="horribly broken type '__off64_t'" /> <suppress-warning text="enum '__codecvt_result' does not have a type entry or is not an enum" /> - <suppress-warning text="Pure virtual method "Abstract::hideFunction(HideType*)" must be implement but was completely removed on typesystem." /> - <suppress-warning text="hiding of function 'takeChild' in class 'ObjectType'" /> + <suppress-warning text="Pure virtual method 'Abstract::hideFunction(HideType*)' must be implemented but was completely removed on type system." /> <suppress-warning text="Shadowing: MDerived2::castToBase3() and MDerived3::castToBase3()" /> - <suppress-warning text="hiding of function 'takeChild' in class 'Bucket'" /> - <suppress-warning text="visibility of function 'publicMethod' modified in class 'MDerived1'" /> - <suppress-warning text="hiding of function 'doNothingInPublic3' in class 'Overload2'" /> - <suppress-warning text="hiding of function 'takeChild' in class 'ObjectModel'" /> - <suppress-warning text="hiding of function 'takeChild' in class 'ObjectView'" /> - <suppress-warning text="visibility of function 'publicMethod' modified in class 'MDerived3'" /> - <suppress-warning text="skipping function 'InjectCode::toStr', unmatched parameter type 'T const&'" /> + <suppress-warning text="Visibility of function 'publicMethod' modified in class 'MDerived1'" /> <suppress-warning text="^skipping function 'std::enable_if.*ComparisonTester::operator[!=]=.*ComparisonTester.*$"/> - - <!-- Do not fix this warning, the generator should be able to handle this situation for Object Types. --> - <suppress-warning text="Argument in position 1 of added function 'SampleNamespace::passReferenceToObjectType(ObjectType * arg__1)', has a type that is not a reference, while the argument in the corresponding position in C++ function 'SampleNamespace::passReferenceToObjectType(const ObjectType & obj, int multiplier)' is a reference." /> - </typesystem> |