summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-6/+0
| | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: I03294a3ee43097ce535ef7c2805ee33a99e7dd25 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix resources not loading on static buildsThiago Marcos P. Santos2017-05-201-0/+10
| | | | | | | | | | | | | Explicitly call Q_INIT_RESOURCE, otherwise the resources are not found and the plugins using resources are broken when building Qt with -static. This patch also adds a prefix to these resources to avoid collision, since they are very generic like "logo.png" or "maps.json". Task-number: QTBUG-60007 Change-Id: Ifb73e9b97af107f2e24f5478f3de534bbd40e158 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Improving error reporting of HERE geoservice pluginPaolo Angelelli2016-06-281-1/+5
| | | | | | | | This patch makes the QGeoServiceProviderFactoryNokia spit clearer error messages if the mandatory parameters are present but incorrect Change-Id: I7d46409e7ea7d7517dd6c28f3679d60ebf619d5b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add "here" prefix to all Here geoservices parametersAlex Blasche2015-05-271-6/+11
| | | | | | | Task-number: QTBUG-42151 Change-Id: I3d71ee77327478dfdda23af709bee489f83bb9f6 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* 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>
* Use QStringLiteral whereever possibleAlex Blasche2014-05-151-2/+2
| | | | | | | This replaces a lot of old QLatin1String cases Change-Id: I47aec711f5e00de68bde6c2c8ee09506f577cfd4 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix some name inconsistencies in QtLocationAlex Blasche2013-09-031-2/+2
| | | | | | | | | | | | | 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>
* Update copyright year to 2013Sergio Ahumada2013-06-131-1/+1
| | | | | Change-Id: I5b0cb7d56997ad7b91c073b3e02b31d0368fdcfa Reviewed-by: Alex <alexander.blasche@digia.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>
* Removed unused files.abcd2012-06-211-1/+0
| | | | | | | | The v1 engine functionality was switched off some time ago. The class was not removed at that time, remove it now. Change-Id: Ib9ed219306d9169b0ff0d3734bd588f5b3b73bf4 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Removing old placesv1 interface.Chris Axiarlis2012-06-051-7/+1
| | | | | | | | The places v1 is no longer supported on the backend. Users shoudd upgrade if useing the C++ interface. Change-Id: I97ff768b0b3559f3ae38d4f310bc8948f3dc122a Reviewed-by: abcd <amos.choy@nokia.com>
* Populate error information if required parameters (app_id and token) are absent.Vladimir Bezkorovainyi2012-06-041-67/+49
| | | | | Change-Id: Ia110416b1cd64425abcb3ebcf79209b635050b0b Reviewed-by: Jean Gressmann <jean.gressmann@nokia.com>
* QtLocation/Nokia plugin: Removed service authentication data and refs.Jean Gressmann2012-05-251-3/+0
| | | | | | | Task-number: QTBUG-25497 Change-Id: I43357def9db11bfbe5f9fe14c963f22f11f05310 Reviewed-by: Jean Gressmann <jean.gressmann@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: whitespace around pointers/referencesAlex Wilson2012-05-151-8/+8
| | | | | | Change-Id: Ie527591e2d9a1578137136fb6664e86c43eed1bf Reviewed-by: Thomas Lowe <thomas.lowe@nokia.com> Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
* Change uses of {to,from}Ascii to {to,from}Latin1Thiago Macieira2012-05-081-2/+2
| | | | | | | | | | This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: I2e16486d80df6257ab88dc8c3b5d9dd497a19708 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Refactore network access manager for mock purposesvladimirb2012-05-041-66/+34
| | | | | | Change-Id: I230171ac85ac53f79aef8b58ee2cb24253789f34 Reviewed-by: Cristian Adam <cristian.adam@nokia.com> Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
* QtLocation/Nokia plugin: Added initial routing tests with mocked network.Jean Gressmann2012-04-301-18/+59
| | | | | | | | | | | | | | These tests test the server reply is properly processed and the values are what we expect in the end. Also tested: - trash reponses, - no route errors, - network errors, - backward compatible responses (those with tags the implementation doesn't (yet) understand) are tested. Change-Id: I3407e1b7f256f7af967a1f6b42f14b012e8a2909 Reviewed-by: Cristian Adam <cristian.adam@nokia.com> Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
* Wrap network access to enable testing in Nokia pluginJean Gressmann2012-04-271-5/+22
| | | | | | | | | This enables subsequent testing of the stack (from C++) without being connected to the network. Change-Id: I55ad5ece9c323ec82a493d059f1418f68169c5e6 Task-number: QTBUG-25416 Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
* QtLocation/Nokia plugin: Print usage terms fixupJean Gressmann2012-04-201-1/+47
| | | | | | | | | | | | Instead of only printing the usage terms when using the tile mapping service the terms are now printed regardless of the service used from Nokia's location plugin. Note that the usage terms are only printed at most once per plugin initialization. Change-Id: I665ed97552c811e0f5e2b06a7ff1d522f823601a Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Change default REST server to version 2.alex2012-03-211-1/+1
| | | | | | | | Version 1 was a development enabler and is likely to be removed before the final Qt 5.0 release. Change-Id: I8f8bbbf48e8486de794751b92f73770e36a58186 Reviewed-by: abcd <amos.choy@nokia.com>
* Refactoring of QtLocation APIBasel Hashisho2012-03-091-2/+2
| | | | | | | | | | | | | | | | | | | | | Refactoring QGeoMap, QGeoMappingManager, QGeoMappingManagerEngine Introducing QGeoMapData, QGeoTiledMap, QGeoTiledMappingManagerEngine, QGeoTileFetcher QGeoMap: Container for QGeoMapData QGeoMapData: No tiles data/functionality QGeoTiledMapData: Implements tiles data/functionality. QGeoMappingManager: Looses tiles-related data/functionality. QGeoMappingManagerEngine => QGeoMappingManagerEngine (no tiles data/functionality) QGeoTiledMappingManagerEngine (implements tiles-related data/functionality). QGeoTileFetcher: Implements tile fetching functionality from tiles provider. This commit compiles and runs through mapviewer example. Tests also were adjusted to fit refactored architecture. Change-Id: Id2b62d62d5cd4aaca8295c67e44c009cde636462 Reviewed-by: Alex <alex.blasche@nokia.com>
* New plugin API changes, centralized geoservice feature detectionAlex Wilson2012-03-051-17/+0
| | | | | | | | | | | | | | | This change adapts geoservice plugins to use the new Qt5 plugin API, performing boolean feature detection all through the JSON blobs rather than methods on factories or managers. As a result of this centralisation, it was also necessary to rework the QML API for the Plugin element a little. Some additional changes were made to the declarative places plugin to prevent it crashing due to plugins becoming available later than they did previously. Task-number: QTBUG-24331 Change-Id: I26149987344b67091480449103ab1712c869b2a5 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Add support for the new Nokia REST API to nokia plugin.Aaron McCarthy2012-02-091-2/+10
| | | | | | | | | | | | | | | Support is added in such a way that both the v1 and v2 REST APIs are supported by the plugin. By default the v1 API is used. The application developer can explicitly select v2 by setting the places.api_version plugin parameter to 2. At some point the default will change to v2 and support for v1 and places.api_version may be dropped entirely. The new REST API is documented at http://api.places.lbs.maps.nokia.com/places/static/doc/index.html Change-Id: I643d10202ab387346fa4658f096a6ddbb5e80e34 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>
* Remove qmobilitypluginsearch.halex2011-11-101-0/+5
| | | | | | | | | We use QFactoryLoader from now on. This doubles up the keys() and providerName() methods on the two factory interfaces but this will be fixed by a separate change. Change-Id: I5f2cee40f44e0760d40f87ebd53d2ca15cfc2ec5 Reviewed-by: Aaron McCarthy <aaron.mccarthy@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 QGeoSearchManager to QGeocodingManagerabcd2011-08-091-3/+3
| | | | | | | | | 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>
* Incorporate places/nokia plugin into geoservices/nokia plugin.Aaron McCarthy2011-07-291-0/+8
| | | | | | | | | | | | This brings the usage of the Places API inline with the rest of the functional groups in QtLocation. Removes the PlaceManager element. Change-Id: I6d7259fe7ea1e55dcf97b95025e0c78748e82b9f Reviewed-on: http://codereview.qt.nokia.com/2245 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* make QtLocation work while Qt is compiled with namespaceAlex2011-06-211-0/+4
| | | | Task-number: QTBUG-19972
* Update licenseheader text in source files for qtlocation Qt moduleJyri Tahtela2011-05-241-18/+18
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* add Ovi rest plugin to LocationAlex2011-05-101-0/+96
View Lorry Controller Status