diff options
author | Samuel Gaist <samuel.gaist@idiap.ch> | 2018-11-09 21:28:23 +0100 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-11-10 19:59:09 +0000 |
commit | dc761b9007416b254eba18a300c5d7f91ca1c552 (patch) | |
tree | 21445e2e6413c78de10325d40c75f501c95574aa | |
parent | f777e851f5992a3b813e0d0c68f947c2a2f764fa (diff) |
QGeoPath: revert clear API to clearPathv5.12.0-rc2v5.12.0-rc1v5.12.0
The original name was correct as clear would need to reset more
properties which is was not the goal of this method.
Change-Id: Iac43a61e4b8bf57220c88d627b33578612c4ddad
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r-- | src/positioning/qgeopath.cpp | 2 | ||||
-rw-r--r-- | src/positioning/qgeopath.h | 2 | ||||
-rw-r--r-- | tests/auto/qgeopath/tst_qgeopath.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/positioning/qgeopath.cpp b/src/positioning/qgeopath.cpp index beb43692..0c3d0c1c 100644 --- a/src/positioning/qgeopath.cpp +++ b/src/positioning/qgeopath.cpp @@ -204,7 +204,7 @@ const QList<QGeoCoordinate> &QGeoPath::path() const \since 5.12 */ -void QGeoPath::clear() +void QGeoPath::clearPath() { Q_D(QGeoPath); d->clearPath(); diff --git a/src/positioning/qgeopath.h b/src/positioning/qgeopath.h index cda6f277..e4af2add 100644 --- a/src/positioning/qgeopath.h +++ b/src/positioning/qgeopath.h @@ -72,7 +72,7 @@ public: void setPath(const QList<QGeoCoordinate> &path); const QList<QGeoCoordinate> &path() const; - void clear(); + void clearPath(); void setVariantPath(const QVariantList &path); QVariantList variantPath() const; diff --git a/tests/auto/qgeopath/tst_qgeopath.cpp b/tests/auto/qgeopath/tst_qgeopath.cpp index 213af0ad..47badf73 100644 --- a/tests/auto/qgeopath/tst_qgeopath.cpp +++ b/tests/auto/qgeopath/tst_qgeopath.cpp @@ -182,7 +182,7 @@ void tst_QGeoPath::path() QCOMPARE(p.path().contains(c), true); } - p.clear(); + p.clearPath(); QCOMPARE(p.path().size(), 0); QVERIFY(p.boundingGeoRectangle().isEmpty()); } |