From 08986f17f6059034b345ab25bbd44f199a79c4cd Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 28 Mar 2025 09:21:28 +0100 Subject: [PATCH] tst_QGraphicsWidget: remove unneeded casts in setStyle() `fstyle` is already a QStyle*, so casting it to QStyle* is unneeded. Amends 9bc49b0bca361646aac90cd00706588d3dcd66c9. And 0 is a valid nullptr value, so we don't need to cast there, either. Amends the start of the public history. Drive-by port to nullptr. Pick-to: 6.8 6.5 5.15 Change-Id: If763b8bf42de9d8bbe988ac76773d02bb7a2b68b Reviewed-by: Axel Spoerl (cherry picked from commit dbfcd541552b51f831521c77fd44e753a97f04db) Reviewed-by: Qt Cherry-pick Bot --- .../graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index 32c44b3fd2b..bf957fce109 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp @@ -1360,10 +1360,10 @@ void tst_QGraphicsWidget::setStyle() if (!style.isEmpty()) { QStyle *fstyle = QStyleFactory::create(style); widget.setStyle(fstyle); - QCOMPARE(widget.style(), static_cast(fstyle)); + QCOMPARE(widget.style(), fstyle); } else { widget.setStyle(0); - QVERIFY(widget.style() != (QStyle *)0); + QVERIFY(widget.style() != nullptr); } QCOMPARE(widget.eventCount, oldEventCounts + 1); QCOMPARE(widget.testAttribute(Qt::WA_SetStyle), !style.isEmpty());