summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-02 18:47:34 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-03 01:49:47 (GMT)
commit1c2ef0e7151ebb018432f4db418d8356cd2b3fd5 (patch)
tree7086a8396a1edefe4794679befb9493e938f2fda
parent60d4eabde653b017f3ed6387b59e628822775bfe (diff)
Use QStringLiteral with styleMap methods
-rw-r--r--examples/cpp/marble-game/ClickOnThat.cpp2
-rw-r--r--src/lib/marble/FileLoader.cpp2
-rw-r--r--src/lib/marble/MarbleModel.cpp8
-rw-r--r--src/lib/marble/PositionTracking.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/examples/cpp/marble-game/ClickOnThat.cpp b/examples/cpp/marble-game/ClickOnThat.cpp
index b0fdee1..09c083f 100644
--- a/examples/cpp/marble-game/ClickOnThat.cpp
+++ b/examples/cpp/marble-game/ClickOnThat.cpp
@@ -182,7 +182,7 @@ void ClickOnThat::initiateGame()
GeoDataStyleMap styleMap;
styleMap.setId(QStringLiteral("default-map"));
- styleMap.insert("normal", QLatin1Char('#') + pinStyle->id());
+ styleMap.insert(QStringLiteral("normal"), QLatin1Char('#') + pinStyle->id());
d->m_selectPinDocument->addStyle( pinStyle );
d->m_selectPinDocument->addStyleMap( styleMap );
diff --git a/src/lib/marble/FileLoader.cpp b/src/lib/marble/FileLoader.cpp
index 17a7306..f479f86 100644
--- a/src/lib/marble/FileLoader.cpp
+++ b/src/lib/marble/FileLoader.cpp
@@ -53,7 +53,7 @@ public:
{
if( m_style ) {
m_styleMap->setId(QStringLiteral("default-map"));
- m_styleMap->insert("normal", QLatin1Char('#') + m_style->id());
+ m_styleMap->insert(QStringLiteral("normal"), QLatin1Char('#') + m_style->id());
}
}
diff --git a/src/lib/marble/MarbleModel.cpp b/src/lib/marble/MarbleModel.cpp
index 16a72f9..13d89cd 100644
--- a/src/lib/marble/MarbleModel.cpp
+++ b/src/lib/marble/MarbleModel.cpp
@@ -460,8 +460,8 @@ void MarbleModelPrivate::addHighlightStyle(GeoDataDocument* doc)
if ( highlightBrushColor.isValid()
|| highlightPenColor.isValid() )
{
- GeoDataStyleMap styleMap = doc->styleMap("default-map");
- styleMap.insert("highlight", QLatin1Char('#') + highlightStyle->id());
+ GeoDataStyleMap styleMap = doc->styleMap(QStringLiteral("default-map"));
+ styleMap.insert(QStringLiteral("highlight"), QLatin1Char('#') + highlightStyle->id());
doc->addStyle( highlightStyle );
doc->addStyleMap( styleMap );
}
@@ -474,7 +474,7 @@ void MarbleModelPrivate::assignNewStyle( const QString &filePath, const GeoDataS
Q_ASSERT( doc );
GeoDataStyleMap styleMap;
styleMap.setId(QStringLiteral("default-map"));
- styleMap.insert("normal", QLatin1Char('#') + style->id());
+ styleMap.insert(QStringLiteral("normal"), QLatin1Char('#') + style->id());
doc->addStyleMap( styleMap );
doc->addStyle( style );
@@ -868,7 +868,7 @@ void MarbleModelPrivate::assignFillColors( const QString &filePath ) {
style->setId(QStringLiteral("default"));
GeoDataStyleMap styleMap;
styleMap.setId(QStringLiteral("default-map"));
- styleMap.insert("normal", QLatin1Char('#') + style->id());
+ styleMap.insert(QStringLiteral("normal"), QLatin1Char('#') + style->id());
doc->addStyle( style );
doc->addStyleMap( styleMap );
diff --git a/src/lib/marble/PositionTracking.cpp b/src/lib/marble/PositionTracking.cpp
index ab413af..89475df 100644
--- a/src/lib/marble/PositionTracking.cpp
+++ b/src/lib/marble/PositionTracking.cpp
@@ -164,7 +164,7 @@ PositionTracking::PositionTracking( GeoDataTreeModel *model )
GeoDataStyleMap styleMap;
styleMap.setId(QStringLiteral("map-track"));
- styleMap.insert("normal", QLatin1Char('#') + style->id());
+ styleMap.insert(QStringLiteral("normal"), QLatin1Char('#') + style->id());
d->m_document.addStyleMap(styleMap);
d->m_document.addStyle(style);
d->m_document.append( d->m_currentTrackPlacemark );