summaryrefslogtreecommitdiff
path: root/src/location/places/qplacesearchresult.h
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Add the QtCore/ library prefix in public headersSergio Ahumada2015-02-091-3/+3
| | | | | | Change-Id: I538f0de4d2fca50e42114934f12dfd0ee51088e9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@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>
* Support explore functionality.Aaron McCarthy2013-07-261-1/+4
| | | | | | | | | | | | | | | | | | | | | Add support for Nokia's explore functionality in places. This adds the ProposedSearchResult search result type. The proposed search result has a QPlaceSearchRequest, which can be submitted to QPlaceManager::search() to perform the proposed search. This has the added advantage that any arbitrary search request can be returned as a search result. To facilitate this further a search context field has been added to the place search request. This field can be used by backends to store additional search context. Other relevant fields should also be filled in. This allows additional search context to be kept. The Nokia v2 places implementation has be updated to use the explore feature and to return ProposedSearchResults as well as place results. Task-number: QTBUG-24874 Change-Id: Ib20c5a8c8a60e6bf16f38dcd75961a752b8b1b32 Reviewed-by: Alex <alexander.blasche@digia.com>
* Remove use of QT_{BEGIN,END}_HEADER macros.Aaron McCarthy2013-02-031-4/+0
| | | | | | | | | These macros were removed from Qt Core and they are no longer defined causing Qt Location to fail to build. Change-Id: Ibed30daa1a802957cebe95a577dfe86f0f643970 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.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>
* Declare types as moveableabcd2012-09-191-0/+2
| | | | | Change-Id: Iec7d8670576a34b7978675078565cf1335c7385b Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Refactor Search Resultsabcd2012-06-201-9/+21
| | | | | | | | The different types of search results should be spearated into different classes. Change-Id: I21f43e7979f9f0ae1dfb51e0b619a7c855a469bb Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Remove correctionsabcd2012-06-141-5/+1
| | | | | | | | | | | | The new REST server doesn't support did you mean corrections. This combined with the fact that a more generic solution to provide corrections is intended to be provided later on means that it is not worthwhile providing corrections as they are currently implemented, they will soon be deprecated anyway. Change-Id: I674aba99dc3cdc0eb0fc48d928a2146f5e792a2f Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* enum reorderabcd2012-06-131-2/+2
| | | | | Change-Id: I29c9dff7e16bdf903079b973e0318ee3cf87c21f Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Add sponsored field/role to place search results.Aaron McCarthy2012-02-211-0/+3
| | | | | | | | | Place search results can be either sponsored or organic search results. This adds a sponsored field/role so that applications can distinguish between the two. Change-Id: I10c9a5699b1c013a2b7ba8ac8100348213a68b8a Reviewed-by: abcd <amos.choy@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>
* Fixup temporary QtLocation export.alex2011-10-211-1/+1
| | | | | | | Q_LOCATION_EXPORT_TEMP -> Q_LOCATION_EXPORT Change-Id: I65b1d9c59ab2d2ad437f1934013eb53b0b96e606 Reviewed-by: Alex <alex.blasche@nokia.com>
* Remove QT_MODULE(Location) from public Location classesalex2011-10-191-1/+1
| | | | | | | | Removing all location related defines from qglobal.h causes this macro to fail. It seems that it is no longer used in new modules. Change-Id: Ifbfa6f7f40a419e0890a4611bab7e2d681f63a04 Reviewed-by: Alex <alex.blasche@nokia.com>
* First step of removal of Q_LOCATION_EXPORT macro from qglobal.halex2011-10-171-1/+1
| | | | | | | | | Each module handles each its own exports. We need to change the QtLocation version, remove the qglobal.h define and then add it back under the old name in QtLocation Change-Id: I7530a251b78402215a466cd55a33ec24664786b7 Reviewed-by: Alex <alex.blasche@nokia.com>
* Improve naming consistency in Places API.Aaron McCarthy2011-10-101-15/+6
| | | | | | | Change-Id: Ic902592c3367a76fc0e23c237712224abbf31703 Reviewed-on: http://codereview.qt-project.org/6206 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Fix public headers.Aaron McCarthy2011-09-261-2/+6
| | | | | | | | | | | Add QT_{BEGIN,END}_HEADER Add QT_{BEGIN,END}_NAMESPACE Add QT_MODULE(Location) Change-Id: Ib12682b847d9439c0e55e78fdf8a71ee8406c282 Reviewed-on: http://codereview.qt-project.org/5435 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> 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>
* Remove MatchTypeabcd2011-09-231-9/+0
| | | | | | | | | The MatchType is not provided by the REST API Change-Id: If1149b1e0b934dde90468dacaabe82ee11995295 Reviewed-on: http://codereview.qt-project.org/5211 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Rename QGeoPlace to QPlaceabcd2011-09-231-3/+3
| | | | | | | | | | | | | | | | | | 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>
* Remove DeclarativeSearchResult.Aaron McCarthy2011-08-231-2/+2
| | | | | | | | | | Properties of the QDeclarativeSearchResult are now exported as roles in the models. Change-Id: Ib3a8e0baabd8e8318d5e37b12b7171f7c237fb11 Reviewed-on: http://codereview.qt.nokia.com/3354 Reviewed-by: abcd <qt_abcd1@ovi.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Allow places branch to work when Qt is built in a namespace.Aaron McCarthy2011-07-141-2/+2
| | | | | | | | | Change QTM_* to QT_*. Change-Id: I8d0d0a53458ffb2f3ecc26d70a3542fb2cb1bf74 Reviewed-on: http://codereview.qt.nokia.com/1613 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: abcd <qt_abcd1@ovi.com>
* Use QGeoPlace instead of QPlaceabcd2011-06-221-3/+3
| | | | QGeoPlace was an already existing class in mobility.
* Add license headers to places filesabcd2011-06-171-0/+41
|
* Add plugin detection infrastructure + minor fixesabcd2011-06-101-1/+1
| | | | Also changes to keep in sync with the qt4 pre-release
* Use mobility namespace instead of places namespaceabcd2011-06-031-4/+4
|
* Initial dump of placesabcd2011-06-021-0/+72