From dc761b9007416b254eba18a300c5d7f91ca1c552 Mon Sep 17 00:00:00 2001 From: Samuel Gaist Date: Fri, 9 Nov 2018 21:28:23 +0100 Subject: QGeoPath: revert clear API to clearPath 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 --- src/positioning/qgeopath.cpp | 2 +- src/positioning/qgeopath.h | 2 +- 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 &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 &path); const QList &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()); } -- cgit v1.2.1