diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-07-03 23:51:58 +0200 |
---|---|---|
committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-08-07 15:01:26 +0200 |
commit | 3f6afac6b115b74c7d7946082ff2c0771cc3ccce (patch) | |
tree | 55803142947cee23017415b3049d4722a7386301 /tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp | |
parent | 096e268764397f781e72619e3b5f546d5786cae1 (diff) |
QPolygon: streamline constructors and special member functions
Employ RO0; inherit the constructors from the base class; and
do some code tidies as a drive by.
The inherited constructors bring in goodies like initializer_list
support.
Change-Id: Ia00a3f9b0ccbf182bf837bc65ba2305110c8dc60
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp')
-rw-r--r-- | tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp b/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp index 2187c1f141..a33e1559de 100644 --- a/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp +++ b/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp @@ -39,10 +39,8 @@ class tst_QPolygon : public QObject { Q_OBJECT -public: - tst_QPolygon(); - private slots: + void constructors(); void boundingRect_data(); void boundingRect(); void boundingRectF_data(); @@ -53,8 +51,33 @@ private slots: void intersections(); }; -tst_QPolygon::tst_QPolygon() +void constructors_helper(QPolygon) {} +void constructors_helperF(QPolygonF) {} + +void tst_QPolygon::constructors() { + constructors_helper(QPolygon()); + constructors_helper({}); + constructors_helper({ QPoint(1, 2), QPoint(3, 4)}); + constructors_helper({ {1, 2}, {3, 4} }); + constructors_helper(QPolygon(12)); + QList<QPoint> pointList; + constructors_helper(pointList); + constructors_helper(std::move(pointList)); + constructors_helper(QRect(1, 2, 3, 4)); + const int points[2] = { 10, 20 }; + constructors_helper(QPolygon(1, points)); + + constructors_helperF(QPolygonF()); + constructors_helperF({}); + constructors_helperF({ QPointF(1, 2), QPointF(3, 4)}); + constructors_helperF({ {1, 2}, {3, 4} }); + constructors_helperF(QPolygonF(12)); + constructors_helperF(QPolygon()); + QList<QPointF> pointFList; + constructors_helperF(pointFList); + constructors_helperF(std::move(pointFList)); + constructors_helperF(QRectF(1, 2, 3, 4)); } void tst_QPolygon::boundingRect_data() |