Commit 9ea3604d authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

Use more QStringLiteral for plugin metedata strings

parent 4b3a1b84
......@@ -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);
......
......@@ -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 * )
......
......@@ -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 )
......
......@@ -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 ) {
......
......@@ -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
......
......@@ -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
......
......@@ -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,
......
......@@ -21,7 +21,7 @@ namespace Marble
QStringList FogLayer::renderPosition() const
{
return QStringList() << "ATMOSPHERE";
return QStringList(QStringLiteral("ATMOSPHERE"));
}
bool FogLayer::render( GeoPainter *painter,
......
......@@ -109,7 +109,7 @@ GeometryLayer::~GeometryLayer()
QStringList GeometryLayer::renderPosition() const
{
return QStringList( "HOVERS_ABOVE_SURFACE" );
return QStringList(QStringLiteral("HOVERS_ABOVE_SURFACE"));
}
......
......@@ -27,7 +27,7 @@ GroundLayer::~GroundLayer()
QStringList GroundLayer::renderPosition() const
{
return QStringList() << "SURFACE";
return QStringList(QStringLiteral("SURFACE"));
}
bool GroundLayer::render( GeoPainter *painter,
......
......@@ -28,7 +28,7 @@ MarbleSplashLayer::MarbleSplashLayer()
QStringList MarbleSplashLayer::renderPosition() const
{
return QStringList() << "SURFACE";
return QStringList(QStringLiteral("SURFACE"));
}
bool MarbleSplashLayer::render( GeoPainter *painter, ViewportParams *viewport,
......
......@@ -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
......
......@@ -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,
......
......@@ -266,7 +266,7 @@ TextureLayer::~TextureLayer()
QStringList TextureLayer::renderPosition() const
{
return QStringList() << "SURFACE";
return QStringList(QStringLiteral("SURFACE"));
}
void TextureLayer::addSeaDocument( const GeoDataDocument *seaDocument )
......
......@@ -123,7 +123,7 @@ VectorTileLayer::~VectorTileLayer()
QStringList VectorTileLayer::renderPosition() const
{
return QStringList() << "SURFACE";
return QStringList(QStringLiteral("SURFACE"));
}
RenderState VectorTileLayer::renderState() const
......
......@@ -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
......
......@@ -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"));
}
......
......@@ -23,7 +23,7 @@ QString GeoCluePositionProviderPlugin::name() const
QString GeoCluePositionProviderPlugin::nameId() const
{
return QString::fromLatin1( "GeoClue" );
return QStringLiteral("GeoClue");
}
QString GeoCluePositionProviderPlugin::guiString() const
......
......@@ -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"));
}
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment