summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-02 12:53:59 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-02 12:53:59 (GMT)
commit0fceeff076e15a42ad19c7d8a63d1a11d8824e45 (patch)
tree1a02b81fad956589a9ef9970e98b7553feda0217
parent12d11ab73819d1f48e95416e02c003056200bf60 (diff)
Use QStringLiteral for RenderState ids
-rw-r--r--src/lib/marble/LayerManager.cpp2
-rw-r--r--src/lib/marble/MarbleMap.cpp4
-rw-r--r--src/lib/marble/MarbleWidget.cpp2
-rw-r--r--src/lib/marble/layers/FogLayer.cpp2
-rw-r--r--src/lib/marble/layers/GeometryLayer.cpp2
-rw-r--r--src/lib/marble/layers/GroundLayer.cpp2
-rw-r--r--src/lib/marble/layers/MarbleSplashLayer.cpp2
-rw-r--r--src/lib/marble/layers/PlacemarkLayer.cpp2
-rw-r--r--src/lib/marble/layers/PopupLayer.cpp2
-rw-r--r--src/lib/marble/layers/TextureLayer.cpp2
-rw-r--r--src/lib/marble/layers/VectorTileLayer.cpp2
-rw-r--r--src/lib/marble/routing/RoutingLayer.cpp2
12 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/marble/LayerManager.cpp b/src/lib/marble/LayerManager.cpp
index ee38be5..12fdb2e 100644
--- a/src/lib/marble/LayerManager.cpp
+++ b/src/lib/marble/LayerManager.cpp
@@ -122,7 +122,7 @@ QList<AbstractDataPluginItem *> LayerManager::whichItemAt( const QPoint& curpos
void LayerManager::renderLayers( GeoPainter *painter, ViewportParams *viewport )
{
- d->m_renderState = RenderState( "Marble" );
+ d->m_renderState = RenderState(QStringLiteral("Marble"));
const QTime totalTime = QTime::currentTime();
QStringList renderPositions;
diff --git a/src/lib/marble/MarbleMap.cpp b/src/lib/marble/MarbleMap.cpp
index 5836482..21f9a9b 100644
--- a/src/lib/marble/MarbleMap.cpp
+++ b/src/lib/marble/MarbleMap.cpp
@@ -100,7 +100,7 @@ public:
virtual qreal zValue() const { return 1.0e6; }
- RenderState renderState() const { return RenderState( "Custom Map Paint" ); }
+ RenderState renderState() const { return RenderState(QStringLiteral("Custom Map Paint")); }
virtual QString runtimeTrace() const { return "CustomPaint"; }
@@ -837,7 +837,7 @@ void MarbleMap::paint( GeoPainter &painter, const QRect &dirtyRect )
d->m_layerManager.renderLayers( &painter, &d->m_viewport );
d->m_renderState = d->m_layerManager.renderState();
bool const parsing = d->m_model->fileManager()->pendingFiles() > 0;
- d->m_renderState.addChild( RenderState( "Files", parsing ? WaitingForData : Complete ) );
+ d->m_renderState.addChild(RenderState(QStringLiteral("Files"), parsing ? WaitingForData : Complete));
RenderStatus const newRenderStatus = d->m_renderState.status();
if ( oldRenderStatus != newRenderStatus ) {
emit renderStatusChanged( newRenderStatus );
diff --git a/src/lib/marble/MarbleWidget.cpp b/src/lib/marble/MarbleWidget.cpp
index ebcfcd7..cf69095 100644
--- a/src/lib/marble/MarbleWidget.cpp
+++ b/src/lib/marble/MarbleWidget.cpp
@@ -74,7 +74,7 @@ class MarbleWidget::CustomPaintLayer : public LayerInterface
virtual qreal zValue() const { return 1.0e7; }
- RenderState renderState() const { return RenderState( "Custom Widget Paint" ); }
+ RenderState renderState() const { return RenderState(QStringLiteral("Custom Widget Paint")); }
QString runtimeTrace() const { return QString( "MarbleWidget::CustomPaintLayer" ); }
diff --git a/src/lib/marble/layers/FogLayer.cpp b/src/lib/marble/layers/FogLayer.cpp
index 8ec0cbb..144baf5 100644
--- a/src/lib/marble/layers/FogLayer.cpp
+++ b/src/lib/marble/layers/FogLayer.cpp
@@ -79,7 +79,7 @@ bool FogLayer::render( GeoPainter *painter,
RenderState FogLayer::renderState() const
{
- return RenderState( "Fog" );
+ return RenderState(QStringLiteral("Fog"));
}
}
diff --git a/src/lib/marble/layers/GeometryLayer.cpp b/src/lib/marble/layers/GeometryLayer.cpp
index 6b7bdd7..85dcd74 100644
--- a/src/lib/marble/layers/GeometryLayer.cpp
+++ b/src/lib/marble/layers/GeometryLayer.cpp
@@ -177,7 +177,7 @@ bool GeometryLayer::render( GeoPainter *painter, ViewportParams *viewport,
RenderState GeometryLayer::renderState() const
{
- return RenderState( "GeoGraphicsScene" );
+ return RenderState(QStringLiteral("GeoGraphicsScene"));
}
QString GeometryLayer::runtimeTrace() const
diff --git a/src/lib/marble/layers/GroundLayer.cpp b/src/lib/marble/layers/GroundLayer.cpp
index 0026fe6..73ce357 100644
--- a/src/lib/marble/layers/GroundLayer.cpp
+++ b/src/lib/marble/layers/GroundLayer.cpp
@@ -65,7 +65,7 @@ QColor GroundLayer::color() const
RenderState GroundLayer::renderState() const
{
- return RenderState( "Ground" );
+ return RenderState(QStringLiteral("Ground"));
}
}
diff --git a/src/lib/marble/layers/MarbleSplashLayer.cpp b/src/lib/marble/layers/MarbleSplashLayer.cpp
index 45ea362..20788f7 100644
--- a/src/lib/marble/layers/MarbleSplashLayer.cpp
+++ b/src/lib/marble/layers/MarbleSplashLayer.cpp
@@ -68,7 +68,7 @@ bool MarbleSplashLayer::render( GeoPainter *painter, ViewportParams *viewport,
RenderState MarbleSplashLayer::renderState() const
{
- return RenderState( "Splash Screen" );
+ return RenderState(QStringLiteral("Splash Screen"));
}
diff --git a/src/lib/marble/layers/PlacemarkLayer.cpp b/src/lib/marble/layers/PlacemarkLayer.cpp
index 8e51be5..2d0d857 100644
--- a/src/lib/marble/layers/PlacemarkLayer.cpp
+++ b/src/lib/marble/layers/PlacemarkLayer.cpp
@@ -102,7 +102,7 @@ bool PlacemarkLayer::render( GeoPainter *geoPainter, ViewportParams *viewport,
RenderState PlacemarkLayer::renderState() const
{
- return RenderState( "Placemarks" );
+ return RenderState(QStringLiteral("Placemarks"));
}
QString PlacemarkLayer::runtimeTrace() const
diff --git a/src/lib/marble/layers/PopupLayer.cpp b/src/lib/marble/layers/PopupLayer.cpp
index ca50364..6060f9c 100644
--- a/src/lib/marble/layers/PopupLayer.cpp
+++ b/src/lib/marble/layers/PopupLayer.cpp
@@ -106,7 +106,7 @@ qreal PopupLayer::zValue() const
RenderState PopupLayer::renderState() const
{
- return RenderState( "Popup Window" );
+ return RenderState(QStringLiteral("Popup Window"));
}
bool PopupLayer::visible() const
diff --git a/src/lib/marble/layers/TextureLayer.cpp b/src/lib/marble/layers/TextureLayer.cpp
index b97b10c..905a164 100644
--- a/src/lib/marble/layers/TextureLayer.cpp
+++ b/src/lib/marble/layers/TextureLayer.cpp
@@ -305,7 +305,7 @@ bool TextureLayer::render( GeoPainter *painter, ViewportParams *viewport,
{
Q_UNUSED( renderPos );
Q_UNUSED( layer );
- d->m_renderState = RenderState( "Texture Tiles" );
+ d->m_renderState = RenderState(QStringLiteral("Texture Tiles"));
// Stop repaint timer if it is already running
d->m_repaintTimer.stop();
diff --git a/src/lib/marble/layers/VectorTileLayer.cpp b/src/lib/marble/layers/VectorTileLayer.cpp
index da56bf5..b789ccf 100644
--- a/src/lib/marble/layers/VectorTileLayer.cpp
+++ b/src/lib/marble/layers/VectorTileLayer.cpp
@@ -128,7 +128,7 @@ QStringList VectorTileLayer::renderPosition() const
RenderState VectorTileLayer::renderState() const
{
- return RenderState( "Vector Tiles" );
+ return RenderState(QStringLiteral("Vector Tiles"));
}
int VectorTileLayer::tileZoomLevel() const
diff --git a/src/lib/marble/routing/RoutingLayer.cpp b/src/lib/marble/routing/RoutingLayer.cpp
index f3faf09..faf7804 100644
--- a/src/lib/marble/routing/RoutingLayer.cpp
+++ b/src/lib/marble/routing/RoutingLayer.cpp
@@ -672,7 +672,7 @@ bool RoutingLayer::render( GeoPainter *painter, ViewportParams *viewport,
RenderState RoutingLayer::renderState() const
{
- return RenderState( "Routing", d->m_marbleWidget->model()->routingManager()->state() == RoutingManager::Downloading ? WaitingForUpdate : Complete );
+ return RenderState(QStringLiteral("Routing"), d->m_marbleWidget->model()->routingManager()->state() == RoutingManager::Downloading ? WaitingForUpdate : Complete);
}
bool RoutingLayer::eventFilter( QObject *obj, QEvent *event )