diff options
author | abcd <qt-info@nokia.com> | 2011-06-20 14:30:23 +1000 |
---|---|---|
committer | abcd <qt-info@nokia.com> | 2011-06-20 14:30:23 +1000 |
commit | caadf51f4371348b34404c2cbadb44a6568bd185 (patch) | |
tree | a64ccfc119a2d374928886c63ee7da70fe24ba51 /src/plugins | |
parent | a71224c25aa23b1be597fe2c17f5a9c9725e2eac (diff) | |
download | qtlocation-caadf51f4371348b34404c2cbadb44a6568bd185.tar.gz |
Use QGeoCoordinate instead of QPlaceGeoCoordinate
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/places/nokia/qplacejsondetailsparser.cpp | 4 | ||||
-rw-r--r-- | src/plugins/places/nokia/qplacejsonsearchparser.cpp | 8 | ||||
-rw-r--r-- | src/plugins/places/nokia/qplacerestmanager.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/places/nokia/qplacejsondetailsparser.cpp b/src/plugins/places/nokia/qplacejsondetailsparser.cpp index f57ffca7..fb8c0393 100644 --- a/src/plugins/places/nokia/qplacejsondetailsparser.cpp +++ b/src/plugins/places/nokia/qplacejsondetailsparser.cpp @@ -52,8 +52,8 @@ #include <QtScript/QScriptValue> #include <QtScript/QScriptValueIterator> +#include <qgeocoordinate.h> #include <qplace.h> -#include <qplacegeocoordinate.h> #include <qplacecontact.h> #include <qplacecategory.h> #include <qplacedescription.h> @@ -451,7 +451,7 @@ QPlaceLocation QPlaceJSonDetailsParser::processLocation(const QScriptValue &loca QPlaceLocation newLocation; QScriptValue property = location.property(place_geoCoordinates_element); if (property.isValid()) { - QPlaceGeoCoordinate pos; + QGeoCoordinate pos; QScriptValue value = property.property(place_geoCoordinates_longitude_value); if (value.isValid() && !value.toString().isEmpty()) { bool isConverted; diff --git a/src/plugins/places/nokia/qplacejsonsearchparser.cpp b/src/plugins/places/nokia/qplacejsonsearchparser.cpp index c0c917db..09dac999 100644 --- a/src/plugins/places/nokia/qplacejsonsearchparser.cpp +++ b/src/plugins/places/nokia/qplacejsonsearchparser.cpp @@ -53,7 +53,7 @@ #include <QtScript/QScriptValueIterator> #include <qplace.h> -#include <qplacegeocoordinate.h> +#include <qgeocoordinate.h> #include <qplacecontact.h> #include <qplacelocation.h> #include <qplaceaddress.h> @@ -347,15 +347,15 @@ void QPlaceJSonSearchParser::processLocation(const QScriptValue &properties, QPl longitude = value.toString().toDouble(&lonOK); } if (latOK && lonOK) { - QPlaceGeoCoordinate pos; + QGeoCoordinate pos; pos.setLatitude(latitude); pos.setLongitude(longitude); location.setDisplayPosition(pos); } // bounding box - QPlaceGeoCoordinate bottomRight; - QPlaceGeoCoordinate topLeft; + QGeoCoordinate bottomRight; + QGeoCoordinate topLeft; latOK = false; lonOK = false; value = properties.property(search_properties_latitude_bb1_value); diff --git a/src/plugins/places/nokia/qplacerestmanager.cpp b/src/plugins/places/nokia/qplacerestmanager.cpp index 47f05238..0b9a348a 100644 --- a/src/plugins/places/nokia/qplacerestmanager.cpp +++ b/src/plugins/places/nokia/qplacerestmanager.cpp @@ -253,7 +253,7 @@ QString QPlaceRestManager::prepareSearchRequest(const QPlaceSearchQuery &query) searchString += const_views; searchString += const_deviceproductid; // process search center - QPlaceGeoCoordinate searchCentre = query.searchCenter(); + QGeoCoordinate searchCentre = query.searchCenter(); if (searchCentre.isValid()) { searchString += const_lat + QString::number(searchCentre.latitude()); searchString += const_lon + QString::number(searchCentre.longitude()); |