summaryrefslogtreecommitdiff
path: root/src/location
diff options
context:
space:
mode:
authorErik Mattsson <erik.mattsson@appello.com>2013-11-07 13:48:51 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-11 10:51:22 +0100
commit57705a918ae25f6234c75c67ec9b934cbf3fca9a (patch)
tree62978dc0935dcbc40105eca546164f0462822a17 /src/location
parente63de105fe71a0d825f8c82c75f17f65614aeb03 (diff)
downloadqtlocation-57705a918ae25f6234c75c67ec9b934cbf3fca9a.tar.gz
Upgraded Nokia Route API from 6.2 to 7.2
Since the 7.2 API supports many more lanugages(23 compared to 4) and is the only version that supports China it was necessary to upgrade the nokia route plugin to 7.2. The major change is that 7.2 does not support multiple mode parameters which 6.2 did. Now if the user selects multiple route optimizations multiple requests will be made, one for each optimization. Nokia has also reduced the amount of different route modes, only fastest and shortest are supported now. In the response part noting has changed, so no parsing fixes were necessary. Task-number: QTBUG-24808 Change-Id: I256079f9a1e91e11c961849c95b95b712021ace0 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/location')
-rw-r--r--src/location/maps/qgeoroutereply.cpp8
-rw-r--r--src/location/maps/qgeoroutereply.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/src/location/maps/qgeoroutereply.cpp b/src/location/maps/qgeoroutereply.cpp
index 0074ee4c..97e8c4cb 100644
--- a/src/location/maps/qgeoroutereply.cpp
+++ b/src/location/maps/qgeoroutereply.cpp
@@ -209,6 +209,14 @@ void QGeoRouteReply::setRoutes(const QList<QGeoRoute> &routes)
}
/*!
+ Appends the list of routes to the existing list.
+*/
+void QGeoRouteReply::addRoutes(const QList<QGeoRoute> &routes)
+{
+ d_ptr->routes.append(routes);
+}
+
+/*!
Cancels the operation immediately.
This will do nothing if the reply is finished.
diff --git a/src/location/maps/qgeoroutereply.h b/src/location/maps/qgeoroutereply.h
index dc22b0a2..96a052fb 100644
--- a/src/location/maps/qgeoroutereply.h
+++ b/src/location/maps/qgeoroutereply.h
@@ -88,6 +88,7 @@ protected:
void setFinished(bool finished);
void setRoutes(const QList<QGeoRoute> &routes);
+ void addRoutes(const QList<QGeoRoute> &routes);
private:
QGeoRouteReplyPrivate *d_ptr;