Remove alternative labels

Currently there is uncertainty on how alternative
labels should be handled so remove for now.  For
most use cases this won't be needed anyway.

If necessary we can add these in at a later point in time.

Change-Id: I24e719bd394d60787f12234ddbe8e9aaa683d53c
Reviewed-on: http://codereview.qt.nokia.com/2097
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>

1 files changed, 0 insertions, 18 deletions

diff --git a/src/location/qgeolocation.cpp b/src/location/qgeolocation.cpp
index a03f21e4..57e5f15a 100644
--- a/src/location/qgeolocation.cpp
+++ b/src/location/qgeolocation.cpp
@@ -54,7 +54,6 @@ QGeoLocationPrivate::QGeoLocationPrivate(const QGeoLocationPrivate &other)
 {
     this->additionalData = other.additionalData;
     this->address = other.address;
-    this->alternativeLabels = other.alternativeLabels;
     this->coordinate = other.coordinate;
     this->navigationPositions = other.navigationPositions;
     this->label = other.label;
@@ -70,7 +69,6 @@ bool QGeoLocationPrivate::operator==(const QGeoLocationPrivate &other) const
 {
     return  (this->additionalData == other.additionalData
             && this->address == other.address
-            && this->alternativeLabels == other.alternativeLabels
             && this->coordinate == other.coordinate
             && this->navigationPositions == other.navigationPositions
             && this->label == other.label
@@ -162,22 +160,6 @@ void QGeoLocation::setAddress(const QGeoAddress &address)
 }
 
 /*!
-    Returns alternative labels.
-*/
-QList<QPlaceAlternativeValue> QGeoLocation::alternativeLabels() const
-{
-    return d->alternativeLabels;
-}
-
-/*!
-    Sets alternative labels.
-*/
-void QGeoLocation::setAlternativeLabels(const QList<QPlaceAlternativeValue> &labels)
-{
-    d->alternativeLabels = labels;
-}
-
-/*!
     Returns the location's coordinate.
 */
 QGeoCoordinate QGeoLocation::coordinate() const