summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-15 23:50:30 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-15 23:50:30 (GMT)
commit9ea3604dd4dd952d1f1d9d8256073a0911894220 (patch)
treef55c8e092ca6be84bb2217b0f6d69dc45480307e
parent4b3a1b84c44293c63a62252259b7f3f39d33f931 (diff)
Use more QStringLiteral for plugin metedata strings
-rw-r--r--examples/cpp/custom-layers/main.cpp8
-rw-r--r--examples/cpp/squad-interpolation/squad-interpolation.cpp2
-rw-r--r--src/lib/marble/AbstractFloatItem.cpp4
-rw-r--r--src/lib/marble/LayerManager.cpp14
-rw-r--r--src/lib/marble/PlacemarkPositionProviderPlugin.cpp10
-rw-r--r--src/lib/marble/RouteSimulationPositionProviderPlugin.cpp12
-rw-r--r--src/lib/marble/layers/FloatItemsLayer.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
-rw-r--r--src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.cpp8
-rw-r--r--src/plugins/positionprovider/geoclue/GeoCluePositionProviderPlugin.cpp2
-rw-r--r--src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp8
-rw-r--r--src/plugins/positionprovider/qtpositioning/QtPositioningPositionProviderPlugin.cpp8
-rw-r--r--src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp8
-rw-r--r--src/plugins/render/annotate/AnnotatePlugin.cpp20
-rw-r--r--src/plugins/render/aprs/AprsPlugin.cpp16
-rw-r--r--src/plugins/render/atmosphere/AtmospherePlugin.cpp26
-rw-r--r--src/plugins/render/compass/CompassFloatItem.cpp14
-rw-r--r--src/plugins/render/crosshairs/CrosshairsPlugin.cpp18
-rw-r--r--src/plugins/render/earthquake/EarthquakePlugin.cpp12
-rw-r--r--src/plugins/render/eclipses/EclipsesItem.cpp12
-rw-r--r--src/plugins/render/eclipses/EclipsesPlugin.cpp18
-rw-r--r--src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp16
-rw-r--r--src/plugins/render/elevationprofilemarker/ElevationProfileMarker.cpp18
-rw-r--r--src/plugins/render/fileview/FileViewFloatItem.cpp4
-rw-r--r--src/plugins/render/foursquare/FoursquarePlugin.cpp12
-rw-r--r--src/plugins/render/gpsinfo/GpsInfo.cpp12
-rw-r--r--src/plugins/render/graticule/GraticulePlugin.cpp16
-rw-r--r--src/plugins/render/inhibit-screensaver/InhibitScreensaverPlugin.cpp12
-rw-r--r--src/plugins/render/license/License.cpp14
-rw-r--r--src/plugins/render/mapscale/MapScaleFloatItem.cpp16
-rw-r--r--src/plugins/render/measure/MeasureToolPlugin.cpp30
-rw-r--r--src/plugins/render/navigation/NavigationFloatItem.cpp16
-rw-r--r--src/plugins/render/opencachingcom/OpenCachingComPlugin.cpp12
-rw-r--r--src/plugins/render/opendesktop/OpenDesktopPlugin.cpp10
-rw-r--r--src/plugins/render/overviewmap/OverviewMap.cpp12
-rw-r--r--src/plugins/render/panoramio/PanoramioPlugin.cpp10
-rw-r--r--src/plugins/render/photo/PhotoPlugin.cpp12
-rw-r--r--src/plugins/render/positionmarker/PositionMarker.cpp22
-rw-r--r--src/plugins/render/postalcode/PostalCodePlugin.cpp10
-rw-r--r--src/plugins/render/progress/ProgressFloatItem.cpp12
-rw-r--r--src/plugins/render/routing/RoutingPlugin.cpp14
-rw-r--r--src/plugins/render/satellites/SatellitesPlugin.cpp20
-rw-r--r--src/plugins/render/speedometer/Speedometer.cpp12
-rw-r--r--src/plugins/render/stars/StarsPlugin.cpp20
-rw-r--r--src/plugins/render/sun/SunPlugin.cpp21
-rw-r--r--src/plugins/render/test/TestPlugin.cpp14
-rw-r--r--src/plugins/render/twitter/twitterPlugin.cpp8
-rw-r--r--src/plugins/render/weather/WeatherPlugin.cpp10
-rw-r--r--src/plugins/render/wikipedia/WikipediaPlugin.cpp8
-rw-r--r--src/plugins/runner/cache/CachePlugin.cpp10
-rw-r--r--src/plugins/runner/cyclestreets/CycleStreetsPlugin.cpp10
-rw-r--r--src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.cpp12
-rw-r--r--src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.cpp12
-rw-r--r--src/plugins/runner/gpsbabel/GpsbabelPlugin.cpp18
-rw-r--r--src/plugins/runner/gpx/GpxPlugin.cpp10
-rw-r--r--src/plugins/runner/hostip/HostipPlugin.cpp10
-rw-r--r--src/plugins/runner/json/JsonPlugin.cpp10
-rw-r--r--src/plugins/runner/kml/KmlPlugin.cpp12
-rw-r--r--src/plugins/runner/latlon/LatLonPlugin.cpp8
-rw-r--r--src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.cpp10
-rw-r--r--src/plugins/runner/localdatabase/LocalDatabasePlugin.cpp8
-rw-r--r--src/plugins/runner/log/LogPlugin.cpp10
-rw-r--r--src/plugins/runner/mapquest/MapQuestPlugin.cpp10
-rw-r--r--src/plugins/runner/monav/MonavPlugin.cpp10
-rw-r--r--src/plugins/runner/nominatim-reversegeocoding/NominatimReverseGeocodingPlugin.cpp12
-rw-r--r--src/plugins/runner/nominatim-search/NominatimSearchPlugin.cpp12
-rw-r--r--src/plugins/runner/open-source-routing-machine/OSRMPlugin.cpp10
-rw-r--r--src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchPlugin.cpp8
-rw-r--r--src/plugins/runner/openrouteservice/OpenRouteServicePlugin.cpp10
-rw-r--r--src/plugins/runner/osm/OsmPlugin.cpp12
-rw-r--r--src/plugins/runner/pn2/Pn2Plugin.cpp10
-rw-r--r--src/plugins/runner/pnt/PntPlugin.cpp10
-rw-r--r--src/plugins/runner/routino/RoutinoPlugin.cpp10
-rw-r--r--src/plugins/runner/shp/ShpPlugin.cpp10
-rw-r--r--src/plugins/runner/traveling-salesman/TravelingSalesmanPlugin.cpp2
-rw-r--r--src/plugins/runner/yours/YoursPlugin.cpp10
-rw-r--r--src/plugins/templates/floatitem/FITemplateFloatItem.cpp4
-rw-r--r--tests/AbstractFloatItemTest.cpp19
86 files changed, 476 insertions, 456 deletions
diff --git a/examples/cpp/custom-layers/main.cpp b/examples/cpp/custom-layers/main.cpp
index e13c85c..908daf0 100644
--- a/examples/cpp/custom-layers/main.cpp
+++ b/examples/cpp/custom-layers/main.cpp
@@ -55,8 +55,12 @@ QStringList MyPaintLayer::renderPosition() const
{
// We will paint in exactly one of the following layers.
// The current one can be changed by pressing the '+' key
- QStringList layers = QStringList() << "SURFACE" << "HOVERS_ABOVE_SURFACE";
- layers << "ORBIT" << "USER_TOOLS" << "STARS";
+ const QStringList layers = QStringList()
+ << QStringLiteral("SURFACE")
+ << QStringLiteral("HOVERS_ABOVE_SURFACE")
+ << QStringLiteral("ORBIT")
+ << QStringLiteral("USER_TOOLS")
+ << QStringLiteral("STARS");
int index = m_index % layers.size();
return QStringList() << layers.at(index);
diff --git a/examples/cpp/squad-interpolation/squad-interpolation.cpp b/examples/cpp/squad-interpolation/squad-interpolation.cpp
index e6da44a..4e3f733 100644
--- a/examples/cpp/squad-interpolation/squad-interpolation.cpp
+++ b/examples/cpp/squad-interpolation/squad-interpolation.cpp
@@ -43,7 +43,7 @@ MyPaintLayer::MyPaintLayer ( MarbleWidget *widget ) :
QStringList MyPaintLayer::renderPosition() const
{
- return QStringList() << "USER_TOOLS";
+ return QStringList(QStringLiteral("USER_TOOLS"));
}
bool MyPaintLayer::render ( GeoPainter *painter, ViewportParams *viewport, const QString &, GeoSceneLayer * )
diff --git a/src/lib/marble/AbstractFloatItem.cpp b/src/lib/marble/AbstractFloatItem.cpp
index b856d9a..a9ae6e0 100644
--- a/src/lib/marble/AbstractFloatItem.cpp
+++ b/src/lib/marble/AbstractFloatItem.cpp
@@ -120,12 +120,12 @@ void AbstractFloatItem::setFont( const QFont &font )
QString AbstractFloatItem::renderPolicy() const
{
- return "ALWAYS";
+ return QStringLiteral("ALWAYS");
}
QStringList AbstractFloatItem::renderPosition() const
{
- return QStringList( "FLOAT_ITEM" );
+ return QStringList(QStringLiteral("FLOAT_ITEM"));
}
void AbstractFloatItem::setVisible( bool visible )
diff --git a/src/lib/marble/LayerManager.cpp b/src/lib/marble/LayerManager.cpp
index 8277b6b..ee38be5 100644
--- a/src/lib/marble/LayerManager.cpp
+++ b/src/lib/marble/LayerManager.cpp
@@ -128,11 +128,19 @@ void LayerManager::renderLayers( GeoPainter *painter, ViewportParams *viewport )
QStringList renderPositions;
if ( d->m_showBackground ) {
- renderPositions << "STARS" << "BEHIND_TARGET";
+ renderPositions
+ << QStringLiteral("STARS")
+ << QStringLiteral("BEHIND_TARGET");
}
- renderPositions << "SURFACE" << "HOVERS_ABOVE_SURFACE" << "ATMOSPHERE"
- << "ORBIT" << "ALWAYS_ON_TOP" << "FLOAT_ITEM" << "USER_TOOLS";
+ renderPositions
+ << QStringLiteral("SURFACE")
+ << QStringLiteral("HOVERS_ABOVE_SURFACE")
+ << QStringLiteral("ATMOSPHERE")
+ << QStringLiteral("ORBIT")
+ << QStringLiteral("ALWAYS_ON_TOP")
+ << QStringLiteral("FLOAT_ITEM")
+ << QStringLiteral("USER_TOOLS");
QStringList traceList;
foreach( const auto& renderPosition, renderPositions ) {
diff --git a/src/lib/marble/PlacemarkPositionProviderPlugin.cpp b/src/lib/marble/PlacemarkPositionProviderPlugin.cpp
index 97e969f..ea82bb2 100644
--- a/src/lib/marble/PlacemarkPositionProviderPlugin.cpp
+++ b/src/lib/marble/PlacemarkPositionProviderPlugin.cpp
@@ -40,7 +40,7 @@ QString PlacemarkPositionProviderPlugin::name() const
QString PlacemarkPositionProviderPlugin::nameId() const
{
- return QString::fromLatin1( "Placemark" );
+ return QStringLiteral("Placemark");
}
QString PlacemarkPositionProviderPlugin::guiString() const
@@ -50,7 +50,7 @@ QString PlacemarkPositionProviderPlugin::guiString() const
QString PlacemarkPositionProviderPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString PlacemarkPositionProviderPlugin::description() const
@@ -60,14 +60,14 @@ QString PlacemarkPositionProviderPlugin::description() const
QString PlacemarkPositionProviderPlugin::copyrightYears() const
{
- return "2011, 2012";
+ return QStringLiteral("2011, 2012");
}
QVector<PluginAuthor> PlacemarkPositionProviderPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Guillaume Martres", "smarter@ubuntu.com" )
- << PluginAuthor( "Bernhard Beschow", "bbeschow@cs.tu-berlin.de" );
+ << PluginAuthor(QStringLiteral("Guillaume Martres"), QStringLiteral("smarter@ubuntu.com"))
+ << PluginAuthor(QStringLiteral("Bernhard Beschow"), QStringLiteral("bbeschow@cs.tu-berlin.de"));
}
QIcon PlacemarkPositionProviderPlugin::icon() const
diff --git a/src/lib/marble/RouteSimulationPositionProviderPlugin.cpp b/src/lib/marble/RouteSimulationPositionProviderPlugin.cpp
index 5b38033..0b3fd16 100644
--- a/src/lib/marble/RouteSimulationPositionProviderPlugin.cpp
+++ b/src/lib/marble/RouteSimulationPositionProviderPlugin.cpp
@@ -34,7 +34,7 @@ QString RouteSimulationPositionProviderPlugin::name() const
QString RouteSimulationPositionProviderPlugin::nameId() const
{
- return "RouteSimulationPositionProviderPlugin";
+ return QStringLiteral("RouteSimulationPositionProviderPlugin");
}
QString RouteSimulationPositionProviderPlugin::guiString() const
@@ -44,7 +44,7 @@ QString RouteSimulationPositionProviderPlugin::guiString() const
QString RouteSimulationPositionProviderPlugin::version() const
{
- return "1.1";
+ return QStringLiteral("1.1");
}
QString RouteSimulationPositionProviderPlugin::description() const
@@ -54,15 +54,15 @@ QString RouteSimulationPositionProviderPlugin::description() const
QString RouteSimulationPositionProviderPlugin::copyrightYears() const
{
- return "2011, 2012";
+ return QStringLiteral("2011, 2012");
}
QVector<PluginAuthor> RouteSimulationPositionProviderPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Konrad Enzensberger", "e.konrad@mpegcode.com" )
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" )
- << PluginAuthor( "Bernhard Beschow", "bbeschow@cs.tu-berlin.de" );
+ << PluginAuthor(QStringLiteral("Konrad Enzensberger"), QStringLiteral("e.konrad@mpegcode.com"))
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"))
+ << PluginAuthor(QStringLiteral("Bernhard Beschow"), QStringLiteral("bbeschow@cs.tu-berlin.de"));
}
QIcon RouteSimulationPositionProviderPlugin::icon() const
diff --git a/src/lib/marble/layers/FloatItemsLayer.cpp b/src/lib/marble/layers/FloatItemsLayer.cpp
index 5d17252..995a295 100644
--- a/src/lib/marble/layers/FloatItemsLayer.cpp
+++ b/src/lib/marble/layers/FloatItemsLayer.cpp
@@ -25,7 +25,7 @@ FloatItemsLayer::FloatItemsLayer(QObject *parent) :
QStringList FloatItemsLayer::renderPosition() const
{
- return QStringList() << "FLOAT_ITEM";
+ return QStringList(QStringLiteral("FLOAT_ITEM"));
}
bool FloatItemsLayer::render(GeoPainter *painter,
diff --git a/src/lib/marble/layers/FogLayer.cpp b/src/lib/marble/layers/FogLayer.cpp
index 7d6d306..8ec0cbb 100644
--- a/src/lib/marble/layers/FogLayer.cpp
+++ b/src/lib/marble/layers/FogLayer.cpp
@@ -21,7 +21,7 @@ namespace Marble
QStringList FogLayer::renderPosition() const
{
- return QStringList() << "ATMOSPHERE";
+ return QStringList(QStringLiteral("ATMOSPHERE"));
}
bool FogLayer::render( GeoPainter *painter,
diff --git a/src/lib/marble/layers/GeometryLayer.cpp b/src/lib/marble/layers/GeometryLayer.cpp
index 3f2b761..6b7bdd7 100644
--- a/src/lib/marble/layers/GeometryLayer.cpp
+++ b/src/lib/marble/layers/GeometryLayer.cpp
@@ -109,7 +109,7 @@ GeometryLayer::~GeometryLayer()
QStringList GeometryLayer::renderPosition() const
{
- return QStringList( "HOVERS_ABOVE_SURFACE" );
+ return QStringList(QStringLiteral("HOVERS_ABOVE_SURFACE"));
}
diff --git a/src/lib/marble/layers/GroundLayer.cpp b/src/lib/marble/layers/GroundLayer.cpp
index 020350f..0026fe6 100644
--- a/src/lib/marble/layers/GroundLayer.cpp
+++ b/src/lib/marble/layers/GroundLayer.cpp
@@ -27,7 +27,7 @@ GroundLayer::~GroundLayer()
QStringList GroundLayer::renderPosition() const
{
- return QStringList() << "SURFACE";
+ return QStringList(QStringLiteral("SURFACE"));
}
bool GroundLayer::render( GeoPainter *painter,
diff --git a/src/lib/marble/layers/MarbleSplashLayer.cpp b/src/lib/marble/layers/MarbleSplashLayer.cpp
index dd7d072..45ea362 100644
--- a/src/lib/marble/layers/MarbleSplashLayer.cpp
+++ b/src/lib/marble/layers/MarbleSplashLayer.cpp
@@ -28,7 +28,7 @@ MarbleSplashLayer::MarbleSplashLayer()
QStringList MarbleSplashLayer::renderPosition() const
{
- return QStringList() << "SURFACE";
+ return QStringList(QStringLiteral("SURFACE"));
}
bool MarbleSplashLayer::render( GeoPainter *painter, ViewportParams *viewport,
diff --git a/src/lib/marble/layers/PlacemarkLayer.cpp b/src/lib/marble/layers/PlacemarkLayer.cpp
index 58295df..8e51be5 100644
--- a/src/lib/marble/layers/PlacemarkLayer.cpp
+++ b/src/lib/marble/layers/PlacemarkLayer.cpp
@@ -46,7 +46,7 @@ PlacemarkLayer::~PlacemarkLayer()
QStringList PlacemarkLayer::renderPosition() const
{
- return QStringList() << "HOVERS_ABOVE_SURFACE";
+ return QStringList(QStringLiteral("HOVERS_ABOVE_SURFACE"));
}
qreal PlacemarkLayer::zValue() const
diff --git a/src/lib/marble/layers/PopupLayer.cpp b/src/lib/marble/layers/PopupLayer.cpp
index 39b5462..ced4f25 100644
--- a/src/lib/marble/layers/PopupLayer.cpp
+++ b/src/lib/marble/layers/PopupLayer.cpp
@@ -80,7 +80,7 @@ PopupLayer::~PopupLayer()
QStringList PopupLayer::renderPosition() const
{
- return QStringList( "ALWAYS_ON_TOP" );
+ return QStringList(QStringLiteral("ALWAYS_ON_TOP"));
}
bool PopupLayer::render( GeoPainter *painter, ViewportParams *viewport,
diff --git a/src/lib/marble/layers/TextureLayer.cpp b/src/lib/marble/layers/TextureLayer.cpp
index a72116b..b97b10c 100644
--- a/src/lib/marble/layers/TextureLayer.cpp
+++ b/src/lib/marble/layers/TextureLayer.cpp
@@ -266,7 +266,7 @@ TextureLayer::~TextureLayer()
QStringList TextureLayer::renderPosition() const
{
- return QStringList() << "SURFACE";
+ return QStringList(QStringLiteral("SURFACE"));
}
void TextureLayer::addSeaDocument( const GeoDataDocument *seaDocument )
diff --git a/src/lib/marble/layers/VectorTileLayer.cpp b/src/lib/marble/layers/VectorTileLayer.cpp
index 156af49..da56bf5 100644
--- a/src/lib/marble/layers/VectorTileLayer.cpp
+++ b/src/lib/marble/layers/VectorTileLayer.cpp
@@ -123,7 +123,7 @@ VectorTileLayer::~VectorTileLayer()
QStringList VectorTileLayer::renderPosition() const
{
- return QStringList() << "SURFACE";
+ return QStringList(QStringLiteral("SURFACE"));
}
RenderState VectorTileLayer::renderState() const
diff --git a/src/lib/marble/routing/RoutingLayer.cpp b/src/lib/marble/routing/RoutingLayer.cpp
index a20fdf3..f3faf09 100644
--- a/src/lib/marble/routing/RoutingLayer.cpp
+++ b/src/lib/marble/routing/RoutingLayer.cpp
@@ -630,7 +630,7 @@ RoutingLayer::~RoutingLayer()
QStringList RoutingLayer::renderPosition() const
{
- return QStringList() << "HOVERS_ABOVE_SURFACE";
+ return QStringList(QStringLiteral("HOVERS_ABOVE_SURFACE"));
}
qreal RoutingLayer::zValue() const
diff --git a/src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.cpp b/src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.cpp
index 9cd6e49..25b8471 100644
--- a/src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.cpp
@@ -38,7 +38,7 @@ QString FlightGearPositionProviderPlugin::name() const
QString FlightGearPositionProviderPlugin::nameId() const
{
- return QString::fromLatin1( "flightgear" );
+ return QStringLiteral("flightgear");
}
QString FlightGearPositionProviderPlugin::guiString() const
@@ -48,7 +48,7 @@ QString FlightGearPositionProviderPlugin::guiString() const
QString FlightGearPositionProviderPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString FlightGearPositionProviderPlugin::description() const
@@ -58,13 +58,13 @@ QString FlightGearPositionProviderPlugin::description() const
QString FlightGearPositionProviderPlugin::copyrightYears() const
{
- return "2012";
+ return QStringLiteral("2012");
}
QVector<PluginAuthor> FlightGearPositionProviderPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Ralf Habacker" ), "ralf.habacker@freenet.de" );
+ << PluginAuthor(QStringLiteral("Ralf Habacker"), QStringLiteral("ralf.habacker@freenet.de"));
}
diff --git a/src/plugins/positionprovider/geoclue/GeoCluePositionProviderPlugin.cpp b/src/plugins/positionprovider/geoclue/GeoCluePositionProviderPlugin.cpp
index 505d84e..02f073a 100644
--- a/src/plugins/positionprovider/geoclue/GeoCluePositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/geoclue/GeoCluePositionProviderPlugin.cpp
@@ -23,7 +23,7 @@ QString GeoCluePositionProviderPlugin::name() const
QString GeoCluePositionProviderPlugin::nameId() const
{
- return QString::fromLatin1( "GeoClue" );
+ return QStringLiteral("GeoClue");
}
QString GeoCluePositionProviderPlugin::guiString() const
diff --git a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
index 14a496c..bf8949a 100644
--- a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
@@ -27,7 +27,7 @@ QString GpsdPositionProviderPlugin::name() const
QString GpsdPositionProviderPlugin::nameId() const
{
- return QString::fromLatin1( "Gpsd" );
+ return QStringLiteral("Gpsd");
}
QString GpsdPositionProviderPlugin::guiString() const
@@ -37,7 +37,7 @@ QString GpsdPositionProviderPlugin::guiString() const
QString GpsdPositionProviderPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString GpsdPositionProviderPlugin::description() const
@@ -47,13 +47,13 @@ QString GpsdPositionProviderPlugin::description() const
QString GpsdPositionProviderPlugin::copyrightYears() const
{
- return "2009";
+ return QStringLiteral("2009");
}
QVector<PluginAuthor> GpsdPositionProviderPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Eckhart Wörner" ), "ewoerner@kde.org" );
+ << PluginAuthor(QStringLiteral("Eckhart Wörner"), QStringLiteral("ewoerner@kde.org"));
}
diff --git a/src/plugins/positionprovider/qtpositioning/QtPositioningPositionProviderPlugin.cpp b/src/plugins/positionprovider/qtpositioning/QtPositioningPositionProviderPlugin.cpp
index 7b42f2a..eb34db6 100644
--- a/src/plugins/positionprovider/qtpositioning/QtPositioningPositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/qtpositioning/QtPositioningPositionProviderPlugin.cpp
@@ -49,7 +49,7 @@ QString QtPositioningPositionProviderPlugin::name() const
QString QtPositioningPositionProviderPlugin::nameId() const
{
- return "QtPositioning";
+ return QStringLiteral("QtPositioning");
}
QString QtPositioningPositionProviderPlugin::guiString() const
@@ -59,7 +59,7 @@ QString QtPositioningPositionProviderPlugin::guiString() const
QString QtPositioningPositionProviderPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString QtPositioningPositionProviderPlugin::description() const
@@ -69,13 +69,13 @@ QString QtPositioningPositionProviderPlugin::description() const
QString QtPositioningPositionProviderPlugin::copyrightYears() const
{
- return "2011";
+ return QStringLiteral("2011");
}
QVector<PluginAuthor> QtPositioningPositionProviderPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Daniel Marth", "danielmarth@gmx.at" );
+ << PluginAuthor(QStringLiteral("Daniel Marth"), QStringLiteral("danielmarth@gmx.at"));
}
QIcon QtPositioningPositionProviderPlugin::icon() const
diff --git a/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp b/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp
index 02f59cb..03c7444 100644
--- a/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp
@@ -67,7 +67,7 @@ QString WlocatePositionProviderPlugin::name() const
QString WlocatePositionProviderPlugin::nameId() const
{
- return "WlocatePositionProvider";
+ return QStringLiteral("WlocatePositionProvider");
}
QString WlocatePositionProviderPlugin::guiString() const
@@ -77,7 +77,7 @@ QString WlocatePositionProviderPlugin::guiString() const
QString WlocatePositionProviderPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString WlocatePositionProviderPlugin::description() const
@@ -87,13 +87,13 @@ QString WlocatePositionProviderPlugin::description() const
QString WlocatePositionProviderPlugin::copyrightYears() const
{
- return "2012";
+ return QStringLiteral("2012");
}
QVector<PluginAuthor> WlocatePositionProviderPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"));
}
QIcon WlocatePositionProviderPlugin::icon() const
diff --git a/src/plugins/render/annotate/AnnotatePlugin.cpp b/src/plugins/render/annotate/AnnotatePlugin.cpp
index d3bdb14..ebc1a89 100644
--- a/src/plugins/render/annotate/AnnotatePlugin.cpp
+++ b/src/plugins/render/annotate/AnnotatePlugin.cpp
@@ -140,17 +140,17 @@ AnnotatePlugin::~AnnotatePlugin()
QStringList AnnotatePlugin::backendTypes() const
{
- return QStringList( "annotation" );
+ return QStringList(QStringLiteral("annotation"));
}
QString AnnotatePlugin::renderPolicy() const
{
- return QString( "ALWAYS" );
+ return QStringLiteral("ALWAYS");
}
QStringList AnnotatePlugin::renderPosition() const
{
- return QStringList() << "ALWAYS_ON_TOP";
+ return QStringList(QStringLiteral("ALWAYS_ON_TOP"));
}
QString AnnotatePlugin::name() const
@@ -165,7 +165,7 @@ QString AnnotatePlugin::guiString() const
QString AnnotatePlugin::nameId() const
{
- return QString( "annotation" );
+ return QStringLiteral("annotation");
}
QString AnnotatePlugin::description() const
@@ -175,25 +175,25 @@ QString AnnotatePlugin::description() const
QString AnnotatePlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString AnnotatePlugin::copyrightYears() const
{
- return "2009, 2013";
+ return QStringLiteral("2009, 2013");
}
QVector<PluginAuthor> AnnotatePlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Andrew Manson", "<g.real.ate@gmail.com>" )
- << PluginAuthor( "Thibaut Gridel", "<tgridel@free.fr>" )
- << PluginAuthor( "Calin Cruceru", "<crucerucalincristian@gmail.com>" );
+ << PluginAuthor(QStringLiteral("Andrew Manson"), QStringLiteral("g.real.ate@gmail.com"))
+ << PluginAuthor(QStringLiteral("Thibaut Gridel"), QStringLiteral("tgridel@free.fr"))
+ << PluginAuthor(QStringLiteral("Calin Cruceru"), QStringLiteral("crucerucalincristian@gmail.com"));
}
QIcon AnnotatePlugin::icon() const
{
- return QIcon( ":/icons/draw-placemark.png");
+ return QIcon(QStringLiteral(":/icons/draw-placemark.png"));
}
void AnnotatePlugin::initialize()
diff --git a/src/plugins/render/aprs/AprsPlugin.cpp b/src/plugins/render/aprs/AprsPlugin.cpp
index 53dfcf8..2c015c2 100644
--- a/src/plugins/render/aprs/AprsPlugin.cpp
+++ b/src/plugins/render/aprs/AprsPlugin.cpp
@@ -109,17 +109,17 @@ RenderPlugin::RenderType AprsPlugin::renderType() const
QStringList AprsPlugin::backendTypes() const
{
- return QStringList( "aprs" );
+ return QStringList(QStringLiteral("aprs"));
}
QString AprsPlugin::renderPolicy() const
{
- return QString( "ALWAYS" );
+ return QStringLiteral("ALWAYS");
}
QStringList AprsPlugin::renderPosition() const
{
- return QStringList( "HOVERS_ABOVE_SURFACE" );
+ return QStringList(QStringLiteral("HOVERS_ABOVE_SURFACE"));
}
QString AprsPlugin::name() const
@@ -134,12 +134,12 @@ QString AprsPlugin::guiString() const
QString AprsPlugin::nameId() const
{
- return QString( "aprs-plugin" );
+ return QStringLiteral("aprs-plugin");
}
QString AprsPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString AprsPlugin::description() const
@@ -149,18 +149,18 @@ QString AprsPlugin::description() const
QString AprsPlugin::copyrightYears() const
{
- return "2009, 2010";
+ return QStringLiteral("2009, 2010");
}
QVector<PluginAuthor> AprsPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Wes Hardaker", "hardaker@users.sourceforge.net" );
+ << PluginAuthor(QStringLiteral("Wes Hardaker"), QStringLiteral("hardaker@users.sourceforge.net"));
}
QIcon AprsPlugin::icon () const
{
- return QIcon(":/icons/aprs.png");
+ return QIcon(QStringLiteral(":/icons/aprs.png"));
}
void AprsPlugin::stopGatherers()
diff --git a/src/plugins/render/atmosphere/AtmospherePlugin.cpp b/src/plugins/render/atmosphere/AtmospherePlugin.cpp
index 216e4f5..7e2bf73 100644
--- a/src/plugins/render/atmosphere/AtmospherePlugin.cpp
+++ b/src/plugins/render/atmosphere/AtmospherePlugin.cpp
@@ -42,17 +42,17 @@ AtmospherePlugin::AtmospherePlugin( const MarbleModel *marbleModel ) :
QStringList AtmospherePlugin::backendTypes() const
{
- return QStringList( "atmosphere" );
+ return QStringList(QStringLiteral("atmosphere"));
}
QString AtmospherePlugin::renderPolicy() const
{
- return QString( "SPECIFIED_ALWAYS" );
+ return QStringLiteral("SPECIFIED_ALWAYS");
}
QStringList AtmospherePlugin::renderPosition() const
{
- return QStringList() << "SURFACE";
+ return QStringList(QStringLiteral("SURFACE"));
}
RenderPlugin::RenderType AtmospherePlugin::renderType() const
@@ -72,12 +72,12 @@ QString AtmospherePlugin::guiString() const
QString AtmospherePlugin::nameId() const
{
- return "atmosphere";
+ return QStringLiteral("atmosphere");
}
QString AtmospherePlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString AtmospherePlugin::description() const
@@ -87,23 +87,23 @@ QString AtmospherePlugin::description() const
QIcon AtmospherePlugin::icon() const
{
- return QIcon(":/icons/atmosphere.png");
+ return QIcon(QStringLiteral(":/icons/atmosphere.png"));
}
QString AtmospherePlugin::copyrightYears() const
{
- return "2006-2012";
+ return QStringLiteral("2006-2012");
}
QVector<PluginAuthor> AtmospherePlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Torsten Rahn", "tackat@kde.org" )
- << PluginAuthor( "Inge Wallin", "ingwa@kde.org" )
- << PluginAuthor( "Jens-Michael Hoffmann", "jmho@c-xx.com" )
- << PluginAuthor( "Patrick Spendrin", "ps_ml@gmx.de" )
- << PluginAuthor( "Bernhard Beschow", "bbeschow@cs.tu-berlin.de" )
- << PluginAuthor( "Mohammed Nafees", "nafees.technocool@gmail.com" );
+ << PluginAuthor(QStringLiteral("Torsten Rahn"), QStringLiteral("tackat@kde.org"))
+ << PluginAuthor(QStringLiteral("Inge Wallin"), QStringLiteral("ingwa@kde.org"))
+ << PluginAuthor(QStringLiteral("Jens-Michael Hoffmann"), QStringLiteral("jmho@c-xx.com"))
+ << PluginAuthor(QStringLiteral("Patrick Spendrin"), QStringLiteral("ps_ml@gmx.de"))
+ << PluginAuthor(QStringLiteral("Bernhard Beschow"), QStringLiteral("bbeschow@cs.tu-berlin.de"))
+ << PluginAuthor(QStringLiteral("Mohammed Nafees"), QStringLiteral("nafees.technocool@gmail.com"));
}
qreal AtmospherePlugin::zValue() const
diff --git a/src/plugins/render/compass/CompassFloatItem.cpp b/src/plugins/render/compass/CompassFloatItem.cpp
index 533f7a5..c7b8aed 100644
--- a/src/plugins/render/compass/CompassFloatItem.cpp
+++ b/src/plugins/render/compass/CompassFloatItem.cpp
@@ -54,7 +54,7 @@ CompassFloatItem::~CompassFloatItem ()
QStringList CompassFloatItem::backendTypes() const
{
- return QStringList( "compass" );
+ return QStringList(QStringLiteral("compass"));
}
QString CompassFloatItem::name() const
@@ -69,12 +69,12 @@ QString CompassFloatItem::guiString() const
QString CompassFloatItem::nameId() const
{
- return QString( "compass" );
+ return QStringLiteral("compass");
}
QString CompassFloatItem::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString CompassFloatItem::description() const
@@ -84,19 +84,19 @@ QString CompassFloatItem::description() const
QString CompassFloatItem::copyrightYears() const
{
- return "2009, 2010";
+ return QStringLiteral("2009, 2010");
}
QVector<PluginAuthor> CompassFloatItem::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" )
- << PluginAuthor( "Torsten Rahn", "tackat@kde.org" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"))
+ << PluginAuthor(QStringLiteral("Torsten Rahn"), QStringLiteral("tackat@kde.org"));
}
QIcon CompassFloatItem::icon() const
{
- return QIcon(":/icons/compass.png");
+ return QIcon(QStringLiteral(":/icons/compass.png"));
}
void CompassFloatItem::initialize()
diff --git a/src/plugins/render/crosshairs/CrosshairsPlugin.cpp b/src/plugins/render/crosshairs/CrosshairsPlugin.cpp
index 3c9855c..d45d885 100644
--- a/src/plugins/render/crosshairs/CrosshairsPlugin.cpp
+++ b/src/plugins/render/crosshairs/CrosshairsPlugin.cpp
@@ -56,17 +56,17 @@ CrosshairsPlugin::~CrosshairsPlugin ()
QStringList CrosshairsPlugin::backendTypes() const
{
- return QStringList( "crosshairs" );
+ return QStringList(QStringLiteral("crosshairs"));
}
QString CrosshairsPlugin::renderPolicy() const
{
- return QString( "ALWAYS" );
+ return QStringLiteral("ALWAYS");
}
QStringList CrosshairsPlugin::renderPosition() const
{
- return QStringList( "FLOAT_ITEM" ); // although this is not a float item we choose the position of one
+ return QStringList(QStringLiteral("FLOAT_ITEM")); // although this is not a float item we choose the position of one
}
RenderPlugin::RenderType CrosshairsPlugin::renderType() const
@@ -86,12 +86,12 @@ QString CrosshairsPlugin::guiString() const
QString CrosshairsPlugin::nameId() const
{
- return QString( "crosshairs" );
+ return QStringLiteral("crosshairs");
}
QString CrosshairsPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString CrosshairsPlugin::description() const
@@ -101,19 +101,19 @@ QString CrosshairsPlugin::description() const
QString CrosshairsPlugin::copyrightYears() const
{
- return "2009, 2010";
+ return QStringLiteral("2009, 2010");
}
QVector<PluginAuthor> CrosshairsPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Cezar Mocan", "cezarmocan@gmail.com" )
- << PluginAuthor( "Torsten Rahn", "tackat@kde.org" );
+ << PluginAuthor(QStringLiteral("Cezar Mocan"), QStringLiteral("cezarmocan@gmail.com"))
+ << PluginAuthor(QStringLiteral("Torsten Rahn"), QStringLiteral("tackat@kde.org"));
}
QIcon CrosshairsPlugin::icon () const
{
- return QIcon( ":/icons/crosshairs.png" );
+ return QIcon(QStringLiteral(":/icons/crosshairs.png"));
}
void CrosshairsPlugin::initialize ()
diff --git a/src/plugins/render/earthquake/EarthquakePlugin.cpp b/src/plugins/render/earthquake/EarthquakePlugin.cpp
index ea07d51..4977db5 100644
--- a/src/plugins/render/earthquake/EarthquakePlugin.cpp
+++ b/src/plugins/render/earthquake/EarthquakePlugin.cpp
@@ -66,12 +66,12 @@ QString EarthquakePlugin::guiString() const
QString EarthquakePlugin::nameId() const
{
- return "earthquake";
+ return QStringLiteral("earthquake");
}
QString EarthquakePlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString EarthquakePlugin::description() const
@@ -81,19 +81,19 @@ QString EarthquakePlugin::description() const
QString EarthquakePlugin::copyrightYears() const
{
- return "2010, 2011";
+ return QStringLiteral("2010, 2011");
}
QVector<PluginAuthor> EarthquakePlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Utku Aydın" ), "utkuaydin34@gmail.com" )
- << PluginAuthor( QString::fromUtf8( "Daniel Marth" ), "danielmarth@gmx.at" );
+ << PluginAuthor(QStringLiteral("Utku Aydın"), QStringLiteral("utkuaydin34@gmail.com"))
+ << PluginAuthor(QStringLiteral("Daniel Marth"), QStringLiteral("danielmarth@gmx.at"));
}
QIcon EarthquakePlugin::icon() const
{
- return QIcon(":/icons/earthquake.png");
+ return QIcon(QStringLiteral(":/icons/earthquake.png"));
}
QDialog *EarthquakePlugin::configDialog()
diff --git a/src/plugins/render/eclipses/EclipsesItem.cpp b/src/plugins/render/eclipses/EclipsesItem.cpp
index 3e27bd7..4128ecb 100644
--- a/src/plugins/render/eclipses/EclipsesItem.cpp
+++ b/src/plugins/render/eclipses/EclipsesItem.cpp
@@ -60,20 +60,20 @@ QIcon EclipsesItem::icon() const
{
switch( m_phase ) {
case EclipsesItem::TotalMoon:
- return QIcon( ":res/lunar_total.png" );
+ return QIcon(QStringLiteral(":res/lunar_total.png"));
case EclipsesItem::PartialMoon:
- return QIcon( ":res/lunar_partial.png" );
+ return QIcon(QStringLiteral(":res/lunar_partial.png"));
case EclipsesItem::PenumbralMoon:
- return QIcon( ":res/lunar_penumbra.png" );
+ return QIcon(QStringLiteral(":res/lunar_penumbra.png"));
case EclipsesItem::PartialSun:
- return QIcon( ":res/solar_partial.png" );
+ return QIcon(QStringLiteral(":res/solar_partial.png"));
case EclipsesItem::NonCentralAnnularSun:
case EclipsesItem::AnnularSun:
- return QIcon( ":res/solar_annular.png" );
+ return QIcon(QStringLiteral(":res/solar_annular.png"));
case EclipsesItem::AnnularTotalSun:
case EclipsesItem::NonCentralTotalSun:
case EclipsesItem::TotalSun:
- return QIcon( ":res/solar_total.png" );
+ return QIcon(QStringLiteral(":res/solar_total.png"));
}
return QIcon();
diff --git a/src/plugins/render/eclipses/EclipsesPlugin.cpp b/src/plugins/render/eclipses/EclipsesPlugin.cpp
index 9f8384c..74e6ef3 100644
--- a/src/plugins/render/eclipses/EclipsesPlugin.cpp
+++ b/src/plugins/render/eclipses/EclipsesPlugin.cpp
@@ -80,17 +80,17 @@ EclipsesPlugin::~EclipsesPlugin()
QStringList EclipsesPlugin::backendTypes() const
{
- return QStringList( "eclipses" );
+ return QStringList(QStringLiteral("eclipses"));
}
QString EclipsesPlugin::renderPolicy() const
{
- return QString( "ALWAYS" );
+ return QStringLiteral("ALWAYS");
}
QStringList EclipsesPlugin::renderPosition() const
{
- return QStringList( "ORBIT" );
+ return QStringList(QStringLiteral("ORBIT"));
}
QString EclipsesPlugin::name() const
@@ -100,7 +100,7 @@ QString EclipsesPlugin::name() const
QString EclipsesPlugin::nameId() const
{
- return "eclipses";
+ return QStringLiteral("eclipses");
}
QString EclipsesPlugin::guiString() const
@@ -110,7 +110,7 @@ QString EclipsesPlugin::guiString() const
QString EclipsesPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString EclipsesPlugin::description() const
@@ -120,19 +120,19 @@ QString EclipsesPlugin::description() const
QString EclipsesPlugin::copyrightYears() const
{
- return "2013";
+ return QStringLiteral("2013");
}
QVector<PluginAuthor> EclipsesPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Rene Kuettner", "rene@bitkanal.net" )
- << PluginAuthor( "Gerhard Holtkamp", "" );
+ << PluginAuthor(QStringLiteral("Rene Kuettner"), QStringLiteral("rene@bitkanal.net"))
+ << PluginAuthor(QStringLiteral("Gerhard Holtkamp"), QString());
}
QIcon EclipsesPlugin::icon() const
{
- return QIcon( ":res/eclipses.png" );
+ return QIcon(QStringLiteral(":res/eclipses.png"));
}
RenderPlugin::RenderType EclipsesPlugin::renderType() const
diff --git a/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp b/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp
index 645b0f6..2d4c8ef 100644
--- a/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp
+++ b/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp
@@ -89,7 +89,7 @@ ElevationProfileFloatItem::~ElevationProfileFloatItem()
QStringList ElevationProfileFloatItem::backendTypes() const
{
- return QStringList( "elevationprofile" );
+ return QStringList(QStringLiteral("elevationprofile"));
}
qreal ElevationProfileFloatItem::zValue() const
@@ -109,12 +109,12 @@ QString ElevationProfileFloatItem::guiString() const
QString ElevationProfileFloatItem::nameId() const
{
- return QString( "elevationprofile" );
+ return QStringLiteral("elevationprofile");
}
QString ElevationProfileFloatItem::version() const
{
- return "1.2"; // TODO: increase to 1.3 ?
+ return QStringLiteral("1.2"); // TODO: increase to 1.3 ?
}
QString ElevationProfileFloatItem::description() const
@@ -124,20 +124,20 @@ QString ElevationProfileFloatItem::description() const
QString ElevationProfileFloatItem::copyrightYears() const
{
- return "2011, 2012, 2013";
+ return QStringLiteral("2011, 2012, 2013");
}
QVector<PluginAuthor> ElevationProfileFloatItem::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8 ( "Florian Eßer" ), "f.esser@rwth-aachen.de" )
- << PluginAuthor( "Bernhard Beschow", "bbeschow@cs.tu-berlin.de" )
- << PluginAuthor( "Roman Karlstetter", "roman.karlstetter@googlemail.com" );
+ << PluginAuthor(QStringLiteral("Florian Eßer"),QStringLiteral("f.esser@rwth-aachen.de"))
+ << PluginAuthor(QStringLiteral("Bernhard Beschow"), QStringLiteral("bbeschow@cs.tu-berlin.de"))
+ << PluginAuthor(QStringLiteral("Roman Karlstetter"), QStringLiteral("roman.karlstetter@googlemail.com"));
}
QIcon ElevationProfileFloatItem::icon () const
{
- return QIcon(":/icons/elevationprofile.png");
+ return QIcon(QStringLiteral(":/icons/elevationprofile.png"));
}
void ElevationProfileFloatItem::initialize ()
diff --git a/src/plugins/render/elevationprofilemarker/ElevationProfileMarker.cpp b/src/plugins/render/elevationprofilemarker/ElevationProfileMarker.cpp
index 1db5c7f..45f29d2 100644
--- a/src/plugins/render/elevationprofilemarker/ElevationProfileMarker.cpp
+++ b/src/plugins/render/elevationprofilemarker/ElevationProfileMarker.cpp
@@ -51,17 +51,17 @@ ElevationProfileMarker::~ElevationProfileMarker()
QStringList ElevationProfileMarker::backendTypes() const
{
- return QStringList( "elevationprofilemarker" );
+ return QStringList(QStringLiteral("elevationprofilemarker"));
}
QString ElevationProfileMarker::renderPolicy() const
{
- return "ALWAYS";
+ return QStringLiteral("ALWAYS");
}
QStringList ElevationProfileMarker::renderPosition() const
{
- return QStringList() << "HOVERS_ABOVE_SURFACE";
+ return QStringList(QStringLiteral("HOVERS_ABOVE_SURFACE"));
}
qreal ElevationProfileMarker::zValue() const
@@ -81,12 +81,12 @@ QString ElevationProfileMarker::guiString() const
QString ElevationProfileMarker::nameId() const
{
- return QString( "elevationprofilemarker" );
+ return QStringLiteral("elevationprofilemarker");
}
QString ElevationProfileMarker::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString ElevationProfileMarker::description() const
@@ -96,19 +96,19 @@ QString ElevationProfileMarker::description() const
QString ElevationProfileMarker::copyrightYears() const
{
- return "2011, 2012";
+ return QStringLiteral("2011, 2012");
}
QVector<PluginAuthor> ElevationProfileMarker::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Bernhard Beschow", "bbeschow@cs.tu-berlin.de" )
- << PluginAuthor( QString::fromUtf8 ( "Florian Eßer" ), "f.esser@rwth-aachen.de" );
+ << PluginAuthor(QStringLiteral("Bernhard Beschow"), QStringLiteral("bbeschow@cs.tu-berlin.de"))
+ << PluginAuthor(QStringLiteral("Florian Eßer"), QStringLiteral("f.esser@rwth-aachen.de"));
}
QIcon ElevationProfileMarker::icon() const
{
- return QIcon(":/icons/elevationprofile.png");
+ return QIcon(QStringLiteral(":/icons/elevationprofile.png"));
}
void ElevationProfileMarker::initialize()
diff --git a/src/plugins/render/fileview/FileViewFloatItem.cpp b/src/plugins/render/fileview/FileViewFloatItem.cpp
index ecffb28..7c04c09 100644
--- a/src/plugins/render/fileview/FileViewFloatItem.cpp
+++ b/src/plugins/render/fileview/FileViewFloatItem.cpp
@@ -46,7 +46,7 @@ FileViewFloatItem::~FileViewFloatItem()
QStringList FileViewFloatItem::backendTypes() const
{
- return QStringList("fileview");
+ return QStringList(QStringLiteral("fileview"));
}
QString FileViewFloatItem::name() const
@@ -61,7 +61,7 @@ QString FileViewFloatItem::guiString() const
QString FileViewFloatItem::nameId() const
{
- return QString("fileview");
+ return QStringLiteral("fileview");
}
QString FileViewFloatItem::description() const
diff --git a/src/plugins/render/foursquare/FoursquarePlugin.cpp b/src/plugins/render/foursquare/FoursquarePlugin.cpp
index a4fbdda..6d96853 100644
--- a/src/plugins/render/foursquare/FoursquarePlugin.cpp
+++ b/src/plugins/render/foursquare/FoursquarePlugin.cpp
@@ -47,12 +47,12 @@ QString FoursquarePlugin::guiString() const
QString FoursquarePlugin::nameId() const
{
- return "foursquare";
+ return QStringLiteral("foursquare");
}
QString FoursquarePlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString FoursquarePlugin::description() const
@@ -62,19 +62,19 @@ QString FoursquarePlugin::description() const
QString FoursquarePlugin::copyrightYears() const
{
- return "2012";
+ return QStringLiteral("2012");
}
QVector<PluginAuthor> FoursquarePlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" )
- << PluginAuthor( QString::fromUtf8( "Utku Aydın" ), "utkuaydin34@gmail.com" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"))
+ << PluginAuthor(QStringLiteral("Utku Aydın"), QStringLiteral("utkuaydin34@gmail.com"));
}
QIcon FoursquarePlugin::icon() const
{
- return QIcon(":/icons/places.png");
+ return QIcon(QStringLiteral(":/icons/places.png"));
}
bool FoursquarePlugin::isAuthenticated()
diff --git a/src/plugins/render/gpsinfo/GpsInfo.cpp b/src/plugins/render/gpsinfo/GpsInfo.cpp
index 4d9c4a8..19d7bf1 100644
--- a/src/plugins/render/gpsinfo/GpsInfo.cpp
+++ b/src/plugins/render/gpsinfo/GpsInfo.cpp
@@ -44,7 +44,7 @@ GpsInfo::~GpsInfo()
QStringList GpsInfo::backendTypes() const
{
- return QStringList( "GpsInfo" );
+ return QStringList(QStringLiteral("GpsInfo"));
}
QString GpsInfo::name() const
@@ -59,12 +59,12 @@ QString GpsInfo::guiString() const
QString GpsInfo::nameId() const
{
- return QString( "GpsInfo" );
+ return QStringLiteral("GpsInfo");
}
QString GpsInfo::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString GpsInfo::description() const
@@ -74,18 +74,18 @@ QString GpsInfo::description() const
QString GpsInfo::copyrightYears() const
{
- return "2011";
+ return QStringLiteral("2011");
}
QVector<PluginAuthor> GpsInfo::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Thibaut Gridel", "tgridel@free.fr" );
+ << PluginAuthor(QStringLiteral("Thibaut Gridel"), QStringLiteral("tgridel@free.fr"));
}
QIcon GpsInfo::icon () const
{
- return QIcon(":/icons/gps.png");
+ return QIcon(QStringLiteral(":/icons/gps.png"));
}
void GpsInfo::initialize ()
diff --git a/src/plugins/render/graticule/GraticulePlugin.cpp b/src/plugins/render/graticule/GraticulePlugin.cpp
index f9f2188..820149a 100644
--- a/src/plugins/render/graticule/GraticulePlugin.cpp
+++ b/src/plugins/render/graticule/GraticulePlugin.cpp
@@ -60,17 +60,17 @@ GraticulePlugin::GraticulePlugin( const MarbleModel *marbleModel )
QStringList GraticulePlugin::backendTypes() const
{
- return QStringList( "graticule" );
+ return QStringList(QStringLiteral("graticule"));
}
QString GraticulePlugin::renderPolicy() const
{
- return QString( "ALWAYS" );
+ return QStringLiteral("ALWAYS");
}
QStringList GraticulePlugin::renderPosition() const
{
- return QStringList( "SURFACE" );
+ return QStringList(QStringLiteral("SURFACE"));
}
QString GraticulePlugin::name() const
@@ -85,12 +85,12 @@ QString GraticulePlugin::guiString() const
QString GraticulePlugin::nameId() const
{
- return QString( "coordinate-grid" );
+ return QStringLiteral("coordinate-grid");
}
QString GraticulePlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString GraticulePlugin::description() const
@@ -100,18 +100,18 @@ QString GraticulePlugin::description() const
QString GraticulePlugin::copyrightYears() const
{
- return "2009";
+ return QStringLiteral("2009");
}
QVector<PluginAuthor> GraticulePlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Torsten Rahn", "tackat@kde.org" );
+ << PluginAuthor(QStringLiteral("Torsten Rahn"), QStringLiteral("tackat@kde.org"));
}
QIcon GraticulePlugin::icon () const
{
- return QIcon(":/icons/coordinate.png");
+ return QIcon(QStringLiteral(":/icons/coordinate.png"));
}
void GraticulePlugin::initialize ()
diff --git a/src/plugins/render/inhibit-screensaver/InhibitScreensaverPlugin.cpp b/src/plugins/render/inhibit-screensaver/InhibitScreensaverPlugin.cpp
index 5d19f6f..af489c8 100644
--- a/src/plugins/render/inhibit-screensaver/InhibitScreensaverPlugin.cpp
+++ b/src/plugins/render/inhibit-screensaver/InhibitScreensaverPlugin.cpp
@@ -78,7 +78,7 @@ QStringList InhibitScreensaverPlugin::backendTypes() const
QStringList InhibitScreensaverPlugin::renderPosition() const
{
// We're invisible, but need to be initialized
- return QStringList( "FLOAT_ITEM" );
+ return QStringList(QStringLiteral("FLOAT_ITEM"));
}
QString InhibitScreensaverPlugin::name() const
@@ -93,12 +93,12 @@ QString InhibitScreensaverPlugin::guiString() const
QString InhibitScreensaverPlugin::nameId() const
{
- return QString("inhibit-screensaver");
+ return QStringLiteral("inhibit-screensaver");
}
QString InhibitScreensaverPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString InhibitScreensaverPlugin::description() const
@@ -108,13 +108,13 @@ QString InhibitScreensaverPlugin::description() const
QString InhibitScreensaverPlugin::copyrightYears() const
{
- return "2010";
+ return QStringLiteral("2010");
}
QVector<PluginAuthor> InhibitScreensaverPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"));
}
QIcon InhibitScreensaverPlugin::icon() const
@@ -168,7 +168,7 @@ bool InhibitScreensaverPlugin::render( GeoPainter *, ViewportParams *, const QSt
QString InhibitScreensaverPlugin::renderPolicy() const
{
- return "NEVER";
+ return QStringLiteral("NEVER");
}
}
diff --git a/src/plugins/render/license/License.cpp b/src/plugins/render/license/License.cpp
index 8429221..7e7396b 100644
--- a/src/plugins/render/license/License.cpp
+++ b/src/plugins/render/license/License.cpp
@@ -86,7 +86,7 @@ License::~License()
QStringList License::backendTypes() const
{
- return QStringList( "License" );
+ return QStringList(QStringLiteral("License"));
}
QString License::name() const
@@ -101,12 +101,12 @@ QString License::guiString() const
QString License::nameId() const
{
- return QString( "license" );
+ return QStringLiteral("license");
}
QString License::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString License::description() const
@@ -116,19 +116,19 @@ QString License::description() const
QString License::copyrightYears() const
{
- return "2012";
+ return QStringLiteral("2012");
}
QVector<PluginAuthor> License::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" )
- << PluginAuthor( "Illya Kovalevskyy", "illya.kovalevskyy@gmail.com" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"))
+ << PluginAuthor(QStringLiteral("Illya Kovalevskyy"), QStringLiteral("illya.kovalevskyy@gmail.com"));
}
QIcon License::icon () const
{
- return QIcon(":/icons/license.png");
+ return QIcon(QStringLiteral(":/icons/license.png"));
}
void License::initialize ()
diff --git a/src/plugins/render/mapscale/MapScaleFloatItem.cpp b/src/plugins/render/mapscale/MapScaleFloatItem.cpp
index ed82a09..6282d3b 100644
--- a/src/plugins/render/mapscale/MapScaleFloatItem.cpp
+++ b/src/plugins/render/mapscale/MapScaleFloatItem.cpp
@@ -67,7 +67,7 @@ MapScaleFloatItem::~MapScaleFloatItem()
QStringList MapScaleFloatItem::backendTypes() const
{
- return QStringList( "mapscale" );
+ return QStringList(QStringLiteral("mapscale"));
}
QString MapScaleFloatItem::name() const
@@ -82,12 +82,12 @@ QString MapScaleFloatItem::guiString() const
QString MapScaleFloatItem::nameId() const
{
- return QString( "scalebar" );
+ return QStringLiteral("scalebar");
}
QString MapScaleFloatItem::version() const
{
- return "1.1";
+ return QStringLiteral("1.1");
}
QString MapScaleFloatItem::description() const
@@ -97,20 +97,20 @@ QString MapScaleFloatItem::description() const
QString MapScaleFloatItem::copyrightYears() const
{
- return "2008, 2010, 2012";
+ return QStringLiteral("2008, 2010, 2012");
}
QVector<PluginAuthor> MapScaleFloatItem::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Torsten Rahn", "tackat@kde.org", tr( "Original Developer" ) )
- << PluginAuthor( "Khanh-Nhan Nguyen", "khanh.nhan@wpi.edu" )
- << PluginAuthor( "Illya Kovalevskyy", "illya.kovalevskyy@gmail.com" );
+ << PluginAuthor(QStringLiteral("Torsten Rahn"), QStringLiteral("tackat@kde.org"), tr("Original Developer"))
+ << PluginAuthor(QStringLiteral("Khanh-Nhan Nguyen"), QStringLiteral("khanh.nhan@wpi.edu"))
+ << PluginAuthor(QStringLiteral("Illya Kovalevskyy"), QStringLiteral("illya.kovalevskyy@gmail.com"));
}
QIcon MapScaleFloatItem::icon () const
{
- return QIcon(":/icons/scalebar.png");
+ return QIcon(QStringLiteral(":/icons/scalebar.png"));
}
diff --git a/src/plugins/render/measure/MeasureToolPlugin.cpp b/src/plugins/render/measure/MeasureToolPlugin.cpp
index 8306f98..554c069 100644
--- a/src/plugins/render/measure/MeasureToolPlugin.cpp
+++ b/src/plugins/render/measure/MeasureToolPlugin.cpp
@@ -71,17 +71,17 @@ MeasureToolPlugin::MeasureToolPlugin( const MarbleModel *marbleModel )
QStringList MeasureToolPlugin::backendTypes() const
{
- return QStringList( "measuretool" );
+ return QStringList(QStringLiteral("measuretool"));
}
QString MeasureToolPlugin::renderPolicy() const
{
- return QString( "ALWAYS" );
+ return QStringLiteral("ALWAYS");
}
QStringList MeasureToolPlugin::renderPosition() const
{
- return QStringList() << "ATMOSPHERE";
+ return QStringList(QStringLiteral("ATMOSPHERE"));
}
QString MeasureToolPlugin::name() const
@@ -96,12 +96,12 @@ QString MeasureToolPlugin::guiString() const
QString MeasureToolPlugin::nameId() const
{
- return QString( "measure-tool" );
+ return QStringLiteral("measure-tool");
}
QString MeasureToolPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString MeasureToolPlugin::description() const
@@ -111,25 +111,25 @@ QString MeasureToolPlugin::description() const
QString MeasureToolPlugin::copyrightYears() const
{
- return "2006-2008, 2011";
+ return QStringLiteral("2006-2008, 2011");
}
QVector<PluginAuthor> MeasureToolPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" )
- << PluginAuthor( "Torsten Rahn", "tackat@kde.org" )
- << PluginAuthor( "Inge Wallin", "ingwa@kde.org" )
- << PluginAuthor( "Carlos Licea", "carlos.licea@kdemail.net" )
- << PluginAuthor( "Michael Henning", "mikehenning@eclipse.net" )
- << PluginAuthor( "Valery Kharitonov", "kharvd@gmail.com" )
- << PluginAuthor( "Mohammed Nafees", "nafees.technocool@gmail.com" )
- << PluginAuthor( "Illya Kovalevskyy", "illya.kovalevskyy@gmail.com" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"))
+ << PluginAuthor(QStringLiteral("Torsten Rahn"), QStringLiteral("tackat@kde.org"))
+ << PluginAuthor(QStringLiteral("Inge Wallin"), QStringLiteral("ingwa@kde.org"))
+ << PluginAuthor(QStringLiteral("Carlos Licea"), QStringLiteral("carlos.licea@kdemail.net"))
+ << PluginAuthor(QStringLiteral("Michael Henning"), QStringLiteral("mikehenning@eclipse.net"))
+ << PluginAuthor(QStringLiteral("Valery Kharitonov"), QStringLiteral("kharvd@gmail.com"))
+ << PluginAuthor(QStringLiteral("Mohammed Nafees"), QStringLiteral("nafees.technocool@gmail.com"))
+ << PluginAuthor(QStringLiteral("Illya Kovalevskyy"), QStringLiteral("illya.kovalevskyy@gmail.com"));
}
QIcon MeasureToolPlugin::icon () const
{
- return QIcon(":/icons/measure.png");
+ return QIcon(QStringLiteral(":/icons/measure.png"));
}
void MeasureToolPlugin::initialize ()
diff --git a/src/plugins/render/navigation/NavigationFloatItem.cpp b/src/plugins/render/navigation/NavigationFloatItem.cpp
index b28ae9a..d8de6aa 100644
--- a/src/plugins/render/navigation/NavigationFloatItem.cpp
+++ b/src/plugins/render/navigation/NavigationFloatItem.cpp
@@ -65,7 +65,7 @@ NavigationFloatItem::~NavigationFloatItem()
QStringList NavigationFloatItem::backendTypes() const
{
- return QStringList("navigation");
+ return QStringList(QStringLiteral("navigation"));
}
QString NavigationFloatItem::name() const
@@ -80,12 +80,12 @@ QString NavigationFloatItem::guiString() const
QString NavigationFloatItem::nameId() const
{
- return QString("navigation");
+ return QStringLiteral("navigation");
}
QString NavigationFloatItem::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString NavigationFloatItem::description() const
@@ -95,20 +95,20 @@ QString NavigationFloatItem::description() const
QString NavigationFloatItem::copyrightYears() const
{
- return "2008, 2010, 2013";
+ return QStringLiteral("2008, 2010, 2013");
}
QVector<PluginAuthor> NavigationFloatItem::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" )
- << PluginAuthor( "Bastian Holst", "bastianholst@gmx.de" )
- << PluginAuthor( "Mohammed Nafees", "nafees.technocool@gmail.com" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"))
+ << PluginAuthor(QStringLiteral("Bastian Holst"), QStringLiteral("bastianholst@gmx.de"))
+ << PluginAuthor(QStringLiteral("Mohammed Nafees"), QStringLiteral("nafees.technocool@gmail.com"));
}
QIcon NavigationFloatItem::icon() const
{
- return QIcon(":/icons/navigation.png");
+ return QIcon(QStringLiteral(":/icons/navigation.png"));
}
void NavigationFloatItem::initialize()
diff --git a/src/plugins/render/opencachingcom/OpenCachingComPlugin.cpp b/src/plugins/render/opencachingcom/OpenCachingComPlugin.cpp
index 4b1baa4..1991287 100644
--- a/src/plugins/render/opencachingcom/OpenCachingComPlugin.cpp
+++ b/src/plugins/render/opencachingcom/OpenCachingComPlugin.cpp
@@ -44,7 +44,7 @@ bool OpenCachingComPlugin::isInitialized() const
QStringList OpenCachingComPlugin::backendTypes() const
{
- return QStringList("opencaching.com");
+ return QStringList(QStringLiteral("opencaching.com"));
}
QString OpenCachingComPlugin::name() const
@@ -59,12 +59,12 @@ QString OpenCachingComPlugin::guiString() const
QString OpenCachingComPlugin::nameId() const
{
- return QString( "opencaching.com" );
+ return QStringLiteral("opencaching.com");
}
QString OpenCachingComPlugin::version() const
{
- return QString( "1.0" );
+ return QStringLiteral("1.0");
}
QString OpenCachingComPlugin::description() const
@@ -74,18 +74,18 @@ QString OpenCachingComPlugin::description() const
QString OpenCachingComPlugin::copyrightYears() const
{
- return QString( "2012" );
+ return QStringLiteral("2012");
}
QVector<PluginAuthor> OpenCachingComPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Anders Lund", "anders@alweb.dk" );
+ << PluginAuthor(QStringLiteral("Anders Lund"), QStringLiteral("anders@alweb.dk"));
}
QIcon OpenCachingComPlugin::icon() const
{
- return QIcon(":/occlogo.png");
+ return QIcon(QStringLiteral(":/occlogo.png"));
}
}
diff --git a/src/plugins/render/opendesktop/OpenDesktopPlugin.cpp b/src/plugins/render/opendesktop/OpenDesktopPlugin.cpp
index cc2c7bb..ed622a6 100644
--- a/src/plugins/render/opendesktop/OpenDesktopPlugin.cpp
+++ b/src/plugins/render/opendesktop/OpenDesktopPlugin.cpp
@@ -53,12 +53,12 @@ QString OpenDesktopPlugin::guiString() const
QString OpenDesktopPlugin::nameId() const
{
- return "opendesktop";
+ return QStringLiteral("opendesktop");
}
QString OpenDesktopPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString OpenDesktopPlugin::description() const
@@ -68,18 +68,18 @@ QString OpenDesktopPlugin::description() const
QString OpenDesktopPlugin::copyrightYears() const
{
- return "2010";
+ return QStringLiteral("2010");
}
QVector<PluginAuthor> OpenDesktopPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Utku Aydin" ), "utkuaydin34@gmail.com" );
+ << PluginAuthor(QStringLiteral("Utku Aydin"), QStringLiteral("utkuaydin34@gmail.com"));
}
QIcon OpenDesktopPlugin::icon() const
{
- return QIcon(":/icons/social.png");
+ return QIcon(QStringLiteral(":/icons/social.png"));
}
QDialog *OpenDesktopPlugin::configDialog()
diff --git a/src/plugins/render/overviewmap/OverviewMap.cpp b/src/plugins/render/overviewmap/OverviewMap.cpp
index d4d08dc..b0cfd86 100644
--- a/src/plugins/render/overviewmap/OverviewMap.cpp
+++ b/src/plugins/render/overviewmap/OverviewMap.cpp
@@ -71,7 +71,7 @@ OverviewMap::~OverviewMap()
QStringList OverviewMap::backendTypes() const
{
- return QStringList( "overviewmap" );
+ return QStringList(QStringLiteral("overviewmap"));
}
QString OverviewMap::name() const
@@ -86,12 +86,12 @@ QString OverviewMap::guiString() const
QString OverviewMap::nameId() const
{
- return QString( "overviewmap" );
+ return QStringLiteral("overviewmap");
}
QString OverviewMap::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString OverviewMap::description() const
@@ -101,18 +101,18 @@ QString OverviewMap::description() const
QString OverviewMap::copyrightYears() const
{
- return "2008";
+ return QStringLiteral("2008");
}
QVector<PluginAuthor> OverviewMap::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Torsten Rahn", "tackat@kde.org" );
+ << PluginAuthor(QStringLiteral("Torsten Rahn"), QStringLiteral("tackat@kde.org"));
}
QIcon OverviewMap::icon () const
{
- return QIcon(":/icons/worldmap.png");
+ return QIcon(QStringLiteral(":/icons/worldmap.png"));
}
QDialog *OverviewMap::configDialog()
diff --git a/src/plugins/render/panoramio/PanoramioPlugin.cpp b/src/plugins/render/panoramio/PanoramioPlugin.cpp
index 5e1f96a..b3ae8dd 100644
--- a/src/plugins/render/panoramio/PanoramioPlugin.cpp
+++ b/src/plugins/render/panoramio/PanoramioPlugin.cpp
@@ -24,7 +24,7 @@ PanoramioPlugin::PanoramioPlugin( const MarbleModel *marbleModel ) :
QString Marble::PanoramioPlugin::nameId() const
{
- return "panoramio";
+ return QStringLiteral("panoramio");
}
void PanoramioPlugin::initialize()
@@ -50,23 +50,23 @@ QString PanoramioPlugin::description() const
QIcon PanoramioPlugin::icon() const
{
- return QIcon( ":/icons/panoramio.png" );
+ return QIcon(QStringLiteral(":/icons/panoramio.png"));
}
QString Marble::PanoramioPlugin::version() const
{
- return "0.1";
+ return QStringLiteral("0.1");
}
QString PanoramioPlugin::copyrightYears() const
{
- return "2009, 2014";
+ return QStringLiteral("2009, 2014");
}
QVector<PluginAuthor> PanoramioPlugin::pluginAuthors() const
{
- return QVector<PluginAuthor>() << PluginAuthor( "Bastian Holst", "bastianholst@gmx.de" );
+ return QVector<PluginAuthor>() << PluginAuthor(QStringLiteral("Bastian Holst"), QStringLiteral("bastianholst@gmx.de"));
}
bool PanoramioPlugin::eventFilter(QObject *object, QEvent *event)
diff --git a/src/plugins/render/photo/PhotoPlugin.cpp b/src/plugins/render/photo/PhotoPlugin.cpp
index 2d8ee93..970fa52 100644
--- a/src/plugins/render/photo/PhotoPlugin.cpp
+++ b/src/plugins/render/photo/PhotoPlugin.cpp
@@ -80,12 +80,12 @@ QString PhotoPlugin::guiString() const
QString PhotoPlugin::nameId() const
{
- return "photo";
+ return QStringLiteral("photo");
}
QString PhotoPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString PhotoPlugin::description() const
@@ -95,19 +95,19 @@ QString PhotoPlugin::description() const
QString PhotoPlugin::copyrightYears() const
{
- return "2009, 2012";
+ return QStringLiteral("2009, 2012");
}
QVector<PluginAuthor> PhotoPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Bastian Holst", "bastianholst@gmx.de" )
- << PluginAuthor( "Mohammed Nafees", "nafees.technocool@gmail.com" );
+ << PluginAuthor(QStringLiteral("Bastian Holst"), QStringLiteral("bastianholst@gmx.de"))
+ << PluginAuthor(QStringLiteral("Mohammed Nafees"), QStringLiteral("nafees.technocool@gmail.com"));
}
QIcon PhotoPlugin::icon() const
{
- return QIcon(":/icons/photo.png");
+ return QIcon(QStringLiteral(":/icons/photo.png"));
}
QDialog *PhotoPlugin::configDialog()
diff --git a/src/plugins/render/positionmarker/PositionMarker.cpp b/src/plugins/render/positionmarker/PositionMarker.cpp
index 8aa84b8..77b5c7d 100644
--- a/src/plugins/render/positionmarker/PositionMarker.cpp
+++ b/src/plugins/render/positionmarker/PositionMarker.cpp
@@ -66,17 +66,17 @@ PositionMarker::~PositionMarker ()
QStringList PositionMarker::renderPosition() const
{
- return QStringList( "HOVERS_ABOVE_SURFACE" );
+ return QStringList(QStringLiteral("HOVERS_ABOVE_SURFACE"));
}
QString PositionMarker::renderPolicy() const
{
- return "ALWAYS";
+ return QStringLiteral("ALWAYS");
}
QStringList PositionMarker::backendTypes() const
{
- return QStringList( "positionmarker" );
+ return QStringList(QStringLiteral("positionmarker"));
}
QString PositionMarker::name() const
@@ -91,12 +91,12 @@ QString PositionMarker::guiString() const
QString PositionMarker::nameId() const
{
- return QString( "positionMarker" );
+ return QStringLiteral("positionMarker");
}
QString PositionMarker::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString PositionMarker::description() const
@@ -106,21 +106,21 @@ QString PositionMarker::description() const
QString PositionMarker::copyrightYears() const
{
- return "2009, 2010";
+ return QStringLiteral("2009, 2010");
}
QVector<PluginAuthor> PositionMarker::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Andrew Manson", "g.real.ate@gmail.com" )
- << PluginAuthor( "Eckhart Woerner", "ewoerner@kde.org" )
- << PluginAuthor( "Thibaut Gridel", "tgridel@free.fr" )
- << PluginAuthor( "Daniel Marth", "danielmarth@gmx.at" );
+ << PluginAuthor(QStringLiteral("Andrew Manson"), QStringLiteral("g.real.ate@gmail.com"))
+ << PluginAuthor(QStringLiteral("Eckhart Woerner"), QStringLiteral("ewoerner@kde.org"))
+ << PluginAuthor(QStringLiteral("Thibaut Gridel"), QStringLiteral("tgridel@free.fr"))
+ << PluginAuthor(QStringLiteral("Daniel Marth"), QStringLiteral("danielmarth@gmx.at"));
}
QIcon PositionMarker::icon() const
{
- return QIcon(":/icons/positionmarker.png");
+ return QIcon(QStringLiteral(":/icons/positionmarker.png"));
}
QDialog *PositionMarker::configDialog()
diff --git a/src/plugins/render/postalcode/PostalCodePlugin.cpp b/src/plugins/render/postalcode/PostalCodePlugin.cpp
index 27fbff1..cfc3cef 100644
--- a/src/plugins/render/postalcode/PostalCodePlugin.cpp
+++ b/src/plugins/render/postalcode/PostalCodePlugin.cpp
@@ -45,23 +45,23 @@ QString PostalCodePlugin::guiString() const
QString PostalCodePlugin::nameId() const
{
- return "postalCode";
+ return QStringLiteral("postalCode");
}
QString PostalCodePlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString PostalCodePlugin::copyrightYears() const
{
- return "2011";
+ return QStringLiteral("2011");
}
QVector<PluginAuthor> PostalCodePlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Valery Kharitonov", "kharvd@gmail.com" );
+ << PluginAuthor(QStringLiteral("Valery Kharitonov"), QStringLiteral("kharvd@gmail.com"));
}
QString PostalCodePlugin::description() const
@@ -71,7 +71,7 @@ QString PostalCodePlugin::description() const
QIcon PostalCodePlugin::icon() const
{
- return QIcon(":/icons/postalcode.png");
+ return QIcon(QStringLiteral(":/icons/postalcode.png"));
}
#include "moc_PostalCodePlugin.cpp"
diff --git a/src/plugins/render/progress/ProgressFloatItem.cpp b/src/plugins/render/progress/ProgressFloatItem.cpp
index 6daffd7..00944b6 100644
--- a/src/plugins/render/progress/ProgressFloatItem.cpp
+++ b/src/plugins/render/progress/ProgressFloatItem.cpp
@@ -79,7 +79,7 @@ ProgressFloatItem::~ProgressFloatItem ()
QStringList ProgressFloatItem::backendTypes() const
{
- return QStringList( "progress" );
+ return QStringList(QStringLiteral("progress"));
}
QString ProgressFloatItem::name() const
@@ -94,12 +94,12 @@ QString ProgressFloatItem::guiString() const
QString ProgressFloatItem::nameId() const
{
- return QString( "progress" );
+ return QStringLiteral("progress");
}
QString ProgressFloatItem::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString ProgressFloatItem::description() const
@@ -109,14 +109,14 @@ QString ProgressFloatItem::description() const
QString ProgressFloatItem::copyrightYears() const
{
- return "2010, 2011";
+ return QStringLiteral("2010, 2011");
}
QVector<PluginAuthor> ProgressFloatItem::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" )
- << PluginAuthor( "Bernhard Beschow", "bbeschow@cs.tu-berlin.de" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"))
+ << PluginAuthor(QStringLiteral("Bernhard Beschow"), QStringLiteral("bbeschow@cs.tu-berlin.de"));
}
QIcon ProgressFloatItem::icon() const
diff --git a/src/plugins/render/routing/RoutingPlugin.cpp b/src/plugins/render/routing/RoutingPlugin.cpp
index bf6795c..12a2c4a 100644
--- a/src/plugins/render/routing/RoutingPlugin.cpp
+++ b/src/plugins/render/routing/RoutingPlugin.cpp
@@ -442,7 +442,7 @@ RoutingPlugin::~RoutingPlugin()
QStringList RoutingPlugin::backendTypes() const
{
- return QStringList( "routing" );
+ return QStringList(QStringLiteral("routing"));
}
QString RoutingPlugin::name() const
@@ -457,12 +457,12 @@ QString RoutingPlugin::guiString() const
QString RoutingPlugin::nameId() const
{
- return QString( "routing" );
+ return QStringLiteral("routing");
}
QString RoutingPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString RoutingPlugin::description() const
@@ -472,19 +472,19 @@ QString RoutingPlugin::description() const
QString RoutingPlugin::copyrightYears() const
{
- return "2010";
+ return QStringLiteral("2010");
}
QVector<PluginAuthor> RoutingPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Siddharth Srivastava", "akssps011@gmail.com" )
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" );
+ << PluginAuthor(QStringLiteral("Siddharth Srivastava"), QStringLiteral("akssps011@gmail.com"))
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"));
}
QIcon RoutingPlugin::icon() const
{
- return QIcon(":/icons/routeplanning.png");
+ return QIcon(QStringLiteral(":/icons/routeplanning.png"));
}
void RoutingPlugin::initialize()
diff --git a/src/plugins/render/satellites/SatellitesPlugin.cpp b/src/plugins/render/satellites/SatellitesPlugin.cpp
index 64c7fea..3b248ab 100644
--- a/src/plugins/render/satellites/SatellitesPlugin.cpp
+++ b/src/plugins/render/satellites/SatellitesPlugin.cpp
@@ -69,17 +69,17 @@ SatellitesPlugin::~SatellitesPlugin()
QStringList SatellitesPlugin::backendTypes() const
{
- return QStringList( "satellites" );
+ return QStringList(QStringLiteral("satellites"));
}
QString SatellitesPlugin::renderPolicy() const
{
- return QString( "ALWAYS" );
+ return QStringLiteral("ALWAYS");
}
QStringList SatellitesPlugin::renderPosition() const
{
- return QStringList( "ORBIT" );
+ return QStringList(QStringLiteral("ORBIT"));
}
QString SatellitesPlugin::name() const
@@ -89,7 +89,7 @@ QString SatellitesPlugin::name() const
QString SatellitesPlugin::nameId() const
{
- return "satellites";
+ return QStringLiteral("satellites");
}
QString SatellitesPlugin::guiString() const
@@ -99,7 +99,7 @@ QString SatellitesPlugin::guiString() const
QString SatellitesPlugin::version() const
{
- return "2.0";
+ return QStringLiteral("2.0");
}
QString SatellitesPlugin::description() const
@@ -109,15 +109,15 @@ QString SatellitesPlugin::description() const
QString SatellitesPlugin::copyrightYears() const
{
- return "2012";
+ return QStringLiteral("2012");
}
QVector<PluginAuthor> SatellitesPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Guillaume Martres", "smarter@ubuntu.com" )
- << PluginAuthor( "Rene Kuettner", "rene@bitkanal.net" )
- << PluginAuthor( "Gerhard Holtkamp", "" );
+ << PluginAuthor(QStringLiteral("Guillaume Martres"), QStringLiteral("smarter@ubuntu.com"))
+ << PluginAuthor(QStringLiteral("Rene Kuettner"), QStringLiteral("rene@bitkanal.net"))
+ << PluginAuthor(QStringLiteral("Gerhard Holtkamp"), QString());
}
QString SatellitesPlugin::aboutDataText() const
@@ -134,7 +134,7 @@ QString SatellitesPlugin::aboutDataText() const
QIcon SatellitesPlugin::icon() const
{
- return QIcon( ":/data/bitmaps/satellite.png" );
+ return QIcon(QStringLiteral(":/data/bitmaps/satellite.png"));
}
RenderPlugin::RenderType SatellitesPlugin::renderType() const
diff --git a/src/plugins/render/speedometer/Speedometer.cpp b/src/plugins/render/speedometer/Speedometer.cpp
index f93a4d9b..6e9c532 100644
--- a/src/plugins/render/speedometer/Speedometer.cpp
+++ b/src/plugins/render/speedometer/Speedometer.cpp
@@ -48,7 +48,7 @@ Speedometer::~Speedometer()
QStringList Speedometer::backendTypes() const
{
- return QStringList( "speedometer" );
+ return QStringList(QStringLiteral("speedometer"));
}
QString Speedometer::name() const
@@ -63,12 +63,12 @@ QString Speedometer::guiString() const
QString Speedometer::nameId() const
{
- return QString( "speedometer" );
+ return QStringLiteral("speedometer");
}
QString Speedometer::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString Speedometer::description() const
@@ -78,18 +78,18 @@ QString Speedometer::description() const
QString Speedometer::copyrightYears() const
{
- return "2011";
+ return QStringLiteral("2011");
}
QVector<PluginAuthor> Speedometer::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Bernhard Beschow", "bbeschow@cs.tu-berlin.de" );
+ << PluginAuthor(QStringLiteral("Bernhard Beschow"), QStringLiteral("bbeschow@cs.tu-berlin.de"));
}
QIcon Speedometer::icon () const
{
- return QIcon(":/icons/speedometer.png");
+ return QIcon(QStringLiteral(":/icons/speedometer.png"));
}
void Speedometer::initialize ()
diff --git a/src/plugins/render/stars/StarsPlugin.cpp b/src/plugins/render/stars/StarsPlugin.cpp
index a33fc9c..4d20a70 100644
--- a/src/plugins/render/stars/StarsPlugin.cpp
+++ b/src/plugins/render/stars/StarsPlugin.cpp
@@ -84,17 +84,17 @@ StarsPlugin::~StarsPlugin()
QStringList StarsPlugin::backendTypes() const
{
- return QStringList( "stars" );
+ return QStringList(QStringLiteral("stars"));
}
QString StarsPlugin::renderPolicy() const
{
- return QString( "SPECIFIED_ALWAYS" );
+ return QStringLiteral("SPECIFIED_ALWAYS");
}
QStringList StarsPlugin::renderPosition() const
{
- return QStringList() << "STARS";
+ return QStringList(QStringLiteral("STARS"));
}
RenderPlugin::RenderType StarsPlugin::renderType() const
@@ -114,12 +114,12 @@ QString StarsPlugin::guiString() const
QString StarsPlugin::nameId() const
{
- return QString( "stars" );
+ return QStringLiteral("stars");
}
QString StarsPlugin::version() const
{
- return "1.2";
+ return QStringLiteral("1.2");
}
QString StarsPlugin::description() const
@@ -129,20 +129,20 @@ QString StarsPlugin::description() const
QString StarsPlugin::copyrightYears() const
{
- return "2008-2012";
+ return QStringLiteral("2008-2012");
}
QVector<PluginAuthor> StarsPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Torsten Rahn", "tackat@kde.org" )
- << PluginAuthor( "Rene Kuettner", "rene@bitkanal.net" )
- << PluginAuthor( "Timothy Lanzi", "trlanzi@gmail.com" );
+ << PluginAuthor(QStringLiteral("Torsten Rahn"), QStringLiteral("tackat@kde.org"))
+ << PluginAuthor(QStringLiteral("Rene Kuettner"), QStringLiteral("rene@bitkanal.net"))
+ << PluginAuthor(QStringLiteral("Timothy Lanzi"), QStringLiteral("trlanzi@gmail.com"));
}
QIcon StarsPlugin::icon() const
{
- return QIcon(":/icons/stars.png");
+ return QIcon(QStringLiteral(":/icons/stars.png"));
}
void StarsPlugin::initialize()
diff --git a/src/plugins/render/sun/SunPlugin.cpp b/src/plugins/render/sun/SunPlugin.cpp
index a40fe12..f66eee1 100644
--- a/src/plugins/render/sun/SunPlugin.cpp
+++ b/src/plugins/render/sun/SunPlugin.cpp
@@ -35,18 +35,17 @@ SunPlugin::SunPlugin( const MarbleModel *marbleModel )
QStringList SunPlugin::backendTypes() const
{
- return QStringList( "stars" );
+ return QStringList(QStringLiteral("stars"));
}
QString SunPlugin::renderPolicy() const
{
- return QString( "SPECIFIED_ALWAYS" );
+ return QStringLiteral("SPECIFIED_ALWAYS");
}
QStringList SunPlugin::renderPosition() const
{
- QStringList layers = QStringList() << "ALWAYS_ON_TOP";
- return layers;
+ return QStringList(QStringLiteral("ALWAYS_ON_TOP"));
}
QString SunPlugin::name() const
@@ -61,12 +60,12 @@ QString SunPlugin::guiString() const
QString SunPlugin::nameId() const
{
- return QString( "sun" );
+ return QStringLiteral("sun");
}
QString SunPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString SunPlugin::description() const
@@ -76,20 +75,20 @@ QString SunPlugin::description() const
QString SunPlugin::copyrightYears() const
{
- return "2011";
+ return QStringLiteral("2011");
}
QVector<PluginAuthor> SunPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Torsten Rahn", "tackat@kde.org" )
- << PluginAuthor( "Bernhard Beschow", "bbeschow@cs.tu-berlin.de")
- << PluginAuthor( "Harshit Jain", "hjain.itbhu@gmail.com" );
+ << PluginAuthor(QStringLiteral("Torsten Rahn"), QStringLiteral("tackat@kde.org"))
+ << PluginAuthor(QStringLiteral("Bernhard Beschow"), QStringLiteral("bbeschow@cs.tu-berlin.de"))
+ << PluginAuthor(QStringLiteral("Harshit Jain"), QStringLiteral("hjain.itbhu@gmail.com"));
}
QIcon SunPlugin::icon () const
{
- return QIcon( MarbleDirs::path( "svg/sunshine.png" ) );
+ return QIcon(MarbleDirs::path(QStringLiteral("svg/sunshine.png")));
}
diff --git a/src/plugins/render/test/TestPlugin.cpp b/src/plugins/render/test/TestPlugin.cpp
index 7af3825..1d9f164 100644
--- a/src/plugins/render/test/TestPlugin.cpp
+++ b/src/plugins/render/test/TestPlugin.cpp
@@ -40,17 +40,17 @@ TestPlugin::TestPlugin(const MarbleModel *marbleModel)
QStringList TestPlugin::backendTypes() const
{
- return QStringList( "test" );
+ return QStringList(QStringLiteral("test"));
}
QString TestPlugin::renderPolicy() const
{
- return QString( "ALWAYS" );
+ return QStringLiteral("ALWAYS");
}
QStringList TestPlugin::renderPosition() const
{
- return QStringList( "ALWAYS_ON_TOP" );
+ return QStringList(QStringLiteral("ALWAYS_ON_TOP"));
}
QString TestPlugin::name() const
@@ -65,12 +65,12 @@ QString TestPlugin::guiString() const
QString TestPlugin::nameId() const
{
- return QString( "test-plugin" );
+ return QStringLiteral("test-plugin");
}
QString TestPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString TestPlugin::description() const
@@ -80,13 +80,13 @@ QString TestPlugin::description() const
QString TestPlugin::copyrightYears() const
{
- return "2008";
+ return QStringLiteral("2008");
}
QVector<PluginAuthor> TestPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor("Torsten Rahn", "tackat@kde.org");
+ << PluginAuthor(QStringLiteral("Torsten Rahn"), QStringLiteral("tackat@kde.org"));
}
QIcon TestPlugin::icon () const
diff --git a/src/plugins/render/twitter/twitterPlugin.cpp b/src/plugins/render/twitter/twitterPlugin.cpp
index 2367e5d..79922b0 100644
--- a/src/plugins/render/twitter/twitterPlugin.cpp
+++ b/src/plugins/render/twitter/twitterPlugin.cpp
@@ -27,17 +27,17 @@ twitterPlugin::~twitterPlugin()
QStringList twitterPlugin::backendTypes() const
{
- return QStringList("twitter");
+ return QStringList(QStringLiteral("twitter"));
}
QString twitterPlugin::renderPolicy() const
{
- return QString("ALWAYS");
+ return QStringLiteral("ALWAYS");
}
QStringList twitterPlugin::renderPosition() const
{
- return QStringList("ALWAYS_ON_TOP");
+ return QStringList(QStringLiteral("ALWAYS_ON_TOP"));
}
QString twitterPlugin::name() const
@@ -52,7 +52,7 @@ QString twitterPlugin::guiString() const
QString twitterPlugin::nameId() const
{
- return QString("twitter");
+ return QStringLiteral("twitter");
}
QString twitterPlugin::description() const
diff --git a/src/plugins/render/weather/WeatherPlugin.cpp b/src/plugins/render/weather/WeatherPlugin.cpp
index a1d617b..9d6c864 100644
--- a/src/plugins/render/weather/WeatherPlugin.cpp
+++ b/src/plugins/render/weather/WeatherPlugin.cpp
@@ -86,12 +86,12 @@ QString WeatherPlugin::guiString() const
QString WeatherPlugin::nameId() const
{
- return "weather";
+ return QStringLiteral("weather");
}
QString WeatherPlugin::version() const
{
- return "1.1";
+ return QStringLiteral("1.1");
}
QString WeatherPlugin::description() const
@@ -101,14 +101,14 @@ QString WeatherPlugin::description() const
QString WeatherPlugin::copyrightYears() const
{
- return "2009, 2011";
+ return QStringLiteral("2009, 2011");
}
QVector<PluginAuthor> WeatherPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Bastian Holst", "bastianholst@gmx.de" )
- << PluginAuthor( "Valery Kharitonov", "kharvd@gmail.com" );
+ << PluginAuthor(QStringLiteral("Bastian Holst"), QStringLiteral("bastianholst@gmx.de"))
+ << PluginAuthor(QStringLiteral("Valery Kharitonov"), QStringLiteral("kharvd@gmail.com"));
}
QString WeatherPlugin::aboutDataText() const
diff --git a/src/plugins/render/wikipedia/WikipediaPlugin.cpp b/src/plugins/render/wikipedia/WikipediaPlugin.cpp
index 385d672..8f3e0da 100644
--- a/src/plugins/render/wikipedia/WikipediaPlugin.cpp
+++ b/src/plugins/render/wikipedia/WikipediaPlugin.cpp
@@ -79,12 +79,12 @@ QString WikipediaPlugin::guiString() const
QString WikipediaPlugin::nameId() const
{
- return "wikipedia";
+ return QStringLiteral("wikipedia");
}
QString WikipediaPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString WikipediaPlugin::description() const
@@ -94,13 +94,13 @@ QString WikipediaPlugin::description() const
QString WikipediaPlugin::copyrightYears() const
{
- return "2009";
+ return QStringLiteral("2009");
}
QVector<PluginAuthor> WikipediaPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Bastian Holst", "bastianholst@gmx.de" );
+ << PluginAuthor(QStringLiteral("Bastian Holst"), QStringLiteral("bastianholst@gmx.de"));
}
QString WikipediaPlugin::aboutDataText() const
diff --git a/src/plugins/runner/cache/CachePlugin.cpp b/src/plugins/runner/cache/CachePlugin.cpp
index 2db665c..af0b7b9 100644
--- a/src/plugins/runner/cache/CachePlugin.cpp
+++ b/src/plugins/runner/cache/CachePlugin.cpp
@@ -25,12 +25,12 @@ QString CachePlugin::name() const
QString CachePlugin::nameId() const
{
- return "Cache";
+ return QStringLiteral("Cache");
}
QString CachePlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString CachePlugin::description() const
@@ -40,13 +40,13 @@ QString CachePlugin::description() const
QString CachePlugin::copyrightYears() const
{
- return "2011";
+ return QStringLiteral("2011");
}
QVector<PluginAuthor> CachePlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Thibaut Gridel", "tgridel@free.fr" );
+ << PluginAuthor(QStringLiteral("Thibaut Gridel"), QStringLiteral("tgridel@free.fr"));
}
QString CachePlugin::fileFormatDescription() const
@@ -56,7 +56,7 @@ QString CachePlugin::fileFormatDescription() const
QStringList CachePlugin::fileExtensions() const
{
- return QStringList() << "cache";
+ return QStringList(QStringLiteral("cache"));
}
ParsingRunner* CachePlugin::newRunner() const
diff --git a/src/plugins/runner/cyclestreets/CycleStreetsPlugin.cpp b/src/plugins/runner/cyclestreets/CycleStreetsPlugin.cpp
index 6cdd654..5a6c7ad 100644
--- a/src/plugins/runner/cyclestreets/CycleStreetsPlugin.cpp
+++ b/src/plugins/runner/cyclestreets/CycleStreetsPlugin.cpp
@@ -83,7 +83,7 @@ QHash<QString, QVariant> CycleStreetsConfigWidget::settings() const
CycleStreetsPlugin::CycleStreetsPlugin( QObject *parent ) :
RoutingRunnerPlugin( parent )
{
- setSupportedCelestialBodies( QStringList() << "earth" );
+ setSupportedCelestialBodies(QStringList(QStringLiteral("earth")));
setCanWorkOffline( false );
setStatusMessage( tr ( "This service requires an Internet connection." ) );
}
@@ -100,12 +100,12 @@ QString CycleStreetsPlugin::guiString() const
QString CycleStreetsPlugin::nameId() const
{
- return "cyclestreets";
+ return QStringLiteral("cyclestreets");
}
QString CycleStreetsPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString CycleStreetsPlugin::description() const
@@ -115,13 +115,13 @@ QString CycleStreetsPlugin::description() const
QString CycleStreetsPlugin::copyrightYears() const
{
- return "2013";
+ return QStringLiteral("2013");
}
QVector<PluginAuthor> CycleStreetsPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Mihail Ivchenko" ), "ematirov@gmail.com" );
+ << PluginAuthor(QStringLiteral("Mihail Ivchenko"), QStringLiteral("ematirov@gmail.com"));
}
RoutingRunner *CycleStreetsPlugin::newRunner() const
diff --git a/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.cpp b/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.cpp
index 6f600ee..283c5d5 100644
--- a/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.cpp
+++ b/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.cpp
@@ -22,7 +22,7 @@ namespace Marble
GosmorePlugin::GosmorePlugin( QObject *parent ) :
ReverseGeocodingRunnerPlugin( parent )
{
- setSupportedCelestialBodies( QStringList() << "earth" );
+ setSupportedCelestialBodies(QStringList(QStringLiteral("earth")));
setCanWorkOffline( true );
}
@@ -38,12 +38,12 @@ QString GosmorePlugin::guiString() const
QString GosmorePlugin::nameId() const
{
- return "gosmore-reverse";
+ return QStringLiteral("gosmore-reverse");
}
QString GosmorePlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString GosmorePlugin::description() const
@@ -53,14 +53,14 @@ QString GosmorePlugin::description() const
QString GosmorePlugin::copyrightYears() const
{
- return "2010, 2012";
+ return QStringLiteral("2010, 2012");
}
QVector<PluginAuthor> GosmorePlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" )
- << PluginAuthor( "Bernhard Beschow", "bbeschow@cs.tu-berlin.de" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"))
+ << PluginAuthor(QStringLiteral("Bernhard Beschow"), QStringLiteral("bbeschow@cs.tu-berlin.de"));
}
ReverseGeocodingRunner* GosmorePlugin::newRunner() const
diff --git a/src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.cpp b/src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.cpp
index 9065d9d..963b0c0 100644
--- a/src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.cpp
+++ b/src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.cpp
@@ -22,7 +22,7 @@ namespace Marble
GosmorePlugin::GosmorePlugin( QObject *parent ) :
RoutingRunnerPlugin( parent )
{
- setSupportedCelestialBodies( QStringList() << "earth" );
+ setSupportedCelestialBodies(QStringList(QStringLiteral("earth")));
setCanWorkOffline( true );
}
@@ -38,12 +38,12 @@ QString GosmorePlugin::guiString() const
QString GosmorePlugin::nameId() const
{
- return "gosmore-routing";
+ return QStringLiteral("gosmore-routing");
}
QString GosmorePlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString GosmorePlugin::description() const
@@ -53,14 +53,14 @@ QString GosmorePlugin::description() const
QString GosmorePlugin::copyrightYears() const
{
- return "2010, 2012";
+ return QStringLiteral("2010, 2012");
}
QVector<PluginAuthor> GosmorePlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" )
- << PluginAuthor( "Bernhard Beschow", "bbeschow@cs.tu-berlin.de" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"))
+ << PluginAuthor(QStringLiteral("Bernhard Beschow"), QStringLiteral("bbeschow@cs.tu-berlin.de"));
}
RoutingRunner *GosmorePlugin::newRunner() const
diff --git a/src/plugins/runner/gpsbabel/GpsbabelPlugin.cpp b/src/plugins/runner/gpsbabel/GpsbabelPlugin.cpp
index 483ab18..3d6a07b 100644
--- a/src/plugins/runner/gpsbabel/GpsbabelPlugin.cpp
+++ b/src/plugins/runner/gpsbabel/GpsbabelPlugin.cpp
@@ -25,12 +25,12 @@ QString GpsbabelPlugin::name() const
QString GpsbabelPlugin::nameId() const
{
- return "GPSBabel";
+ return QStringLiteral("GPSBabel");
}
QString GpsbabelPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString GpsbabelPlugin::description() const
@@ -40,13 +40,13 @@ QString GpsbabelPlugin::description() const
QString GpsbabelPlugin::copyrightYears() const
{
- return "2013";
+ return QStringLiteral("2013");
}
QVector<PluginAuthor> GpsbabelPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Mohammed Nafees", "nafees.technocool@gmail.com" );
+ << PluginAuthor(QStringLiteral("Mohammed Nafees"), QStringLiteral("nafees.technocool@gmail.com"));
}
QString GpsbabelPlugin::fileFormatDescription() const
@@ -56,8 +56,14 @@ QString GpsbabelPlugin::fileFormatDescription() const
QStringList GpsbabelPlugin::fileExtensions() const
{
- return QStringList() << "nmea" << "igc" << "tiger" << "ov2"
- << "garmin" << "csv" << "magellan";
+ return QStringList()
+ << QStringLiteral("nmea")
+ << QStringLiteral("igc")
+ << QStringLiteral("tiger")
+ << QStringLiteral("ov2")
+ << QStringLiteral("garmin")
+ << QStringLiteral("csv")
+ << QStringLiteral("magellan");
}
ParsingRunner* GpsbabelPlugin::newRunner() const
diff --git a/src/plugins/runner/gpx/GpxPlugin.cpp b/src/plugins/runner/gpx/GpxPlugin.cpp
index 7a9fc28..32974e4 100644
--- a/src/plugins/runner/gpx/GpxPlugin.cpp
+++ b/src/plugins/runner/gpx/GpxPlugin.cpp
@@ -25,12 +25,12 @@ QString GpxPlugin::name() const
QString GpxPlugin::nameId() const
{
- return "Gpx";
+ return QStringLiteral("Gpx");
}
QString GpxPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString GpxPlugin::description() const
@@ -40,13 +40,13 @@ QString GpxPlugin::description() const
QString GpxPlugin::copyrightYears() const
{
- return "2011";
+ return QStringLiteral("2011");
}
QVector<PluginAuthor> GpxPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Thibaut Gridel", "tgridel@free.fr" );
+ << PluginAuthor(QStringLiteral("Thibaut Gridel"), QStringLiteral("tgridel@free.fr"));
}
QString GpxPlugin::fileFormatDescription() const
@@ -56,7 +56,7 @@ QString GpxPlugin::fileFormatDescription() const
QStringList GpxPlugin::fileExtensions() const
{
- return QStringList() << "gpx";
+ return QStringList(QStringLiteral("gpx"));
}
ParsingRunner* GpxPlugin::newRunner() const
diff --git a/src/plugins/runner/hostip/HostipPlugin.cpp b/src/plugins/runner/hostip/HostipPlugin.cpp
index 12bc4d6..d7d1449 100644
--- a/src/plugins/runner/hostip/HostipPlugin.cpp
+++ b/src/plugins/runner/hostip/HostipPlugin.cpp
@@ -18,7 +18,7 @@ namespace Marble
HostipPlugin::HostipPlugin( QObject *parent ) :
SearchRunnerPlugin( parent )
{
- setSupportedCelestialBodies( QStringList() << "earth" );
+ setSupportedCelestialBodies(QStringList(QStringLiteral("earth")));
setCanWorkOffline( false );
}
@@ -34,12 +34,12 @@ QString HostipPlugin::guiString() const
QString HostipPlugin::nameId() const
{
- return "hostip";
+ return QStringLiteral("hostip");
}
QString HostipPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString HostipPlugin::description() const
@@ -49,13 +49,13 @@ QString HostipPlugin::description() const
QString HostipPlugin::copyrightYears() const
{
- return "2010";
+ return QStringLiteral("2010");
}
QVector<PluginAuthor> HostipPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"));
}
SearchRunner* HostipPlugin::newRunner() const
diff --git a/src/plugins/runner/json/JsonPlugin.cpp b/src/plugins/runner/json/JsonPlugin.cpp
index 444c274..7fdc56b 100644
--- a/src/plugins/runner/json/JsonPlugin.cpp
+++ b/src/plugins/runner/json/JsonPlugin.cpp
@@ -26,12 +26,12 @@ QString JsonPlugin::name() const
QString JsonPlugin::nameId() const
{
- return "GeoJSON";
+ return QStringLiteral("GeoJSON");
}
QString JsonPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString JsonPlugin::description() const
@@ -41,13 +41,13 @@ QString JsonPlugin::description() const
QString JsonPlugin::copyrightYears() const
{
- return "2012";
+ return QStringLiteral("2012");
}
QVector<PluginAuthor> JsonPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Ander Pijoan", "ander.pijoan@deusto.es" );
+ << PluginAuthor(QStringLiteral("Ander Pijoan"), QStringLiteral("ander.pijoan@deusto.es"));
}
QString JsonPlugin::fileFormatDescription() const
@@ -57,7 +57,7 @@ QString JsonPlugin::fileFormatDescription() const
QStringList JsonPlugin::fileExtensions() const
{
- return QStringList() << "json" << "geojson";
+ return QStringList() << QStringLiteral("json") << QStringLiteral("geojson");
}
ParsingRunner* JsonPlugin::newRunner() const
diff --git a/src/plugins/runner/kml/KmlPlugin.cpp b/src/plugins/runner/kml/KmlPlugin.cpp
index 8ba76fe..3ad7a75 100644
--- a/src/plugins/runner/kml/KmlPlugin.cpp
+++ b/src/plugins/runner/kml/KmlPlugin.cpp
@@ -26,12 +26,12 @@ QString KmlPlugin::name() const
QString KmlPlugin::nameId() const
{
- return "Kml";
+ return QStringLiteral("Kml");
}
QString KmlPlugin::version() const
{
- return "1.2";
+ return QStringLiteral("1.2");
}
QString KmlPlugin::description() const
@@ -41,14 +41,14 @@ QString KmlPlugin::description() const
QString KmlPlugin::copyrightYears() const
{
- return "2011, 2013, 2015";
+ return QStringLiteral("2011, 2013, 2015");
}
QVector<PluginAuthor> KmlPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Thibaut Gridel", "tgridel@free.fr" )
- << PluginAuthor( "Dennis Nienhüser", "nienhueser@kde.org" );
+ << PluginAuthor(QStringLiteral("Thibaut Gridel"), QStringLiteral("tgridel@free.fr"))
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"));
}
QString KmlPlugin::fileFormatDescription() const
@@ -58,7 +58,7 @@ QString KmlPlugin::fileFormatDescription() const
QStringList KmlPlugin::fileExtensions() const
{
- return QStringList() << "kml" << "kmz";
+ return QStringList() << QStringLiteral("kml") << QStringLiteral("kmz");
}
ParsingRunner* KmlPlugin::newRunner() const
diff --git a/src/plugins/runner/latlon/LatLonPlugin.cpp b/src/plugins/runner/latlon/LatLonPlugin.cpp
index ed30f13..8e533be 100644
--- a/src/plugins/runner/latlon/LatLonPlugin.cpp
+++ b/src/plugins/runner/latlon/LatLonPlugin.cpp
@@ -31,12 +31,12 @@ QString LatLonPlugin::guiString() const
QString LatLonPlugin::nameId() const
{
- return "latlon";
+ return QStringLiteral("latlon");
}
QString LatLonPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString LatLonPlugin::description() const
@@ -46,13 +46,13 @@ QString LatLonPlugin::description() const
QString LatLonPlugin::copyrightYears() const
{
- return "2010";
+ return QStringLiteral("2010");
}
QVector<PluginAuthor> LatLonPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"));
}
SearchRunner* LatLonPlugin::newRunner() const
diff --git a/src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.cpp b/src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.cpp
index bb0dd69..72d61c7 100644
--- a/src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.cpp
+++ b/src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.cpp
@@ -22,7 +22,7 @@ LocalOsmSearchPlugin::LocalOsmSearchPlugin( QObject *parent ) :
SearchRunnerPlugin( parent ),
m_databaseFiles()
{
- setSupportedCelestialBodies( QStringList() << "earth" );
+ setSupportedCelestialBodies(QStringList(QStringLiteral("earth")));
setCanWorkOffline( true );
QString const path = MarbleDirs::localPath() + "/maps/earth/placemarks/";
@@ -52,12 +52,12 @@ QString LocalOsmSearchPlugin::guiString() const
QString LocalOsmSearchPlugin::nameId() const
{
- return "local-osm-search";
+ return QStringLiteral("local-osm-search");
}
QString LocalOsmSearchPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString LocalOsmSearchPlugin::description() const
@@ -67,13 +67,13 @@ QString LocalOsmSearchPlugin::description() const
QString LocalOsmSearchPlugin::copyrightYears() const
{
- return "2011";
+ return QStringLiteral("2011");
}
QVector<PluginAuthor> LocalOsmSearchPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"));
}
SearchRunner* LocalOsmSearchPlugin::newRunner() const
diff --git a/src/plugins/runner/localdatabase/LocalDatabasePlugin.cpp b/src/plugins/runner/localdatabase/LocalDatabasePlugin.cpp
index 241caff..c023114 100644
--- a/src/plugins/runner/localdatabase/LocalDatabasePlugin.cpp
+++ b/src/plugins/runner/localdatabase/LocalDatabasePlugin.cpp
@@ -31,12 +31,12 @@ QString LocalDatabasePlugin::guiString() const
QString LocalDatabasePlugin::nameId() const
{
- return "localdatabase";
+ return QStringLiteral("localdatabase");
}
QString LocalDatabasePlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString LocalDatabasePlugin::description() const
@@ -46,13 +46,13 @@ QString LocalDatabasePlugin::description() const
QString LocalDatabasePlugin::copyrightYears() const
{
- return "2010";
+ return QStringLiteral("2010");
}
QVector<PluginAuthor> LocalDatabasePlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"));
}
SearchRunner* LocalDatabasePlugin::newRunner() const
diff --git a/src/plugins/runner/log/LogPlugin.cpp b/src/plugins/runner/log/LogPlugin.cpp
index 02fb996..7ac804b 100644
--- a/src/plugins/runner/log/LogPlugin.cpp
+++ b/src/plugins/runner/log/LogPlugin.cpp
@@ -25,12 +25,12 @@ QString LogfilePlugin::name() const
QString LogfilePlugin::nameId() const
{
- return "Log";
+ return QStringLiteral("Log");
}
QString LogfilePlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString LogfilePlugin::description() const
@@ -40,13 +40,13 @@ QString LogfilePlugin::description() const
QString LogfilePlugin::copyrightYears() const
{
- return "2012";
+ return QStringLiteral("2012");
}
QVector<PluginAuthor> LogfilePlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Bernhard Beschow", "bbeschow@cs.tu-berlin.de" );
+ << PluginAuthor(QStringLiteral("Bernhard Beschow"), QStringLiteral("bbeschow@cs.tu-berlin.de"));
}
QString LogfilePlugin::fileFormatDescription() const
@@ -56,7 +56,7 @@ QString LogfilePlugin::fileFormatDescription() const
QStringList LogfilePlugin::fileExtensions() const
{
- return QStringList() << "log";
+ return QStringList(QStringLiteral("log"));
}
ParsingRunner* LogfilePlugin::newRunner() const
diff --git a/src/plugins/runner/mapquest/MapQuestPlugin.cpp b/src/plugins/runner/mapquest/MapQuestPlugin.cpp
index b856d74..b069bad 100644
--- a/src/plugins/runner/mapquest/MapQuestPlugin.cpp
+++ b/src/plugins/runner/mapquest/MapQuestPlugin.cpp
@@ -19,7 +19,7 @@ namespace Marble
MapQuestPlugin::MapQuestPlugin( QObject *parent ) :
RoutingRunnerPlugin( parent )
{
- setSupportedCelestialBodies( QStringList() << "earth" );
+ setSupportedCelestialBodies(QStringList(QStringLiteral("earth")));
setCanWorkOffline( false );
setStatusMessage( tr ( "This service requires an Internet connection." ) );
}
@@ -36,12 +36,12 @@ QString MapQuestPlugin::guiString() const
QString MapQuestPlugin::nameId() const
{
- return "mapquest";
+ return QStringLiteral("mapquest");
}
QString MapQuestPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString MapQuestPlugin::description() const
@@ -51,13 +51,13 @@ QString MapQuestPlugin::description() const
QString MapQuestPlugin::copyrightYears() const
{
- return "2012";
+ return QStringLiteral("2012");
}
QVector<PluginAuthor> MapQuestPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"));
}
RoutingRunner *MapQuestPlugin::newRunner() const
diff --git a/src/plugins/runner/monav/MonavPlugin.cpp b/src/plugins/runner/monav/MonavPlugin.cpp
index b6177e3..f7d6be5 100644
--- a/src/plugins/runner/monav/MonavPlugin.cpp
+++ b/src/plugins/runner/monav/MonavPlugin.cpp
@@ -221,7 +221,7 @@ MonavPlugin::MonavPlugin( QObject *parent ) :
RoutingRunnerPlugin( parent ),
d( new MonavPluginPrivate )
{
- setSupportedCelestialBodies( QStringList() << "earth" );
+ setSupportedCelestialBodies(QStringList(QStringLiteral("earth")));
setCanWorkOffline( true );
if ( d->isDaemonInstalled() ) {
@@ -253,12 +253,12 @@ QString MonavPlugin::guiString() const
QString MonavPlugin::nameId() const
{
- return "monav";
+ return QStringLiteral("monav");
}
QString MonavPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString MonavPlugin::description() const
@@ -268,13 +268,13 @@ QString MonavPlugin::description() const
QString MonavPlugin::copyrightYears() const
{
- return "2010";
+ return QStringLiteral("2010");
}
QVector<PluginAuthor> MonavPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"));
}
RoutingRunner *MonavPlugin::newRunner() const
diff --git a/src/plugins/runner/nominatim-reversegeocoding/NominatimReverseGeocodingPlugin.cpp b/src/plugins/runner/nominatim-reversegeocoding/NominatimReverseGeocodingPlugin.cpp
index f75545c..68071f2 100644
--- a/src/plugins/runner/nominatim-reversegeocoding/NominatimReverseGeocodingPlugin.cpp
+++ b/src/plugins/runner/nominatim-reversegeocoding/NominatimReverseGeocodingPlugin.cpp
@@ -18,7 +18,7 @@ namespace Marble
NominatimPlugin::NominatimPlugin( QObject *parent ) :
ReverseGeocodingRunnerPlugin( parent )
{
- setSupportedCelestialBodies( QStringList() << "earth" );
+ setSupportedCelestialBodies(QStringList(QStringLiteral("earth")));
setCanWorkOffline( false );
}
@@ -34,12 +34,12 @@ QString NominatimPlugin::guiString() const
QString NominatimPlugin::nameId() const
{
- return "nominatim-reverse";
+ return QStringLiteral("nominatim-reverse");
}
QString NominatimPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString NominatimPlugin::description() const
@@ -49,14 +49,14 @@ QString NominatimPlugin::description() const
QString NominatimPlugin::copyrightYears() const
{
- return "2010, 2012";
+ return QStringLiteral("2010, 2012");
}
QVector<PluginAuthor> NominatimPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" )
- << PluginAuthor( "Bernhard Beschow", "bbeschow@cs.tu-berlin.de" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"))
+ << PluginAuthor(QStringLiteral("Bernhard Beschow"), QStringLiteral("bbeschow@cs.tu-berlin.de"));
}
ReverseGeocodingRunner* NominatimPlugin::newRunner() const
diff --git a/src/plugins/runner/nominatim-search/NominatimSearchPlugin.cpp b/src/plugins/runner/nominatim-search/NominatimSearchPlugin.cpp
index f6c49f0..f554c3b 100644
--- a/src/plugins/runner/nominatim-search/NominatimSearchPlugin.cpp
+++ b/src/plugins/runner/nominatim-search/NominatimSearchPlugin.cpp
@@ -18,7 +18,7 @@ namespace Marble
NominatimPlugin::NominatimPlugin( QObject *parent ) :
SearchRunnerPlugin( parent )
{
- setSupportedCelestialBodies( QStringList() << "earth" );
+ setSupportedCelestialBodies(QStringList(QStringLiteral("earth")));
setCanWorkOffline( false );
}
@@ -34,12 +34,12 @@ QString NominatimPlugin::guiString() const
QString NominatimPlugin::nameId() const
{
- return "nominatim-search";
+ return QStringLiteral("nominatim-search");
}
QString NominatimPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString NominatimPlugin::description() const
@@ -49,14 +49,14 @@ QString NominatimPlugin::description() const
QString NominatimPlugin::copyrightYears() const
{
- return "2010, 2012";
+ return QStringLiteral("2010, 2012");
}
QVector<PluginAuthor> NominatimPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" )
- << PluginAuthor( "Bernhard Beschow", "bbeschow@cs.tu-berlin.de" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"))
+ << PluginAuthor(QStringLiteral("Bernhard Beschow"), QStringLiteral("bbeschow@cs.tu-berlin.de"));
}
SearchRunner* NominatimPlugin::newRunner() const
diff --git a/src/plugins/runner/open-source-routing-machine/OSRMPlugin.cpp b/src/plugins/runner/open-source-routing-machine/OSRMPlugin.cpp
index 9d6a3bf..0037c86 100644
--- a/src/plugins/runner/open-source-routing-machine/OSRMPlugin.cpp
+++ b/src/plugins/runner/open-source-routing-machine/OSRMPlugin.cpp
@@ -17,7 +17,7 @@ namespace Marble
OSRMPlugin::OSRMPlugin( QObject *parent ) :
RoutingRunnerPlugin( parent )
{
- setSupportedCelestialBodies( QStringList() << "earth" );
+ setSupportedCelestialBodies(QStringList(QStringLiteral("earth")));
setCanWorkOffline( false );
setStatusMessage( tr ( "This service requires an Internet connection." ) );
}
@@ -34,12 +34,12 @@ QString OSRMPlugin::guiString() const
QString OSRMPlugin::nameId() const
{
- return "osrm";
+ return QStringLiteral("osrm");
}
QString OSRMPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString OSRMPlugin::description() const
@@ -49,13 +49,13 @@ QString OSRMPlugin::description() const
QString OSRMPlugin::copyrightYears() const
{
- return "2012";
+ return QStringLiteral("2012");
}
QVector<PluginAuthor> OSRMPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"));
}
RoutingRunner *OSRMPlugin::newRunner() const
diff --git a/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchPlugin.cpp b/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchPlugin.cpp
index 775cadc..1d4e6d1 100644
--- a/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchPlugin.cpp
+++ b/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchPlugin.cpp
@@ -31,12 +31,12 @@ QString OpenLocationCodeSearchPlugin::guiString() const
QString OpenLocationCodeSearchPlugin::nameId() const
{
- return "openlocation-code-search";
+ return QStringLiteral("openlocation-code-search");
}
QString OpenLocationCodeSearchPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString OpenLocationCodeSearchPlugin::description() const
@@ -46,13 +46,13 @@ QString OpenLocationCodeSearchPlugin::description() const
QString OpenLocationCodeSearchPlugin::copyrightYears() const
{
- return "2015";
+ return QStringLiteral("2015");
}
QVector<PluginAuthor> OpenLocationCodeSearchPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Constantin Mihalache" ), "mihalache.c94@gmail.com" );
+ << PluginAuthor(QStringLiteral("Constantin Mihalache"), QStringLiteral("mihalache.c94@gmail.com"));
}
SearchRunner* OpenLocationCodeSearchPlugin::newRunner() const
diff --git a/src/plugins/runner/openrouteservice/OpenRouteServicePlugin.cpp b/src/plugins/runner/openrouteservice/OpenRouteServicePlugin.cpp
index 1cad3cc..84c56ef 100644
--- a/src/plugins/runner/openrouteservice/OpenRouteServicePlugin.cpp
+++ b/src/plugins/runner/openrouteservice/OpenRouteServicePlugin.cpp
@@ -19,7 +19,7 @@ namespace Marble
OpenRouteServicePlugin::OpenRouteServicePlugin( QObject *parent ) :
RoutingRunnerPlugin( parent )
{
- setSupportedCelestialBodies( QStringList() << "earth" );
+ setSupportedCelestialBodies(QStringList(QStringLiteral("earth")));
setCanWorkOffline( false );
setStatusMessage( tr ( "This service requires an Internet connection." ) );
}
@@ -36,12 +36,12 @@ QString OpenRouteServicePlugin::guiString() const
QString OpenRouteServicePlugin::nameId() const
{
- return "openrouteservice";
+ return QStringLiteral("openrouteservice");
}
QString OpenRouteServicePlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString OpenRouteServicePlugin::description() const
@@ -51,13 +51,13 @@ QString OpenRouteServicePlugin::description() const
QString OpenRouteServicePlugin::copyrightYears() const
{
- return "2010";
+ return QStringLiteral("2010");
}
QVector<PluginAuthor> OpenRouteServicePlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"));
}
RoutingRunner *OpenRouteServicePlugin::newRunner() const
diff --git a/src/plugins/runner/osm/OsmPlugin.cpp b/src/plugins/runner/osm/OsmPlugin.cpp
index 3690dd4..aea86ce 100644
--- a/src/plugins/runner/osm/OsmPlugin.cpp
+++ b/src/plugins/runner/osm/OsmPlugin.cpp
@@ -25,12 +25,12 @@ QString OsmPlugin::name() const
QString OsmPlugin::nameId() const
{
- return "Osm";
+ return QStringLiteral("Osm");
}
QString OsmPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString OsmPlugin::description() const
@@ -40,14 +40,14 @@ QString OsmPlugin::description() const
QString OsmPlugin::copyrightYears() const
{
- return "2011, 2016";
+ return QStringLiteral("2011, 2016");
}
QVector<PluginAuthor> OsmPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Thibaut Gridel", "tgridel@free.fr" )
- << PluginAuthor( "Dennis Nienhüser", "nienhueser@kde.org" );
+ << PluginAuthor(QStringLiteral("Thibaut Gridel"), QStringLiteral("tgridel@free.fr"))
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"));
}
QString OsmPlugin::fileFormatDescription() const
@@ -57,7 +57,7 @@ QString OsmPlugin::fileFormatDescription() const
QStringList OsmPlugin::fileExtensions() const
{
- return QStringList() << "osm" << "osm.zip" << "o5m";
+ return QStringList() << QStringLiteral("osm") << QStringLiteral("osm.zip") << QStringLiteral("o5m");
}
ParsingRunner* OsmPlugin::newRunner() const
diff --git a/src/plugins/runner/pn2/Pn2Plugin.cpp b/src/plugins/runner/pn2/Pn2Plugin.cpp
index 2f5f37a..c2298da 100644
--- a/src/plugins/runner/pn2/Pn2Plugin.cpp
+++ b/src/plugins/runner/pn2/Pn2Plugin.cpp
@@ -25,12 +25,12 @@ QString Pn2Plugin::name() const
QString Pn2Plugin::nameId() const
{
- return "Pn2";
+ return QStringLiteral("Pn2");
}
QString Pn2Plugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString Pn2Plugin::description() const
@@ -40,13 +40,13 @@ QString Pn2Plugin::description() const
QString Pn2Plugin::copyrightYears() const
{
- return "2012";
+ return QStringLiteral("2012");
}
QVector<PluginAuthor> Pn2Plugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Cezar Mocan", "mocancezar@gmail.com" );
+ << PluginAuthor(QStringLiteral("Cezar Mocan"), QStringLiteral("mocancezar@gmail.com"));
}
QString Pn2Plugin::fileFormatDescription() const
@@ -56,7 +56,7 @@ QString Pn2Plugin::fileFormatDescription() const
QStringList Pn2Plugin::fileExtensions() const
{
- return QStringList() << "pn2";
+ return QStringList(QStringLiteral("pn2"));
}
ParsingRunner* Pn2Plugin::newRunner() const
diff --git a/src/plugins/runner/pnt/PntPlugin.cpp b/src/plugins/runner/pnt/PntPlugin.cpp
index 66f2bd0..44430e3 100644
--- a/src/plugins/runner/pnt/PntPlugin.cpp
+++ b/src/plugins/runner/pnt/PntPlugin.cpp
@@ -25,12 +25,12 @@ QString PntPlugin::name() const
QString PntPlugin::nameId() const
{
- return "Pnt";
+ return QStringLiteral("Pnt");
}
QString PntPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString PntPlugin::description() const
@@ -40,13 +40,13 @@ QString PntPlugin::description() const
QString PntPlugin::copyrightYears() const
{
- return "2011";
+ return QStringLiteral("2011");
}
QVector<PluginAuthor> PntPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Thibaut Gridel", "tgridel@free.fr" );
+ << PluginAuthor(QStringLiteral("Thibaut Gridel"), QStringLiteral("tgridel@free.fr"));
}
QString PntPlugin::fileFormatDescription() const
@@ -56,7 +56,7 @@ QString PntPlugin::fileFormatDescription() const
QStringList PntPlugin::fileExtensions() const
{
- return QStringList() << "pnt";
+ return QStringList(QStringLiteral("pnt"));
}
ParsingRunner* PntPlugin::newRunner() const
diff --git a/src/plugins/runner/routino/RoutinoPlugin.cpp b/src/plugins/runner/routino/RoutinoPlugin.cpp
index 9a9dda3..576f5ad 100644
--- a/src/plugins/runner/routino/RoutinoPlugin.cpp
+++ b/src/plugins/runner/routino/RoutinoPlugin.cpp
@@ -20,7 +20,7 @@ namespace Marble
RoutinoPlugin::RoutinoPlugin( QObject *parent ) :
RoutingRunnerPlugin( parent )
{
- setSupportedCelestialBodies( QStringList() << "earth" );
+ setSupportedCelestialBodies(QStringList(QStringLiteral("earth")));
setCanWorkOffline( true );
}
@@ -36,12 +36,12 @@ QString RoutinoPlugin::guiString() const
QString RoutinoPlugin::nameId() const
{
- return "routino";
+ return QStringLiteral("routino");
}
QString RoutinoPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString RoutinoPlugin::description() const
@@ -51,13 +51,13 @@ QString RoutinoPlugin::description() const
QString RoutinoPlugin::copyrightYears() const
{
- return "2010";
+ return QStringLiteral("2010");
}
QVector<PluginAuthor> RoutinoPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"));
}
RoutingRunner *RoutinoPlugin::newRunner() const
diff --git a/src/plugins/runner/shp/ShpPlugin.cpp b/src/plugins/runner/shp/ShpPlugin.cpp
index 6e2529c..eb67734 100644
--- a/src/plugins/runner/shp/ShpPlugin.cpp
+++ b/src/plugins/runner/shp/ShpPlugin.cpp
@@ -25,12 +25,12 @@ QString ShpPlugin::name() const
QString ShpPlugin::nameId() const
{
- return "Shp";
+ return QStringLiteral("Shp");
}
QString ShpPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString ShpPlugin::description() const
@@ -40,13 +40,13 @@ QString ShpPlugin::description() const
QString ShpPlugin::copyrightYears() const
{
- return "2011";
+ return QStringLiteral("2011");
}
QVector<PluginAuthor> ShpPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( "Thibaut Gridel", "tgridel@free.fr" );
+ << PluginAuthor(QStringLiteral("Thibaut Gridel"), QStringLiteral("tgridel@free.fr"));
}
QString ShpPlugin::fileFormatDescription() const
@@ -56,7 +56,7 @@ QString ShpPlugin::fileFormatDescription() const
QStringList ShpPlugin::fileExtensions() const
{
- return QStringList() << "shp";
+ return QStringList(QStringLiteral("shp"));
}
ParsingRunner* ShpPlugin::newRunner() const
diff --git a/src/plugins/runner/traveling-salesman/TravelingSalesmanPlugin.cpp b/src/plugins/runner/traveling-salesman/TravelingSalesmanPlugin.cpp
index e2619bd..a20884c 100644
--- a/src/plugins/runner/traveling-salesman/TravelingSalesmanPlugin.cpp
+++ b/src/plugins/runner/traveling-salesman/TravelingSalesmanPlugin.cpp
@@ -17,7 +17,7 @@ namespace Marble
TravelingSalesmanPlugin::TravelingSalesmanPlugin( QObject *parent ) : RunnerPlugin( parent )
{
setCapabilities( Routing );
- setSupportedCelestialBodies( QStringList() << "earth" );
+ setSupportedCelestialBodies(QStringList(QStringLiteral("earth")));
setCanWorkOffline( true );
setName( tr( "Traveling Salesman" ) );
setNameId( "travelingsalesman" );
diff --git a/src/plugins/runner/yours/YoursPlugin.cpp b/src/plugins/runner/yours/YoursPlugin.cpp
index acac781..bddd070 100644
--- a/src/plugins/runner/yours/YoursPlugin.cpp
+++ b/src/plugins/runner/yours/YoursPlugin.cpp
@@ -17,7 +17,7 @@ namespace Marble
YoursPlugin::YoursPlugin( QObject *parent ) :
RoutingRunnerPlugin( parent )
{
- setSupportedCelestialBodies( QStringList() << "earth" );
+ setSupportedCelestialBodies(QStringList(QStringLiteral("earth")));
setCanWorkOffline( false );
setStatusMessage( tr ( "This service requires an Internet connection." ) );
}
@@ -34,12 +34,12 @@ QString YoursPlugin::guiString() const
QString YoursPlugin::nameId() const
{
- return "yours";
+ return QStringLiteral("yours");
}
QString YoursPlugin::version() const
{
- return "1.0";
+ return QStringLiteral("1.0");
}
QString YoursPlugin::description() const
@@ -49,13 +49,13 @@ QString YoursPlugin::description() const
QString YoursPlugin::copyrightYears() const
{
- return "2010";
+ return QStringLiteral("2010");
}
QVector<PluginAuthor> YoursPlugin::pluginAuthors() const
{
return QVector<PluginAuthor>()
- << PluginAuthor( QString::fromUtf8( "Dennis Nienhüser" ), "nienhueser@kde.org" );
+ << PluginAuthor(QStringLiteral("Dennis Nienhüser"), QStringLiteral("nienhueser@kde.org"));
}
RoutingRunner *YoursPlugin::newRunner() const
diff --git a/src/plugins/templates/floatitem/FITemplateFloatItem.cpp b/src/plugins/templates/floatitem/FITemplateFloatItem.cpp
index a2524e9..e9f86f1 100644
--- a/src/plugins/templates/floatitem/FITemplateFloatItem.cpp
+++ b/src/plugins/templates/floatitem/FITemplateFloatItem.cpp
@@ -44,7 +44,7 @@ FITemplateFloatItem::~FITemplateFloatItem ()
QStringList FITemplateFloatItem::backendTypes() const
{
- return QStringList( "FITemplate" );
+ return QStringList(QStringLiteral("FITemplate"));
}
QString FITemplateFloatItem::name() const
@@ -59,7 +59,7 @@ QString FITemplateFloatItem::guiString() const
QString FITemplateFloatItem::nameId() const
{
- return QString( "compass" );
+ return QStringLiteral("floatitemtemplate");
}
QString FITemplateFloatItem::description() const
diff --git a/tests/AbstractFloatItemTest.cpp b/tests/AbstractFloatItemTest.cpp
index b80d310..f89a223 100644
--- a/tests/AbstractFloatItemTest.cpp
+++ b/tests/AbstractFloatItemTest.cpp
@@ -30,17 +30,20 @@ class NullFloatItem : public AbstractFloatItem
AbstractFloatItem( model )
{}
- QString name() const { return "Null Float Item"; }
- QString nameId() const { return "null"; }
- QString version() const { return "0.0"; }
- QString description() const { return "A null float item just for testing."; }
+ QString name() const { return QStringLiteral("Null Float Item"); }
+ QString nameId() const { return QStringLiteral("null"); }
+ QString version() const { return QStringLiteral("0.0"); }
+ QString description() const { return QStringLiteral("A null float item just for testing."); }
QIcon icon() const { return QIcon(); }
- QString copyrightYears() const { return "2013"; }
- QVector<PluginAuthor> pluginAuthors() const { return QVector<PluginAuthor>() << PluginAuthor( "Bernhard Beschow", "bbeschow@cs.tu-berlin.de" ); }
+ QString copyrightYears() const { return QStringLiteral("2013"); }
+ QVector<PluginAuthor> pluginAuthors() const
+ {
+ return QVector<PluginAuthor>() << PluginAuthor(QStringLiteral("Bernhard Beschow"), QStringLiteral("bbeschow@cs.tu-berlin.de"));
+ }
void initialize() {}
bool isInitialized() const { return true; }
- QStringList backendTypes() const { return QStringList() << "null"; }
- QString guiString() const { return "Null"; }
+ QStringList backendTypes() const { return QStringList(QStringLiteral("null")); }
+ QString guiString() const { return QStringLiteral("Null"); }
RenderPlugin *newInstance( const MarbleModel * ) const { return 0; }
};