summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-02 12:59:44 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-02 12:59:44 (GMT)
commit81a296d856c156626172b028efedfbc1d1849003 (patch)
tree5a0d8a092d8cd638e84335d96bd2195c6a4e7e5f
parent0fceeff076e15a42ad19c7d8a63d1a11d8824e45 (diff)
Use QStringLiteral for runtimeTrace expressions
-rw-r--r--src/lib/marble/MarbleMap.cpp2
-rw-r--r--src/lib/marble/MarbleWidget.cpp2
-rw-r--r--src/lib/marble/PlacemarkLayout.cpp2
-rw-r--r--src/lib/marble/layers/FogLayer.h2
-rw-r--r--src/lib/marble/layers/GeometryLayer.cpp2
-rw-r--r--src/lib/marble/layers/GroundLayer.h2
-rw-r--r--src/lib/marble/layers/MarbleSplashLayer.h2
-rw-r--r--src/lib/marble/layers/PopupLayer.h2
-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
-rw-r--r--src/plugins/render/annotate/AnnotatePlugin.cpp2
12 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/marble/MarbleMap.cpp b/src/lib/marble/MarbleMap.cpp
index 21f9a9b..48b2864 100644
--- a/src/lib/marble/MarbleMap.cpp
+++ b/src/lib/marble/MarbleMap.cpp
@@ -102,7 +102,7 @@ public:
RenderState renderState() const { return RenderState(QStringLiteral("Custom Map Paint")); }
- virtual QString runtimeTrace() const { return "CustomPaint"; }
+ virtual QString runtimeTrace() const { return QStringLiteral("CustomPaint"); }
private:
MarbleMap *const m_map;
diff --git a/src/lib/marble/MarbleWidget.cpp b/src/lib/marble/MarbleWidget.cpp
index cf69095..5d1017c 100644
--- a/src/lib/marble/MarbleWidget.cpp
+++ b/src/lib/marble/MarbleWidget.cpp
@@ -76,7 +76,7 @@ class MarbleWidget::CustomPaintLayer : public LayerInterface
RenderState renderState() const { return RenderState(QStringLiteral("Custom Widget Paint")); }
- QString runtimeTrace() const { return QString( "MarbleWidget::CustomPaintLayer" ); }
+ QString runtimeTrace() const { return QStringLiteral("MarbleWidget::CustomPaintLayer"); }
private:
MarbleWidget *const m_widget;
diff --git a/src/lib/marble/PlacemarkLayout.cpp b/src/lib/marble/PlacemarkLayout.cpp
index 1fce598..8bb26e7 100644
--- a/src/lib/marble/PlacemarkLayout.cpp
+++ b/src/lib/marble/PlacemarkLayout.cpp
@@ -546,7 +546,7 @@ QVector<VisiblePlacemark *> PlacemarkLayout::generateLayout( const ViewportParam
}
}
- m_runtimeTrace = QString("Placemarks: %1 Drawn: %2").arg( placemarkList.count() ).arg( m_paintOrder.size() );
+ m_runtimeTrace = QStringLiteral("Placemarks: %1 Drawn: %2").arg(placemarkList.count()).arg(m_paintOrder.size());
return m_paintOrder;
}
diff --git a/src/lib/marble/layers/FogLayer.h b/src/lib/marble/layers/FogLayer.h
index 6697b94..c27ccd2 100644
--- a/src/lib/marble/layers/FogLayer.h
+++ b/src/lib/marble/layers/FogLayer.h
@@ -29,7 +29,7 @@ public:
GeoSceneLayer * layer = 0 );
RenderState renderState() const;
- virtual QString runtimeTrace() const { return "FogLayer"; }
+ virtual QString runtimeTrace() const { return QStringLiteral("FogLayer"); }
};
}
diff --git a/src/lib/marble/layers/GeometryLayer.cpp b/src/lib/marble/layers/GeometryLayer.cpp
index 85dcd74..b11ab1d 100644
--- a/src/lib/marble/layers/GeometryLayer.cpp
+++ b/src/lib/marble/layers/GeometryLayer.cpp
@@ -168,7 +168,7 @@ bool GeometryLayer::render( GeoPainter *painter, ViewportParams *viewport,
}
painter->restore();
- d->m_runtimeTrace = QString( "Geometries: %1 Drawn: %2 Zoom: %3")
+ d->m_runtimeTrace = QStringLiteral("Geometries: %1 Drawn: %2 Zoom: %3")
.arg( items.size() )
.arg( paintedItems )
.arg( maxZoomLevel );
diff --git a/src/lib/marble/layers/GroundLayer.h b/src/lib/marble/layers/GroundLayer.h
index 602b7a5..07d6fa6 100644
--- a/src/lib/marble/layers/GroundLayer.h
+++ b/src/lib/marble/layers/GroundLayer.h
@@ -40,7 +40,7 @@ class GroundLayer : public LayerInterface
RenderState renderState() const;
- virtual QString runtimeTrace() const { return "GroundLayer"; }
+ virtual QString runtimeTrace() const { return QStringLiteral("GroundLayer"); }
private:
QColor m_color; // Gets the color specified via DGML's <map bgcolor="">
diff --git a/src/lib/marble/layers/MarbleSplashLayer.h b/src/lib/marble/layers/MarbleSplashLayer.h
index c8317fa..3fefcd3 100644
--- a/src/lib/marble/layers/MarbleSplashLayer.h
+++ b/src/lib/marble/layers/MarbleSplashLayer.h
@@ -30,7 +30,7 @@ public:
RenderState renderState() const;
- virtual QString runtimeTrace() const { return "SplashLayer"; }
+ virtual QString runtimeTrace() const { return QStringLiteral("SplashLayer"); }
};
diff --git a/src/lib/marble/layers/PopupLayer.h b/src/lib/marble/layers/PopupLayer.h
index 1ed58ba..5df8db2 100644
--- a/src/lib/marble/layers/PopupLayer.h
+++ b/src/lib/marble/layers/PopupLayer.h
@@ -48,7 +48,7 @@ public:
RenderState renderState() const;
- virtual QString runtimeTrace() const { return "PopupLayer"; }
+ virtual QString runtimeTrace() const { return QStringLiteral("PopupLayer"); }
/**
* @brief Is popup item visible
diff --git a/src/lib/marble/layers/TextureLayer.cpp b/src/lib/marble/layers/TextureLayer.cpp
index 905a164..d038b1d 100644
--- a/src/lib/marble/layers/TextureLayer.cpp
+++ b/src/lib/marble/layers/TextureLayer.cpp
@@ -350,7 +350,7 @@ bool TextureLayer::render( GeoPainter *painter, ViewportParams *viewport,
const QRect dirtyRect = QRect( QPoint( 0, 0), viewport->size() );
d->m_texmapper->mapTexture( painter, viewport, d->m_tileZoomLevel, dirtyRect, d->m_texcolorizer );
d->m_renderState.addChild( d->m_tileLoader.renderState() );
- d->m_runtimeTrace = QString("Texture Cache: %1 ").arg(d->m_tileLoader.tileCount());
+ d->m_runtimeTrace = QStringLiteral("Texture Cache: %1 ").arg(d->m_tileLoader.tileCount());
return true;
}
diff --git a/src/lib/marble/layers/VectorTileLayer.cpp b/src/lib/marble/layers/VectorTileLayer.cpp
index b789ccf..25f49a6 100644
--- a/src/lib/marble/layers/VectorTileLayer.cpp
+++ b/src/lib/marble/layers/VectorTileLayer.cpp
@@ -147,7 +147,7 @@ QString VectorTileLayer::runtimeTrace() const
tiles += mapper->cachedDocuments();
}
int const layers = d->m_activeTexmappers.size();
- return QString("Vector Tiles: %1 tiles in %2 layers").arg(tiles).arg(layers);
+ return QStringLiteral("Vector Tiles: %1 tiles in %2 layers").arg(tiles).arg(layers);
}
bool VectorTileLayer::render( GeoPainter *painter, ViewportParams *viewport,
diff --git a/src/lib/marble/routing/RoutingLayer.cpp b/src/lib/marble/routing/RoutingLayer.cpp
index faf7804..e343631 100644
--- a/src/lib/marble/routing/RoutingLayer.cpp
+++ b/src/lib/marble/routing/RoutingLayer.cpp
@@ -779,7 +779,7 @@ bool RoutingLayer::isInteractive() const
QString RoutingLayer::runtimeTrace() const
{
- return QString("Routing Layer");
+ return QStringLiteral("Routing Layer");
}
} // namespace Marble
diff --git a/src/plugins/render/annotate/AnnotatePlugin.cpp b/src/plugins/render/annotate/AnnotatePlugin.cpp
index 1f137b9..0355b30 100644
--- a/src/plugins/render/annotate/AnnotatePlugin.cpp
+++ b/src/plugins/render/annotate/AnnotatePlugin.cpp
@@ -222,7 +222,7 @@ bool AnnotatePlugin::isInitialized() const
QString AnnotatePlugin::runtimeTrace() const
{
- return QString("Annotate Items: %1").arg( m_annotationDocument->size() );
+ return QStringLiteral("Annotate Items: %1").arg(m_annotationDocument->size());
}
const QList<QActionGroup*> *AnnotatePlugin::actionGroups() const