summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-03 00:47:02 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-03 01:49:48 (GMT)
commit24b06b04059b55018a84ca9423d528c8a09e320d (patch)
treedc40183511786139ade612356573b25223f02d6d
parentcc3bcb4a2efc192ecb8b6d3b44c39356d9fc4426 (diff)
Use QStringLiteral with GeoDataData constructor
-rw-r--r--src/lib/marble/EditBookmarkDialog.cpp4
-rw-r--r--src/lib/marble/osm/OsmRelationEditorDialog.cpp2
-rw-r--r--src/lib/marble/routing/RouteRequest.cpp2
-rw-r--r--src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.cpp2
-rw-r--r--src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp6
5 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/marble/EditBookmarkDialog.cpp b/src/lib/marble/EditBookmarkDialog.cpp
index 08658f3..9f4c87a 100644
--- a/src/lib/marble/EditBookmarkDialog.cpp
+++ b/src/lib/marble/EditBookmarkDialog.cpp
@@ -264,12 +264,12 @@ GeoDataPlacemark EditBookmarkDialog::bookmark() const
bookmark.setAbstractView( lookat );
}
- bookmark.extendedData().addValue( GeoDataData( "isBookmark", true ) );
+ bookmark.extendedData().addValue(GeoDataData(QStringLiteral("isBookmark"), true));
if(d->m_widget != 0) {
const QString celestialName = d->m_widget->model()->planetId();
if (celestialName != QLatin1String("earth")) {
- bookmark.extendedData().addValue( GeoDataData( "celestialBody", celestialName ) );
+ bookmark.extendedData().addValue(GeoDataData(QStringLiteral("celestialBody"), celestialName));
}
}
diff --git a/src/lib/marble/osm/OsmRelationEditorDialog.cpp b/src/lib/marble/osm/OsmRelationEditorDialog.cpp
index f4a29ed..4f00363 100644
--- a/src/lib/marble/osm/OsmRelationEditorDialog.cpp
+++ b/src/lib/marble/osm/OsmRelationEditorDialog.cpp
@@ -51,7 +51,7 @@ OsmRelationEditorDialog::OsmRelationEditorDialog( OsmPlacemarkData *relationData
// "osmRelaation=yes" entry is added to its ExtendedData to let the widget know
// its special relation status
GeoDataExtendedData extendedData;
- extendedData.addValue( GeoDataData( "osmRelation", "yes" ) );
+ extendedData.addValue(GeoDataData(QStringLiteral("osmRelation"), QStringLiteral("yes")));
m_dummyPlacemark->setExtendedData( extendedData );
m_dummyPlacemark->setOsmData( *m_relationData );
OsmObjectManager::initializeOsmData( m_dummyPlacemark );
diff --git a/src/lib/marble/routing/RouteRequest.cpp b/src/lib/marble/routing/RouteRequest.cpp
index de2c85f..2970697 100644
--- a/src/lib/marble/routing/RouteRequest.cpp
+++ b/src/lib/marble/routing/RouteRequest.cpp
@@ -300,7 +300,7 @@ QString RouteRequest::name( int index ) const
void RouteRequest::setVisited( int index, bool visited )
{
if ( index >= 0 && index < d->m_route.size() ) {
- d->m_route[index].extendedData().addValue( GeoDataData( "routingVisited", visited ) );
+ d->m_route[index].extendedData().addValue(GeoDataData(QStringLiteral("routingVisited"), visited));
QMap<PixmapElement, QPixmap>::iterator iter = d->m_pixmapCache.begin();
while ( iter != d->m_pixmapCache.end() ) {
if ( iter.key().index == index ) {
diff --git a/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.cpp b/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.cpp
index d3246d2..47ccbba 100644
--- a/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.cpp
+++ b/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.cpp
@@ -107,7 +107,7 @@ void GosmoreRunner::reverseGeocoding( const GeoDataCoordinates &coordinates )
QString road = fields.last().trimmed();
placemark.setAddress( road );
GeoDataExtendedData extendedData;
- extendedData.addValue( GeoDataData( "road", road ) );
+ extendedData.addValue(GeoDataData(QStringLiteral("road"), road));
placemark.setExtendedData( extendedData );
}
}
diff --git a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
index dae881f..ccc4e9d 100644
--- a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
+++ b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
@@ -125,12 +125,12 @@ void OsmNominatimRunner::handleResult( QNetworkReply* reply )
OsmPlacemarkData data;
GeoDataExtendedData placemarkData = extractChildren(place);
- placemarkData.addValue( GeoDataData( "class", key ) );
- placemarkData.addValue( GeoDataData( "type", value ) );
+ placemarkData.addValue(GeoDataData(QStringLiteral("class"), key));
+ placemarkData.addValue(GeoDataData(QStringLiteral("type"), value));
QString name = place.firstChildElement(value).text();
QString road = place.firstChildElement("road").text();
- placemarkData.addValue( GeoDataData( "name", name ) );
+ placemarkData.addValue(GeoDataData(QStringLiteral("name"), name));
QString city = place.firstChildElement("city").text();
if( city.isEmpty() ) {