Differential D19913 Diff 54920 src/plasma/private/theme_p.cpp

Changeset View

Standalone View

View Options

src/plasma/private/theme_p.cpp

Show First 20 Lines • Show All 814 Lines • ▼ Show 20 Line(s)810 while (!fallback.isEmpty() && !fallbackThemes.contains(fallback)) {
815 KConfigGroup cg(&metadata, "Settings"); 815​ KConfigGroup cg(&metadata, "Settings");
816 fallback = cg.readEntry("FallbackTheme", QString()); 816​ fallback = cg.readEntry("FallbackTheme", QString());
817 } 817​ }
818 818​
819 if (!fallbackThemes.contains(QLatin1String(ThemePrivate::defaultTheme))) { 819​ if (!fallbackThemes.contains(QLatin1String(ThemePrivate::defaultTheme))) {
820 fallbackThemes.append(QLatin1String(ThemePrivate::defaultTheme)); 820​ fallbackThemes.append(QLatin1String(ThemePrivate::defaultTheme));
821 } 821​ }
822 822​
823 foreach (const QString &theme, fallbackThemes) { 823​ for (const QString &theme : qAsConst(fallbackThemes)) {
824 QString metadataPath(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1Literal(PLASMA_RELATIVE_DATA_INSTALL_DIR "/desktoptheme/") % theme % QLatin1Literal("/metadata.desktop"))); 824​ QString metadataPath(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1Literal(PLASMA_RELATIVE_DATA_INSTALL_DIR "/desktoptheme/") % theme % QLatin1Literal("/metadata.desktop")));
ahmadsamirUnsubmitted
Not Done

s/QLatin1Literal/QStringLiteral/

ahmadsamir: s/QLatin1Literal/QStringLiteral/
825 KConfig metadata(metadataPath, KConfig::SimpleConfig); 825​ KConfig metadata(metadataPath, KConfig::SimpleConfig);
826 processWallpaperSettings(&metadata); 826​ processWallpaperSettings(&metadata);
827 } 827​ }
828 828​
829 //Check for what Plasma version the theme has been done 829​ //Check for what Plasma version the theme has been done
830 //There are some behavioral differences between KDE4 Plasma and Plasma 5 830​ //There are some behavioral differences between KDE4 Plasma and Plasma 5
831 cg = KConfigGroup(&metadata, "Desktop Entry"); 831​ cg = KConfigGroup(&metadata, "Desktop Entry");
832 const QString apiVersion = cg.readEntry("X-Plasma-API", QString()); 832​ const QString apiVersion = cg.readEntry("X-Plasma-API", QString());
▲ Show 20 Lines • Show All 46 Lines • Show Last 20 Lines