summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Gaist <samuel.gaist@idiap.ch>2018-09-10 21:55:37 +0200
committerSamuel Gaist <samuel.gaist@idiap.ch>2018-09-12 06:12:08 +0000
commit9e1523f40c6b376829c3eb513a7a5922fc2172ff (patch)
treeb242111167b190d627ae00ec5ae6ae401f862301
parent81101e29b7f79f9514dde560ebb8e05f795119f8 (diff)
QGeoPath: fix clear APIv5.12.0-alpha1
Change the clear method name from clearPath to just clear to follow more closely the other Qt APIs. Change-Id: I98d4ea43e69e3d365c2c470e9b8b14479f288fe6 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r--src/positioning/qgeopath.cpp2
-rw-r--r--src/positioning/qgeopath.h2
-rw-r--r--tests/auto/qgeopath/tst_qgeopath.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/positioning/qgeopath.cpp b/src/positioning/qgeopath.cpp
index 3747474e..35d82b5f 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::clearPath()
+void QGeoPath::clear()
{
Q_D(QGeoPath);
d->clearPath();
diff --git a/src/positioning/qgeopath.h b/src/positioning/qgeopath.h
index e4af2add..cda6f277 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 clearPath();
+ void clear();
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 43028427..97bf69fe 100644
--- a/tests/auto/qgeopath/tst_qgeopath.cpp
+++ b/tests/auto/qgeopath/tst_qgeopath.cpp
@@ -181,7 +181,7 @@ void tst_QGeoPath::path()
QCOMPARE(p.path().contains(c), true);
}
- p.clearPath();
+ p.clear();
QCOMPARE(p.path().size(), 0);
QVERIFY(p.boundingGeoRectangle().isEmpty());
}