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

Changeset View

Standalone View

View Options

src/plasma/private/theme_p.cpp

Show First 20 Lines • Show All 827 Lines • ▼ Show 20 Line(s)823 while (!fallback.isEmpty() && !fallbackThemes.contains(fallback)) {
828 KConfigGroup cg(&metadata, "Settings"); 828​ KConfigGroup cg(&metadata, "Settings");
829 fallback = cg.readEntry("FallbackTheme", QString()); 829​ fallback = cg.readEntry("FallbackTheme", QString());
830 } 830​ }
831 831​
832 if (!fallbackThemes.contains(QLatin1String(ThemePrivate::defaultTheme))) { 832​ if (!fallbackThemes.contains(QLatin1String(ThemePrivate::defaultTheme))) {
833 fallbackThemes.append(QLatin1String(ThemePrivate::defaultTheme)); 833​ fallbackThemes.append(QLatin1String(ThemePrivate::defaultTheme));
834 } 834​ }
835 835​
836 foreach (const QString &theme, fallbackThemes) { 836​ for (const QString &theme : qAsConst(fallbackThemes)) {
837 QString metadataPath(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1Literal(PLASMA_RELATIVE_DATA_INSTALL_DIR "/desktoptheme/") % theme % QLatin1Literal("/metadata.desktop"))); 837​ 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/
838 KConfig metadata(metadataPath, KConfig::SimpleConfig); 838​ KConfig metadata(metadataPath, KConfig::SimpleConfig);
839 processWallpaperSettings(&metadata); 839​ processWallpaperSettings(&metadata);
840 } 840​ }
841 841​
842 //Check for what Plasma version the theme has been done 842​ //Check for what Plasma version the theme has been done
843 //There are some behavioral differences between KDE4 Plasma and Plasma 5 843​ //There are some behavioral differences between KDE4 Plasma and Plasma 5
844 cg = KConfigGroup(&metadata, "Desktop Entry"); 844​ cg = KConfigGroup(&metadata, "Desktop Entry");
845 const QString apiVersion = cg.readEntry("X-Plasma-API", QString()); 845​ const QString apiVersion = cg.readEntry("X-Plasma-API", QString());
▲ Show 20 Lines • Show All 46 Lines • Show Last 20 Lines