summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices/nokia/qgeocodereply_nokia.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'gerrit/5.8' into devAlex Blasche2016-12-051-1/+2
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/location/qdeclarativegeomap.cpp src/location/maps/maps.pri src/location/maps/qgeomap_p_p.h src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp src/plugins/geoservices/osm/qgeoroutereplyosm.cpp Change-Id: I18d31cff9233648178fe3e2636ce294026dfaeb7
| * Update "nokia" geoservices plugin to use HERE APIsChris Adams2016-11-161-1/+2
| | | | | | | | | | | | | | | | | | The old Nokia URL endpoints are being deprecated. This commit updates the "nokia" plugin to use the modern HERE API endpoints. It also removes the (now nonexistent) China-specific URLs. Change-Id: Ieaf75cef1538d0ebb6a22623fc041ab504cf491f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Refactoring: removing m_reply from GeoReply classesPaolo Angelelli2016-11-291-3/+0
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch tries to simplify the code removing the contained m_reply from all the Geo[Map,Route,Geocode,Places]Reply classes. The need for m_reply was associated to the "abort" method, but this can be solved by emitting a signal in the superclass abort() method, and connecting that to QNetworkReply::abort() in the constructor. Since QNetworkReplyHttpImpl always sends an OperationCanceledError it should then be safe to call deleteLater() on the network reply in the slot connected to QNetworkReply::error This patch also prevents the series of "QCoreApplication::postEvent: Unexpected null receiver" warnings that are generated due to deletingLater already deleted objects (abort() emits an error, the reply is destroyed inside the onError slot, but also in the abort() method). Finally, this patch removes the setFinished() call in QGeoRouteReply::abort() since the documentation does not mention this, and all the subclasses do not perform this operation and emit the corresponding signal. tst_qgeoroutereply has been adapted accordingly. Change-Id: I226ee163e7bed784dd7f0da1522e651459543bca Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Remove all Nokia specific license details.Alex Blasche2015-02-261-7/+0
| | | | | | | | | | | | The terms and conditions were not accurate anymore. Instead we refer to the relevant URL. In general the Nokia plugin is no different than other plugins. The user must comply with each services T&Cs. Nokia and Ovi don't exist anymore. The service runs under the Here term these days. Change-Id: Ie73b5cc9577946a2e1ce433ed67e0bca0b894a57 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Remove LGPLv2.1 and add GPLv2+ from/to QtLocationAlex Blasche2015-02-191-14/+17
| | | | | | Change-Id: I3007aa04d3dbc0e00cb0a43987d64d01ddf91edd Reviewed-by: Lorn Potter <lorn.potter@gmail.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* Update contact URL in all license headers to qt.ioAlex Blasche2015-02-181-1/+1
| | | | | Change-Id: Ia1e333be7fec8898de609d9b9303b1ad7687632e Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* Update license headers and add new license filesAntti Kokko2014-08-241-19/+11
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: Iedee2507ab1bd46788409a98505d7be510253110 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Parse Nokia geocode response in helper thread.Aaron McCarthy2014-03-141-0/+3
| | | | | Change-Id: I151bd5988d0340a8203aa9e014371989b023228b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix some name inconsistencies in QtLocationAlex Blasche2013-09-031-3/+3
| | | | | | | | | | | | | 1. Rename QGeocoding* classes to QGeoCoding*. This emphasizes the QGeo prefix rather than the geocing word. The QML interfaces continues to use the Geocoding* as they don't a prefix as such. 2. Rename QProposedSearchResult to QPlaceProposedSearchResult. The class is place related and should carry the QPlace name prefix Change-Id: I428c7e6368774a9f199db5c113de11649e4a665c Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Change copyright from 2012 to 2013Rainer Keller2013-01-171-1/+1
| | | | | Change-Id: I61ae1bd1a9f68d120d4e11635f306374b1f494d0 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-241-24/+24
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ic1390da64a219642fa1e1482a7677a4c2db15cbc Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Rename QGeoBoundingArea and related classes to QGeoShape.Aaron McCarthy2012-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | QGeoBoundingArea is used for describing more than just a bounding area. Renaming it to a more appropriate name, QGeoShape. The same is done for subclasses and QML equivalents. In C++: QGeoBoundingArea -> QGeoShape QGeoBoundingCircle -> QGeoCircle QGeoBoundingBox -> QGeoRectangle In QML: BoundingArea -> GeoShape BoundingCircle -> GeoCircle BoundingBox -> GeoRectangle Change-Id: I93c6df8f1b6c5179ed52fd8354a05f709063b1cf Reviewed-by: abcd <amos.choy@nokia.com>
* Renamed terms and conditions as Nokia.Chris Axiarlis2012-05-161-3/+3
| | | | | | | | | The OVI name was discontinued last year. This change reflects this change. Also the product is no longer called mobility. Change-Id: Ib6653eef8ad117f8bfd527719994661223d6c6e9 Reviewed-by: abcd <amos.choy@nokia.com> Reviewed-by: Alex <alex.blasche@nokia.com>
* Coding style fixes: use Q_SIGNALS/Q_SLOTSAlex Wilson2012-05-151-1/+1
| | | | | Change-Id: I64fd9e5430dcd6cca38bcef3cbe73a944223b17a Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Convert QGeoBoundingArea to use value type semantics.Aaron McCarthy2012-02-201-1/+1
| | | | | | | | | | | | | | This simplifies the API while keeping the same functionality. Objects of type QGeoBoundingCircle and QGeoBoundingBox can still be passed around as QGeoBoundingArea without losing their identity. QGeoBoundingArea::isValid(), ::isEmpty() and ::contains() function as one would expect. This change removes the necessity of the application developer to track and delete pointers. Change-Id: I1ee70af90319da4c77225c6a0a03601d5ff431f1 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-301-1/+1
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I00c66363046e475e6924aafd221483c7fad5c0d9 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-231-1/+1
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I3850177e14291901e924f9c27ba09e75df00f96a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-061-1/+1
| | | | | Change-Id: I496795d13a615be8d252ca20a40dd2c5ba84ed60 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix missing/outdated license headers.Aaron McCarthy2011-09-261-2/+2
| | | | | | | Change-Id: I9dbdf6f4974167a2a4229bd3bd798f7de36bfc10 Reviewed-on: http://codereview.qt-project.org/4939 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Rename QGeoPlace to QPlaceabcd2011-09-231-2/+2
| | | | | | | | | | | | | | | | | | This is to be more consistent with the other place classes like QPlaceManager. The alternative would be for everything to have the QGeo prefix e.g QGePlaceManager, QGeoPlaceCategory, the Geo prefix does not help much in avoiding name collisions since 'Place' shouldn't collide with anything anyway. For classes like routing the Geo prefix is necessary to give context for what's being routed. Change-Id: Ibcf6e6909a41ea0ce2c402e24b427496d06bf243 Reviewed-on: http://codereview.qt-project.org/5210 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Rename QGeoSearchManager to QGeocodingManagerabcd2011-08-091-0/+76
Also do related renames like QGeoSearchReply to QGeocodeReply Change-Id: I31cc6da4fda03299e905b4938cdfcff3c20aa8c7 Reviewed-on: http://codereview.qt.nokia.com/2710 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: abcd <qt_abcd1@ovi.com>