summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-02 18:04:33 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-02 18:04:33 (GMT)
commitfdc5a869854baf05635cdba9c352855561df874f (patch)
tree3c77f1407e301c460f342bb21a0e72fedd318230
parent05705f4f68b53e58fb5da0ffc34617435b398ef9 (diff)
Use QStringLiteral with setMapThemeId
-rw-r--r--examples/cpp/basic-routing/main.cpp2
-rw-r--r--examples/cpp/custom-layers/main.cpp2
-rw-r--r--examples/cpp/geopainter/main.cpp2
-rw-r--r--examples/cpp/hello-marble/main.cpp2
-rw-r--r--examples/cpp/map-controls/main.cpp2
-rw-r--r--examples/cpp/map-properties/main.cpp2
-rw-r--r--examples/cpp/marble-game/GameMainWindow.cpp4
-rw-r--r--examples/cpp/overlay-rendering/main.cpp2
-rw-r--r--examples/cpp/squad-interpolation/squad-interpolation.cpp2
-rw-r--r--examples/cpp/vehicletracking/vehicletracking.cpp2
-rw-r--r--src/lib/marble/cloudsync/OwncloudSyncBackend.cpp2
-rw-r--r--src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp2
-rw-r--r--src/thumbnailer/thumbnailer.cpp2
13 files changed, 14 insertions, 14 deletions
diff --git a/examples/cpp/basic-routing/main.cpp b/examples/cpp/basic-routing/main.cpp
index b1e22f5..2866c92 100644
--- a/examples/cpp/basic-routing/main.cpp
+++ b/examples/cpp/basic-routing/main.cpp
@@ -25,7 +25,7 @@ int main(int argc, char** argv)
MarbleWidget *mapWidget = new MarbleWidget();
// Load the OpenStreetMap map
- mapWidget->setMapThemeId( "earth/openstreetmap/openstreetmap.dgml" );
+ mapWidget->setMapThemeId(QStringLiteral("earth/openstreetmap/openstreetmap.dgml"));
mapWidget->setProjection( Mercator );
// Access the shared route request (start, destination and parameters)
diff --git a/examples/cpp/custom-layers/main.cpp b/examples/cpp/custom-layers/main.cpp
index 908daf0..8e9b66c 100644
--- a/examples/cpp/custom-layers/main.cpp
+++ b/examples/cpp/custom-layers/main.cpp
@@ -135,7 +135,7 @@ int main(int argc, char** argv)
mapWidget->installEventFilter(layer);
// Finish widget creation.
- mapWidget->setMapThemeId("earth/bluemarble/bluemarble.dgml");
+ mapWidget->setMapThemeId(QStringLiteral("earth/bluemarble/bluemarble.dgml"));
// Ensure we see our rendered feature on start
mapWidget->model()->setHome(8.4, 48.0, 1800);
mapWidget->goHome();
diff --git a/examples/cpp/geopainter/main.cpp b/examples/cpp/geopainter/main.cpp
index c485283..5a5518f 100644
--- a/examples/cpp/geopainter/main.cpp
+++ b/examples/cpp/geopainter/main.cpp
@@ -34,7 +34,7 @@ int main(int argc, char** argv)
{
QApplication app(argc,argv);
MyMarbleWidget *mapWidget = new MyMarbleWidget;
- mapWidget->setMapThemeId("earth/openstreetmap/openstreetmap.dgml");
+ mapWidget->setMapThemeId(QStringLiteral("earth/openstreetmap/openstreetmap.dgml"));
mapWidget->centerOn(8.4, 49.0);
mapWidget->show();
return app.exec();
diff --git a/examples/cpp/hello-marble/main.cpp b/examples/cpp/hello-marble/main.cpp
index cf8a0ab..ddf8e50 100644
--- a/examples/cpp/hello-marble/main.cpp
+++ b/examples/cpp/hello-marble/main.cpp
@@ -22,7 +22,7 @@ int main(int argc, char** argv)
MarbleWidget *mapWidget = new MarbleWidget();
// Load the OpenStreetMap map
- mapWidget->setMapThemeId("earth/openstreetmap/openstreetmap.dgml");
+ mapWidget->setMapThemeId(QStringLiteral("earth/openstreetmap/openstreetmap.dgml"));
mapWidget->show();
diff --git a/examples/cpp/map-controls/main.cpp b/examples/cpp/map-controls/main.cpp
index fe0abc2..dab4235 100644
--- a/examples/cpp/map-controls/main.cpp
+++ b/examples/cpp/map-controls/main.cpp
@@ -27,7 +27,7 @@ int main(int argc, char** argv)
MarbleWidget *mapWidget = new MarbleWidget();
// Load the Plain map
- mapWidget->setMapThemeId("earth/plain/plain.dgml");
+ mapWidget->setMapThemeId(QStringLiteral("earth/plain/plain.dgml"));
// Hide the FloatItems: OverviewMap, ScaleBar and Compass
mapWidget->setShowOverviewMap(false);
diff --git a/examples/cpp/map-properties/main.cpp b/examples/cpp/map-properties/main.cpp
index 6219e36..47c2edf 100644
--- a/examples/cpp/map-properties/main.cpp
+++ b/examples/cpp/map-properties/main.cpp
@@ -24,7 +24,7 @@ int main(int argc, char** argv)
MarbleWidget *mapWidget = new MarbleWidget();
// Load the OpenStreetMap map
- mapWidget->setMapThemeId("earth/bluemarble/bluemarble.dgml");
+ mapWidget->setMapThemeId(QStringLiteral("earth/bluemarble/bluemarble.dgml"));
mapWidget->setProjection( Mercator );
diff --git a/examples/cpp/marble-game/GameMainWindow.cpp b/examples/cpp/marble-game/GameMainWindow.cpp
index 6b36c07..e25eeee 100644
--- a/examples/cpp/marble-game/GameMainWindow.cpp
+++ b/examples/cpp/marble-game/GameMainWindow.cpp
@@ -88,7 +88,7 @@ QString Private::readMarbleDataPath() const
void Private::setupMarbleWidget()
{
- m_marbleWidget->setMapThemeId( "earth/political/political.dgml" );
+ m_marbleWidget->setMapThemeId(QStringLiteral( "earth/political/political.dgml"));
foreach ( RenderPlugin *renderPlugin, m_marbleWidget->renderPlugins() ) {
if (renderPlugin->nameId() == QLatin1String("stars")
@@ -186,7 +186,7 @@ void MainWindow::createQuestion()
void MainWindow::browseMapButtonClicked()
{
- d->m_marbleWidget->setMapThemeId("earth/political/political.dgml");
+ d->m_marbleWidget->setMapThemeId(QStringLiteral("earth/political/political.dgml"));
/**
* Now display the country names which
diff --git a/examples/cpp/overlay-rendering/main.cpp b/examples/cpp/overlay-rendering/main.cpp
index bd39642..874239f 100644
--- a/examples/cpp/overlay-rendering/main.cpp
+++ b/examples/cpp/overlay-rendering/main.cpp
@@ -25,7 +25,7 @@ int main(int argc, char** argv) {
MarbleWidget *mapWidget = new MarbleWidget();
// Load the Satellite map
- mapWidget->setMapThemeId( "earth/bluemarble/bluemarble.dgml" );
+ mapWidget->setMapThemeId(QStringLiteral("earth/bluemarble/bluemarble.dgml"));
// Create a bounding box from the given corner points
GeoDataLatLonBox box( 55, 48, 14.5, 6, GeoDataCoordinates::Degree );
diff --git a/examples/cpp/squad-interpolation/squad-interpolation.cpp b/examples/cpp/squad-interpolation/squad-interpolation.cpp
index 02df6aa..541e1f9 100644
--- a/examples/cpp/squad-interpolation/squad-interpolation.cpp
+++ b/examples/cpp/squad-interpolation/squad-interpolation.cpp
@@ -227,7 +227,7 @@ int main ( int argc, char** argv )
mapWidget->centerOn ( layer->center() );
// Finish widget creation.
- mapWidget->setMapThemeId( "earth/plain/plain.dgml" );
+ mapWidget->setMapThemeId(QStringLiteral("earth/plain/plain.dgml"));
mapWidget->setShowCities( false );
mapWidget->setShowCrosshairs( false );
mapWidget->setShowOtherPlaces( false );
diff --git a/examples/cpp/vehicletracking/vehicletracking.cpp b/examples/cpp/vehicletracking/vehicletracking.cpp
index e1747bb..2dc79c9 100644
--- a/examples/cpp/vehicletracking/vehicletracking.cpp
+++ b/examples/cpp/vehicletracking/vehicletracking.cpp
@@ -69,7 +69,7 @@ Window::Window(QWidget *parent) :
setLayout(layout);
// Load the OpenStreetMap map
- m_marbleWidget->setMapThemeId("earth/openstreetmap/openstreetmap.dgml");
+ m_marbleWidget->setMapThemeId(QStringLiteral("earth/openstreetmap/openstreetmap.dgml"));
m_marbleWidget->setProjection( Mercator );
setGeometry(80, 60, 1000, 800);
GeoDataCoordinates Kiev(30.523333, 50.45, 0.0, GeoDataCoordinates::Degree);
diff --git a/src/lib/marble/cloudsync/OwncloudSyncBackend.cpp b/src/lib/marble/cloudsync/OwncloudSyncBackend.cpp
index 3836e4f..d445554 100644
--- a/src/lib/marble/cloudsync/OwncloudSyncBackend.cpp
+++ b/src/lib/marble/cloudsync/OwncloudSyncBackend.cpp
@@ -235,7 +235,7 @@ QPixmap OwncloudSyncBackend::createPreview( const QString &timestamp ) const
}
mapWidget.setProjection( Mercator );
- mapWidget.setMapThemeId( "earth/openstreetmap/openstreetmap.dgml" );
+ mapWidget.setMapThemeId(QStringLiteral("earth/openstreetmap/openstreetmap.dgml"));
mapWidget.resize( 512, 512 );
RoutingManager* manager = mapWidget.model()->routingManager();
diff --git a/src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp b/src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp
index 5398394..b5b34fe 100644
--- a/src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp
+++ b/src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp
@@ -36,7 +36,7 @@ bool MarbleWidgetPlugin::isInitialized() const
QWidget *MarbleWidgetPlugin::createWidget(QWidget *parent)
{
Marble::MarbleWidget* marbleWidget = new Marble::MarbleWidget( parent );
- marbleWidget->setMapThemeId("earth/srtm/srtm.dgml");
+ marbleWidget->setMapThemeId(QStringLiteral("earth/srtm/srtm.dgml"));
return marbleWidget;
}
diff --git a/src/thumbnailer/thumbnailer.cpp b/src/thumbnailer/thumbnailer.cpp
index 5ec0d05..bd71060 100644
--- a/src/thumbnailer/thumbnailer.cpp
+++ b/src/thumbnailer/thumbnailer.cpp
@@ -35,7 +35,7 @@ GeoDataThumbnailer::GeoDataThumbnailer()
: ThumbCreator()
, m_marbleMap()
{
- m_marbleMap.setMapThemeId(QLatin1String("earth/openstreetmap/openstreetmap.dgml"));
+ m_marbleMap.setMapThemeId(QStringLiteral("earth/openstreetmap/openstreetmap.dgml"));
m_marbleMap.setProjection(Equirectangular);
m_marbleMap.setMapQualityForViewContext( PrintQuality, Still );
m_marbleMap.setViewContext( Still );