summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@qt.io>2018-06-29 10:58:32 +0200
committerPaolo Angelelli <paolo.angelelli@qt.io>2018-07-03 12:40:50 +0000
commitf97a875d527f3898040e7cbee77339eece21c035 (patch)
tree57d87e54c2c06128d5c904f3aa5b89e1b6d918e5
parent178d6a3295336a43c33b8d39cfd36de638e9d4f4 (diff)
downloadqtlocation-f97a875d527f3898040e7cbee77339eece21c035.tar.gz
Fix naming in qgeopolygon.cpp
Documentation as well as variant conversions global static had the wrong name. Change-Id: I43517d6a395a101520344e41cc2cbe97698ac0b2 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
-rw-r--r--src/positioning/qgeopolygon.cpp35
1 files changed, 17 insertions, 18 deletions
diff --git a/src/positioning/qgeopolygon.cpp b/src/positioning/qgeopolygon.cpp
index cbdda939..1dafd1e0 100644
--- a/src/positioning/qgeopolygon.cpp
+++ b/src/positioning/qgeopolygon.cpp
@@ -105,53 +105,53 @@ struct PolygonVariantConversions
}
};
-Q_GLOBAL_STATIC(PolygonVariantConversions, initPathConversions)
+Q_GLOBAL_STATIC(PolygonVariantConversions, initPolygonConversions)
/*!
- Constructs a new, empty geo path.
+ Constructs a new, empty geo polygon.
*/
QGeoPolygon::QGeoPolygon()
: QGeoShape(new QGeoPolygonPrivate(QGeoShape::PolygonType))
{
- initPathConversions();
+ initPolygonConversions();
}
/*!
- Constructs a new geo \a path from a list of coordinates.
+ Constructs a new geo \a polygon from a list of coordinates.
*/
QGeoPolygon::QGeoPolygon(const QList<QGeoCoordinate> &path)
: QGeoShape(new QGeoPolygonPrivate(QGeoShape::PolygonType, path))
{
- initPathConversions();
+ initPolygonConversions();
}
/*!
- Constructs a new geo path from the contents of \a other.
+ Constructs a new geo polygon from the contents of \a other.
*/
QGeoPolygon::QGeoPolygon(const QGeoPolygon &other)
: QGeoShape(other)
{
- initPathConversions();
+ initPolygonConversions();
}
/*!
- Constructs a new geo path from the contents of \a other.
+ Constructs a new geo polygon from the contents of \a other.
*/
QGeoPolygon::QGeoPolygon(const QGeoShape &other)
: QGeoShape(other)
{
- initPathConversions();
+ initPolygonConversions();
if (type() != QGeoShape::PolygonType)
d_ptr = new QGeoPolygonPrivate(QGeoShape::PolygonType);
}
/*!
- Destroys this path.
+ Destroys this polygon.
*/
QGeoPolygon::~QGeoPolygon() {}
/*!
- Assigns \a other to this geo path and returns a reference to this geo path.
+ Assigns \a other to this geo polygon and returns a reference to this geo polygon.
*/
QGeoPolygon &QGeoPolygon::operator=(const QGeoPolygon &other)
{
@@ -160,7 +160,7 @@ QGeoPolygon &QGeoPolygon::operator=(const QGeoPolygon &other)
}
/*!
- Returns whether this geo path is equal to \a other.
+ Returns whether this geo polygon is equal to \a other.
*/
bool QGeoPolygon::operator==(const QGeoPolygon &other) const
{
@@ -169,7 +169,7 @@ bool QGeoPolygon::operator==(const QGeoPolygon &other) const
}
/*!
- Returns whether this geo path is not equal to \a other.
+ Returns whether this geo polygon is not equal to \a other.
*/
bool QGeoPolygon::operator!=(const QGeoPolygon &other) const
{
@@ -178,7 +178,7 @@ bool QGeoPolygon::operator!=(const QGeoPolygon &other) const
}
/*!
- Sets the \a path from a list of coordinates.
+ Sets the \a polygon from a list of coordinates.
*/
void QGeoPolygon::setPath(const QList<QGeoCoordinate> &path)
{
@@ -187,8 +187,7 @@ void QGeoPolygon::setPath(const QList<QGeoCoordinate> &path)
}
/*!
- Returns all the elements. Equivalent to QGeoShape::center().
- The center coordinate, in case of a QGeoPolygon, is the center of its bounding box.
+ Returns all the elements.
*/
const QList<QGeoCoordinate> &QGeoPolygon::path() const
{
@@ -197,7 +196,7 @@ const QList<QGeoCoordinate> &QGeoPolygon::path() const
}
/*!
- Translates this geo path by \a degreesLatitude northwards and \a degreesLongitude eastwards.
+ Translates this geo polygon by \a degreesLatitude northwards and \a degreesLongitude eastwards.
Negative values of \a degreesLatitude and \a degreesLongitude correspond to
southward and westward translation respectively.
@@ -309,7 +308,7 @@ void QGeoPolygon::removeCoordinate(int index)
}
/*!
- Returns the geo path properties as a string.
+ Returns the geo polygon properties as a string.
*/
QString QGeoPolygon::toString() const
{