summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-03 00:26:50 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-03 01:49:47 (GMT)
commitd032a563b9d875d79b35bf9da5cb4e7b31068386 (patch)
tree29fe724f7ff64c54e3b447216b2bfa68584c58f4
parent342a17a31b94d8c97f6ef511f11537c97125bb7f (diff)
Use QStringLiteral with OsmPlacemarkData::addTag
-rw-r--r--src/lib/marble/osm/OsmObjectManager.cpp2
-rw-r--r--src/lib/marble/osm/OsmRelationEditorDialog.cpp2
-rw-r--r--src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp10
3 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/marble/osm/OsmObjectManager.cpp b/src/lib/marble/osm/OsmObjectManager.cpp
index 8bb461a..1956c8c 100644
--- a/src/lib/marble/osm/OsmObjectManager.cpp
+++ b/src/lib/marble/osm/OsmObjectManager.cpp
@@ -65,7 +65,7 @@ void OsmObjectManager::initializeOsmData( GeoDataPlacemark* placemark )
const GeoDataLinearRing &outerBoundary = polygon->outerBoundary();
int index = -1;
if ( isNull ) {
- osmData.addTag( "type", "multipolygon" );
+ osmData.addTag(QStringLiteral("type"), QStringLiteral("multipolygon"));
}
// Outer boundary
diff --git a/src/lib/marble/osm/OsmRelationEditorDialog.cpp b/src/lib/marble/osm/OsmRelationEditorDialog.cpp
index 37395fa..f4a29ed 100644
--- a/src/lib/marble/osm/OsmRelationEditorDialog.cpp
+++ b/src/lib/marble/osm/OsmRelationEditorDialog.cpp
@@ -74,7 +74,7 @@ OsmRelationEditorDialog::~OsmRelationEditorDialog()
void OsmRelationEditorDialog::finish()
{
// Updating the relation data with the edited one
- m_dummyPlacemark->osmData().addTag( "name", m_nameLineEdit->text() );
+ m_dummyPlacemark->osmData().addTag(QStringLiteral("name"), m_nameLineEdit->text());
*m_relationData = m_dummyPlacemark->osmData();
accept();
deleteLater();
diff --git a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
index 4a84080..dae881f 100644
--- a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
+++ b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
@@ -147,9 +147,9 @@ void OsmNominatimRunner::handleResult( QNetworkReply* reply )
administrative = place.firstChildElement("region").text();
if( administrative.isEmpty() ) {
administrative = place.firstChildElement("state").text();
- data.addTag("addr:state", administrative);
+ data.addTag(QStringLiteral("addr:state"), administrative);
} else {
- data.addTag("district", administrative);
+ data.addTag(QStringLiteral("district"), administrative);
}
}
@@ -174,14 +174,14 @@ void OsmNominatimRunner::handleResult( QNetworkReply* reply )
placemarkName += QLatin1String(", ");
}
placemarkName += road;
- data.addTag("addr:street", road);
+ data.addTag(QStringLiteral("addr:street"), road);
}
if (!city.isEmpty() && !placemarkName.contains(QLatin1Char(',')) && city != placemarkName) {
if( !placemarkName.isEmpty() ) {
placemarkName += QLatin1String(", ");
}
placemarkName += city;
- data.addTag("addr:city", city);
+ data.addTag(QStringLiteral("addr:city"), city);
}
if (!administrative.isEmpty() && !placemarkName.contains(QLatin1Char(',')) && administrative != placemarkName) {
if( !placemarkName.isEmpty() ) {
@@ -194,7 +194,7 @@ void OsmNominatimRunner::handleResult( QNetworkReply* reply )
placemarkName += QLatin1String(", ");
}
placemarkName += country;
- data.addTag("addr:country", country);
+ data.addTag(QStringLiteral("addr:country"), country);
}
if (placemarkName.isEmpty()) {
placemarkName = desc;