From ecbc98b6d92eb28eb8906f2d588f935985508f4d Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 30 Oct 2016 02:28:53 +0000 Subject: [PATCH] plasma: replace QLatin1Literal with QLatin1String Signed-off-by: Ivailo Monev --- .../plasmaextracomponents/appbackgroundprovider.cpp | 2 +- plasma/scriptengine/plasmoid/themedsvg.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plasma/declarativeimports/plasmaextracomponents/appbackgroundprovider.cpp b/plasma/declarativeimports/plasmaextracomponents/appbackgroundprovider.cpp index c98f85d7..3795e1fd 100644 --- a/plasma/declarativeimports/plasmaextracomponents/appbackgroundprovider.cpp +++ b/plasma/declarativeimports/plasmaextracomponents/appbackgroundprovider.cpp @@ -35,7 +35,7 @@ QImage AppBackgroundProvider::requestImage(const QString &id, QSize *size, const { Q_UNUSED(size) Q_UNUSED(requestedSize) - QString search = QLatin1Literal("desktoptheme/") + Plasma::Theme::defaultTheme()->themeName() + QLatin1Literal("/appbackgrounds/") + id + ".png"; + QString search = QLatin1String("desktoptheme/") + Plasma::Theme::defaultTheme()->themeName() + QLatin1String("/appbackgrounds/") + id + ".png"; search = KStandardDirs::locate("data", search); return QImage(search); } diff --git a/plasma/scriptengine/plasmoid/themedsvg.cpp b/plasma/scriptengine/plasmoid/themedsvg.cpp index 824cfa7a..3ffbc037 100644 --- a/plasma/scriptengine/plasmoid/themedsvg.cpp +++ b/plasma/scriptengine/plasmoid/themedsvg.cpp @@ -35,9 +35,9 @@ void ThemedSvg::setThemedImagePath(const QString &path) static QString findLocalSvgFile(AppletInterface *interface, const QString &dir, const QString &file) { - QString path = interface->file(dir, file + QLatin1Literal(".svg")); + QString path = interface->file(dir, file + QLatin1String(".svg")); if (path.isEmpty()) { - path = interface->file(dir, file + QLatin1Literal(".svgz")); + path = interface->file(dir, file + QLatin1String(".svgz")); } return path; } @@ -61,7 +61,7 @@ QString ThemedSvg::findSvg(QScriptEngine *engine, const QString &file) // FIXME: this isn't particularly helpful, as we can't look in the fallback themes QString themeName = Plasma::Theme::defaultTheme()->themeName(); - path = findLocalSvgFile(interface, "theme", themeName + QLatin1Literal("/") + file); + path = findLocalSvgFile(interface, "theme", themeName + QLatin1Char('/') + file); if (!path.isEmpty()) { return path; } -- 2.11.0