From dccf28b7c344822b7459635099ebe3abdf5fd107 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 17 Apr 2020 17:19:24 +0200 Subject: Remove deprecated members from several QtGui classes Those can be trivially removed as they have direct replacements, or are completely unused. The migration path for QCursor::bitmap and QCursor::mask is QBitmap *pb = c.bitmap(); // up to 5.15, warns in 5.15 QBitmap vb = c.bitmap(Qt::ReturnByValue); // from 5.15, works in 6 QBitmap b = c.bitmap(); // from 6.0 on Change-Id: I3b3acd1c7f09c4c8414e98b3ce11986f1ecd5eda Reviewed-by: Shawn Rutledge --- tests/auto/gui/painting/qregion/tst_qregion.cpp | 37 ------------------------- 1 file changed, 37 deletions(-) (limited to 'tests/auto/gui/painting/qregion/tst_qregion.cpp') diff --git a/tests/auto/gui/painting/qregion/tst_qregion.cpp b/tests/auto/gui/painting/qregion/tst_qregion.cpp index aa9a84ba8e..3aa556f2a8 100644 --- a/tests/auto/gui/painting/qregion/tst_qregion.cpp +++ b/tests/auto/gui/painting/qregion/tst_qregion.cpp @@ -155,19 +155,12 @@ void tst_QRegion::rects() QRegion region(rect); QVERIFY(region.isEmpty()); QCOMPARE(region.begin(), region.end()); -#if QT_DEPRECATED_SINCE(5, 11) - QVERIFY(region.rects().isEmpty()); -#endif } { QRect rect(10, -20, 30, 40); QRegion region(rect); QCOMPARE(region.end(), region.begin() + 1); QCOMPARE(*region.begin(), rect); -#if QT_DEPRECATED_SINCE(5, 11) - QCOMPARE(region.rects().count(), 1); - QCOMPARE(region.rects()[0], rect); -#endif } { QRect r(QPoint(10, 10), QPoint(40, 40)); @@ -214,9 +207,6 @@ void tst_QRegion::setRects() QCOMPARE(region, QRegion()); QCOMPARE(region.begin(), region.end()); QVERIFY(!region.boundingRect().isValid()); -#if QT_DEPRECATED_SINCE(5, 11) - QVERIFY(region.rects().isEmpty()); -#endif } { QRegion region; @@ -224,19 +214,12 @@ void tst_QRegion::setRects() region.setRects(&rect, 1); QCOMPARE(region.begin(), region.end()); QVERIFY(!region.boundingRect().isValid()); -#if QT_DEPRECATED_SINCE(5, 11) - QVERIFY(region.rects().isEmpty()); -#endif } { QRegion region; QRect rect(10, -20, 30, 40); region.setRects(&rect, 1); QCOMPARE(region.end(), region.begin() + 1); -#if QT_DEPRECATED_SINCE(5, 11) - QCOMPARE(region.rects().count(), 1); - QCOMPARE(region.rects()[0], rect); -#endif QCOMPARE(*region.begin(), rect); } } @@ -355,9 +338,6 @@ void tst_QRegion::emptyPolygonRegion() std::copy(r.begin(), r.end(), std::back_inserter(rects)); QTEST(rects.size(), "numRects"); QTEST(rects, "rects"); -#if QT_DEPRECATED_SINCE(5, 11) - QCOMPARE(r.rects(), rects); -#endif } @@ -900,9 +880,6 @@ void tst_QRegion::isEmpty() QCOMPARE(region, QRegion()); QCOMPARE(region.rectCount(), 0); QCOMPARE(region.boundingRect(), QRect()); -#if QT_DEPRECATED_SINCE(5, 11) - QVERIFY(region.rects().isEmpty()); -#endif } void tst_QRegion::regionFromPath() @@ -918,12 +895,6 @@ void tst_QRegion::regionFromPath() QCOMPARE(rgn.begin()[0], QRect(0, 0, 10, 10)); QCOMPARE(rgn.begin()[1], QRect(0, 100, 100, 1000)); -#if QT_DEPRECATED_SINCE(5, 11) - QCOMPARE(rgn.rects().size(), 2); - QCOMPARE(rgn.rects().at(0), QRect(0, 0, 10, 10)); - QCOMPARE(rgn.rects().at(1), QRect(0, 100, 100, 1000)); -#endif - QCOMPARE(rgn.boundingRect(), QRect(0, 0, 100, 1100)); } @@ -940,14 +911,6 @@ void tst_QRegion::regionFromPath() QCOMPARE(rgn.begin()[2], QRect(90, 10, 10, 80)); QCOMPARE(rgn.begin()[3], QRect(0, 90, 100, 10)); -#if QT_DEPRECATED_SINCE(5, 11) - QCOMPARE(rgn.rects().size(), 4); - QCOMPARE(rgn.rects().at(0), QRect(0, 0, 100, 10)); - QCOMPARE(rgn.rects().at(1), QRect(0, 10, 10, 80)); - QCOMPARE(rgn.rects().at(2), QRect(90, 10, 10, 80)); - QCOMPARE(rgn.rects().at(3), QRect(0, 90, 100, 10)); -#endif - QCOMPARE(rgn.boundingRect(), QRect(0, 0, 100, 100)); } } -- cgit v1.2.3