From 26f9b9bab54ae9cbb86bd7783f226f6032834c06 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Mon, 26 Jan 2015 12:25:49 +0100 Subject: Rename positioning/flickr example to geoflickr This makes it more compliant with standard naming conventions and more easily distinguishes this example from flickr examples in other modules. Task-number: QTBUG-41831 Change-Id: Id4953777326a0463d57d52df92c70860addc61ff Reviewed-by: Friedemann Kleint Reviewed-by: Alex Blasche --- src/imports/positioning/qdeclarativeposition.cpp | 2 +- .../positioning/qdeclarativepositionsource.cpp | 2 +- src/positioning/doc/images/qml-flickr-1.jpg | Bin 58111 -> 66794 bytes .../doc/src/examples/declarative-flickr.qdoc | 87 --------------------- src/positioning/doc/src/examples/geoflickr.qdoc | 87 +++++++++++++++++++++ src/positioning/doc/src/qml-position.qdoc | 4 +- src/positioning/doc/src/qtpositioning.qdoc | 2 +- 7 files changed, 92 insertions(+), 92 deletions(-) delete mode 100644 src/positioning/doc/src/examples/declarative-flickr.qdoc create mode 100644 src/positioning/doc/src/examples/geoflickr.qdoc (limited to 'src') diff --git a/src/imports/positioning/qdeclarativeposition.cpp b/src/imports/positioning/qdeclarativeposition.cpp index 04b42cbc..ee971c01 100644 --- a/src/imports/positioning/qdeclarativeposition.cpp +++ b/src/imports/positioning/qdeclarativeposition.cpp @@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE \section2 Example Usage See the example given for the \l{PositionSource} type, or the - \l{flickr}{Flickr} example application. + \l{geoflickr}{GeoFlickr} example application. \sa PositionSource, coordinate */ diff --git a/src/imports/positioning/qdeclarativepositionsource.cpp b/src/imports/positioning/qdeclarativepositionsource.cpp index a770e664..b688758a 100644 --- a/src/imports/positioning/qdeclarativepositionsource.cpp +++ b/src/imports/positioning/qdeclarativepositionsource.cpp @@ -99,7 +99,7 @@ QT_BEGIN_NAMESPACE } \endcode - The \l{flickr}{Flickr} example application shows how to use + The \l{geoflickr}{GeoFlickr} example application shows how to use a PositionSource in your application to retrieve local data for users from a REST web service. diff --git a/src/positioning/doc/images/qml-flickr-1.jpg b/src/positioning/doc/images/qml-flickr-1.jpg index 14fc5c92..42514ff0 100644 Binary files a/src/positioning/doc/images/qml-flickr-1.jpg and b/src/positioning/doc/images/qml-flickr-1.jpg differ diff --git a/src/positioning/doc/src/examples/declarative-flickr.qdoc b/src/positioning/doc/src/examples/declarative-flickr.qdoc deleted file mode 100644 index a1d0bb58..00000000 --- a/src/positioning/doc/src/examples/declarative-flickr.qdoc +++ /dev/null @@ -1,87 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \example flickr - \title Flickr (QML) - \ingroup qtpositioning-examples - - \brief The Flickr example shows how to use the user's current position to - fetch local content from a web service. - - This is a small example, illustrating one of the very core parts of the - \l{Qt Positioning} API: the ability to retrieve and use the user's current - geographic position. - - Key QML types shown in this example: - \list - \li \l{QtPositioning::PositionSource}{PositionSource} - \li \l{XmlListModel}{XmlListModel} - \endlist - - \image qml-flickr-1.jpg - - \include examples-run.qdocinc - - \section1 Retrieving the Current Position - - Retrieving the user's current position is achieved using the PositionSource - type. In this example, we instantiate the PositionSource as part of the - GeoTab component (the floating "window" describing current position and - status). - - \snippet flickr/flickrmobile/GeoTab.qml possrc - - When the "Locate and update" button is pressed, we first interrogate the - PositionSource to check if it has an available backend for positioning - data. If it does not, we fall back to using a pre-recorded NMEA log - for demonstration. We then instruct the PositionSource to update. - - \snippet flickr/flickrmobile/GeoTab.qml locatebutton-top - \snippet flickr/flickrmobile/GeoTab.qml locatebutton-clicked - - To share the new position data with the rest of the application, we use - properties that we have created on the GeoTab component: - - \snippet flickr/flickrmobile/GeoTab.qml props - - \section1 Using the Current Position - - The longitude and latitude values retrieved here are eventually set on - in properties on the RestModel component. The RestModel is an XmlListModel, - which retrieves XML data from a URL and creates a data model by performing - XPath queries on it. - - In this case, it retrieves data from the Flickr REST API online, based on - our current position - - \snippet flickr/flickrcommon/RestModel.qml restmodel - - This model data is then shown in a variety of Qt Quick views to produce - the example application. - -*/ diff --git a/src/positioning/doc/src/examples/geoflickr.qdoc b/src/positioning/doc/src/examples/geoflickr.qdoc new file mode 100644 index 00000000..af47461b --- /dev/null +++ b/src/positioning/doc/src/examples/geoflickr.qdoc @@ -0,0 +1,87 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example geoflickr + \title GeoFlickr (QML) + \ingroup qtpositioning-examples + + \brief The GeoFlickr example shows how to use the user's current position to + fetch local content from a web service. + + This is a small example, illustrating one of the very core parts of the + \l{Qt Positioning} API: the ability to retrieve and use the user's current + geographic position. + + Key QML types shown in this example: + \list + \li \l{QtPositioning::PositionSource}{PositionSource} + \li \l{XmlListModel}{XmlListModel} + \endlist + + \image qml-flickr-1.jpg + + \include examples-run.qdocinc + + \section1 Retrieving the Current Position + + Retrieving the user's current position is achieved using the PositionSource + type. In this example, we instantiate the PositionSource as part of the + GeoTab component (the floating "window" describing current position and + status). + + \snippet geoflickr/flickrmobile/GeoTab.qml possrc + + When the "Locate and update" button is pressed, we first interrogate the + PositionSource to check if it has an available backend for positioning + data. If it does not, we fall back to using a pre-recorded NMEA log + for demonstration. We then instruct the PositionSource to update. + + \snippet geoflickr/flickrmobile/GeoTab.qml locatebutton-top + \snippet geoflickr/flickrmobile/GeoTab.qml locatebutton-clicked + + To share the new position data with the rest of the application, we use + properties that we have created on the GeoTab component: + + \snippet geoflickr/flickrmobile/GeoTab.qml props + + \section1 Using the Current Position + + The longitude and latitude values retrieved here are eventually set on + in properties on the RestModel component. The RestModel is an XmlListModel, + which retrieves XML data from a URL and creates a data model by performing + XPath queries on it. + + In this case, it retrieves data from the Flickr REST API online, based on + our current position + + \snippet geoflickr/flickrcommon/RestModel.qml restmodel + + This model data is then shown in a variety of Qt Quick views to produce + the example application. + +*/ diff --git a/src/positioning/doc/src/qml-position.qdoc b/src/positioning/doc/src/qml-position.qdoc index 3ccac326..ec1cf47a 100644 --- a/src/positioning/doc/src/qml-position.qdoc +++ b/src/positioning/doc/src/qml-position.qdoc @@ -111,9 +111,9 @@ PositionSource { -\section2 \b{Flickr Example} +\section2 \b{GeoFlickr Example} -The \l{Flickr (QML)}{Flickr Example} uses the Location to download thumbnail +The \l{GeoFlickr (QML)}{GeoFlickr Example} uses the Location to download thumbnail images from Flickr relevant to the current location. */ diff --git a/src/positioning/doc/src/qtpositioning.qdoc b/src/positioning/doc/src/qtpositioning.qdoc index ae74f89c..5662b0aa 100644 --- a/src/positioning/doc/src/qtpositioning.qdoc +++ b/src/positioning/doc/src/qtpositioning.qdoc @@ -114,7 +114,7 @@ such as speed and direction. This provides the fundamental location information \section2 Examples \list - \li \l {Flickr (QML)} + \li \l {GeoFlickr (QML)} \li \l {Log File Position Source (C++)} \li \l {SatelliteInfo (C++/QML)} \li \l {Weather Info (C++/QML)} -- cgit v1.2.1 From 272d30074e9b368f04c2486cd96c9f5fad3e88dc Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 3 Feb 2015 21:59:19 +0100 Subject: Add the QtCore/ library prefix in public headers Change-Id: I538f0de4d2fca50e42114934f12dfd0ee51088e9 Reviewed-by: Oswald Buddenhagen Reviewed-by: Alex Blasche --- src/location/maps/qgeocodingmanager.h | 6 +++--- src/location/maps/qgeomaneuver.h | 2 +- src/location/maps/qgeoroute.h | 6 +++--- src/location/maps/qgeoroutereply.h | 4 ++-- src/location/maps/qgeorouterequest.h | 6 +++--- src/location/maps/qgeoroutesegment.h | 4 ++-- src/location/maps/qgeoserviceproviderfactory.h | 6 +++--- src/location/places/qplaceattribute.h | 6 +++--- src/location/places/qplacecontactdetail.h | 6 +++--- src/location/places/qplacecontent.h | 6 +++--- src/location/places/qplacecontentrequest.h | 2 +- src/location/places/qplaceimage.h | 4 ++-- src/location/places/qplacemanager.h | 8 ++++---- src/location/places/qplacesearchresult.h | 6 +++--- src/location/places/qplacesearchsuggestionreply.h | 2 +- src/positioning/qgeoareamonitorsource.h | 4 ++-- src/positioning/qgeocoordinate.h | 2 +- src/positioning/qgeopositioninfo.h | 2 +- src/positioning/qgeopositioninfosource.h | 2 +- src/positioning/qgeopositioninfosourcefactory.h | 2 +- src/positioning/qgeosatelliteinfosource.h | 4 ++-- 21 files changed, 45 insertions(+), 45 deletions(-) (limited to 'src') diff --git a/src/location/maps/qgeocodingmanager.h b/src/location/maps/qgeocodingmanager.h index 821c755d..d40723af 100644 --- a/src/location/maps/qgeocodingmanager.h +++ b/src/location/maps/qgeocodingmanager.h @@ -37,9 +37,9 @@ #include #include -#include -#include -#include +#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeomaneuver.h b/src/location/maps/qgeomaneuver.h index 7b569cdc..cc1a4be1 100644 --- a/src/location/maps/qgeomaneuver.h +++ b/src/location/maps/qgeomaneuver.h @@ -34,7 +34,7 @@ #ifndef QGEOMANEUVER_H #define QGEOMANEUVER_H -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeoroute.h b/src/location/maps/qgeoroute.h index 46365027..669723f9 100644 --- a/src/location/maps/qgeoroute.h +++ b/src/location/maps/qgeoroute.h @@ -37,9 +37,9 @@ #include #include -#include -#include -#include +#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeoroutereply.h b/src/location/maps/qgeoroutereply.h index 532226a7..06a74d4f 100644 --- a/src/location/maps/qgeoroutereply.h +++ b/src/location/maps/qgeoroutereply.h @@ -36,8 +36,8 @@ #include -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeorouterequest.h b/src/location/maps/qgeorouterequest.h index e510d5bb..bb847274 100644 --- a/src/location/maps/qgeorouterequest.h +++ b/src/location/maps/qgeorouterequest.h @@ -34,9 +34,9 @@ #ifndef QGEOROUTEREQUEST_H #define QGEOROUTEREQUEST_H -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/location/maps/qgeoroutesegment.h b/src/location/maps/qgeoroutesegment.h index f6d29a58..ccc1c1d6 100644 --- a/src/location/maps/qgeoroutesegment.h +++ b/src/location/maps/qgeoroutesegment.h @@ -34,8 +34,8 @@ #ifndef QGEOROUTESEGMENT_H #define QGEOROUTESEGMENT_H -#include -#include +#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeoserviceproviderfactory.h b/src/location/maps/qgeoserviceproviderfactory.h index 2b539fa2..bbde8904 100644 --- a/src/location/maps/qgeoserviceproviderfactory.h +++ b/src/location/maps/qgeoserviceproviderfactory.h @@ -36,9 +36,9 @@ #include -#include -#include -#include +#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplaceattribute.h b/src/location/places/qplaceattribute.h index da6a7c06..43fd2e47 100644 --- a/src/location/places/qplaceattribute.h +++ b/src/location/places/qplaceattribute.h @@ -34,9 +34,9 @@ #ifndef QPLACEATTRIBUTE_H #define QPLACEATTRIBUTE_H -#include -#include -#include +#include +#include +#include #include diff --git a/src/location/places/qplacecontactdetail.h b/src/location/places/qplacecontactdetail.h index 8d96bca2..b4729398 100644 --- a/src/location/places/qplacecontactdetail.h +++ b/src/location/places/qplacecontactdetail.h @@ -34,9 +34,9 @@ #ifndef QPLACECONTACTDETAIL_H #define QPLACECONTACTDETAIL_H -#include -#include -#include +#include +#include +#include #include diff --git a/src/location/places/qplacecontent.h b/src/location/places/qplacecontent.h index 3724a418..530ee02c 100644 --- a/src/location/places/qplacecontent.h +++ b/src/location/places/qplacecontent.h @@ -35,9 +35,9 @@ #include -#include -#include -#include +#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplacecontentrequest.h b/src/location/places/qplacecontentrequest.h index 95cc8075..23485e0c 100644 --- a/src/location/places/qplacecontentrequest.h +++ b/src/location/places/qplacecontentrequest.h @@ -34,7 +34,7 @@ #ifndef QPLACECONTENTREQUEST_H #define QPLACECONTENTREQUEST_H -#include +#include #include diff --git a/src/location/places/qplaceimage.h b/src/location/places/qplaceimage.h index f6b0758a..d7aa63d6 100644 --- a/src/location/places/qplaceimage.h +++ b/src/location/places/qplaceimage.h @@ -34,8 +34,8 @@ #ifndef QPLACEIMAGE_H #define QPLACEIMAGE_H -#include -#include +#include +#include #include #include diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h index e57a286b..21daadb5 100644 --- a/src/location/places/qplacemanager.h +++ b/src/location/places/qplacemanager.h @@ -45,10 +45,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplacesearchresult.h b/src/location/places/qplacesearchresult.h index a3285d9b..92da39f7 100644 --- a/src/location/places/qplacesearchresult.h +++ b/src/location/places/qplacesearchresult.h @@ -34,9 +34,9 @@ #ifndef QPLACESEARCHRESULT_H #define QPLACESEARCHRESULT_H -#include -#include -#include +#include +#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplacesearchsuggestionreply.h b/src/location/places/qplacesearchsuggestionreply.h index e53873c1..950ad040 100644 --- a/src/location/places/qplacesearchsuggestionreply.h +++ b/src/location/places/qplacesearchsuggestionreply.h @@ -36,7 +36,7 @@ #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/positioning/qgeoareamonitorsource.h b/src/positioning/qgeoareamonitorsource.h index 642bb4e7..88d01dc8 100644 --- a/src/positioning/qgeoareamonitorsource.h +++ b/src/positioning/qgeoareamonitorsource.h @@ -37,8 +37,8 @@ #include #include -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/positioning/qgeocoordinate.h b/src/positioning/qgeocoordinate.h index 0896b5f6..deef67f2 100644 --- a/src/positioning/qgeocoordinate.h +++ b/src/positioning/qgeocoordinate.h @@ -36,7 +36,7 @@ #include #include -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/positioning/qgeopositioninfo.h b/src/positioning/qgeopositioninfo.h index 865f5bdf..8debb806 100644 --- a/src/positioning/qgeopositioninfo.h +++ b/src/positioning/qgeopositioninfo.h @@ -35,7 +35,7 @@ #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/positioning/qgeopositioninfosource.h b/src/positioning/qgeopositioninfosource.h index f76161cc..e71b766d 100644 --- a/src/positioning/qgeopositioninfosource.h +++ b/src/positioning/qgeopositioninfosource.h @@ -35,7 +35,7 @@ #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/positioning/qgeopositioninfosourcefactory.h b/src/positioning/qgeopositioninfosourcefactory.h index 776cd1f3..4db92fe6 100644 --- a/src/positioning/qgeopositioninfosourcefactory.h +++ b/src/positioning/qgeopositioninfosourcefactory.h @@ -37,7 +37,7 @@ #include #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/positioning/qgeosatelliteinfosource.h b/src/positioning/qgeosatelliteinfosource.h index 7dfd70b6..bd21db4f 100644 --- a/src/positioning/qgeosatelliteinfosource.h +++ b/src/positioning/qgeosatelliteinfosource.h @@ -35,8 +35,8 @@ #include -#include -#include +#include +#include QT_BEGIN_NAMESPACE -- cgit v1.2.1 From d7a6fe8286cd402a8f81ec11d62f8107099726ab Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Fri, 6 Feb 2015 19:59:56 +0100 Subject: Remove duplicate includes Change-Id: I52374c69558c550504b56927501a9b3b337dcc6d Reviewed-by: Alex Blasche --- src/location/maps/qgeoserviceprovider.cpp | 1 - src/positioning/qgeocoordinate.cpp | 2 -- 2 files changed, 3 deletions(-) (limited to 'src') diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp index 5b8f8282..1cf989ee 100644 --- a/src/location/maps/qgeoserviceprovider.cpp +++ b/src/location/maps/qgeoserviceprovider.cpp @@ -58,7 +58,6 @@ #include #include #include -#include #include QT_BEGIN_NAMESPACE diff --git a/src/positioning/qgeocoordinate.cpp b/src/positioning/qgeocoordinate.cpp index e2a77bfd..629f00c8 100644 --- a/src/positioning/qgeocoordinate.cpp +++ b/src/positioning/qgeocoordinate.cpp @@ -42,8 +42,6 @@ #include -#include - #ifndef M_PI #define M_PI 3.14159265358979323846 #endif -- cgit v1.2.1 From e27168074c9062f453059a6d95d1d99ca05b166c Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Fri, 6 Feb 2015 20:05:44 +0100 Subject: Use single-char QString operations for efficiency Change-Id: I45cf92e81e94cf62a21de2e01d9f8039ec1f2672 Reviewed-by: Alex Blasche --- src/imports/positioning/qdeclarativepositionsource.cpp | 2 +- src/plugins/geoservices/nokia/qgeocodexmlparser.cpp | 2 +- .../geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp | 10 +++++----- src/plugins/geoservices/nokia/qgeouriprovider.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/imports/positioning/qdeclarativepositionsource.cpp b/src/imports/positioning/qdeclarativepositionsource.cpp index b688758a..f42518f3 100644 --- a/src/imports/positioning/qdeclarativepositionsource.cpp +++ b/src/imports/positioning/qdeclarativepositionsource.cpp @@ -243,7 +243,7 @@ void QDeclarativePositionSource::setNmeaSource(const QUrl &nmeaSource) } else if (localFileName.startsWith("qrc:/")) { localFileName.remove(0, 5); } - if (!QFile::exists(localFileName) && localFileName.startsWith("/")) { + if (!QFile::exists(localFileName) && localFileName.startsWith('/')) { localFileName.remove(0,1); } } diff --git a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp index 7862c470..fec7ba30 100644 --- a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp +++ b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp @@ -412,7 +412,7 @@ bool QGeoCodeXmlParser::parseAddress(QGeoAddress *address) } if (inThoroughfare && (m_reader->name() == "number")) { - address->setStreet(m_reader->readElementText() + " " + address->street()); + address->setStreet(m_reader->readElementText() + ' ' + address->street()); if (!m_reader->readNextStartElement()) inThoroughfare = false; } diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp index ce4deaef..f8c29c7b 100644 --- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp @@ -246,7 +246,7 @@ QStringList QGeoRoutingManagerEngineNokia::calculateRouteRequestString(const QGe baseRequest += QString::number(i); baseRequest += QStringLiteral("=geo!"); baseRequest += trimDouble(request.waypoints().at(i).latitude()); - baseRequest += ","; + baseRequest += ','; baseRequest += trimDouble(request.waypoints().at(i).longitude()); } @@ -283,7 +283,7 @@ QStringList QGeoRoutingManagerEngineNokia::updateRouteRequestString(const QGeoRo baseRequest += "&pos="; baseRequest += QString::number(position.latitude()); - baseRequest += ","; + baseRequest += ','; baseRequest += QString::number(position.longitude()); QGeoRouteRequest::RouteOptimizations optimization = route.request().routeOptimization(); @@ -328,7 +328,7 @@ QString QGeoRoutingManagerEngineNokia::modesRequestString(const QGeoRouteRequest QString weightString = ""; switch (weight) { case QGeoRouteRequest::PreferFeatureWeight: - weightString = "1"; + weightString = '1'; break; case QGeoRouteRequest::AvoidFeatureWeight: weightString = "-1"; @@ -370,9 +370,9 @@ QString QGeoRoutingManagerEngineNokia::modesRequestString(const QGeoRouteRequest } requestString += "&mode="; - requestString += optimization + ";" + modes.join(","); + requestString += optimization + ';' + modes.join(','); if (featureStrings.count()) - requestString += ";" + featureStrings.join(","); + requestString += ';' + featureStrings.join(','); return requestString; } diff --git a/src/plugins/geoservices/nokia/qgeouriprovider.cpp b/src/plugins/geoservices/nokia/qgeouriprovider.cpp index 932818a5..ceb86cf8 100644 --- a/src/plugins/geoservices/nokia/qgeouriprovider.cpp +++ b/src/plugins/geoservices/nokia/qgeouriprovider.cpp @@ -83,7 +83,7 @@ QString QGeoUriProvider::getCurrentHost() const { if (m_maxSubdomains) { QString result(m_firstSubdomain.toLatin1() + qrand() % m_maxSubdomains); - result += "." + m_currentHost; + result += '.' + m_currentHost; return result; } return m_currentHost; -- cgit v1.2.1 From 09f3e81e7306096294b65cecee899fd32bd7d406 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Fri, 6 Feb 2015 15:28:36 +0100 Subject: Fix non-building geoservices plugins Change-Id: I2f0e896e3fff64ddf69d91a8053f98f3424f3747 Reviewed-by: Oswald Buddenhagen --- src/plugins/plugins.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 099f7995..35b462d4 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs qtHaveModule(positioning): SUBDIRS += position -qtHaveModule(location) SUBDIRS += geoservices +qtHaveModule(location): SUBDIRS += geoservices -- cgit v1.2.1