Differential D26948 Diff 74445 src/kcolorschememanager.cpp

Changeset View

Standalone View

View Options

src/kcolorschememanager.cpp

Show First 20 Lines • Show All 87 Lines • ▼ Show 20 Line(s)85{
88 88​
89 const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, 89​ const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
90 QStringLiteral("color-schemes"), 90​ QStringLiteral("color-schemes"),
91 QStandardPaths::LocateDirectory); 91​ QStandardPaths::LocateDirectory);
92 QStringList schemeFiles; 92​ QStringList schemeFiles;
93 for (const QString &dir : dirs) { 93​ for (const QString &dir : dirs) {
94 const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.colors")); 94​ const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.colors"));
95 for (const QString &file : fileNames) { 95​ for (const QString &file : fileNames) {
96 schemeFiles << dir + QDir::separator() + file; 96​ const QString suffixedFileName = QLatin1String("color-schemes/") + file;
97​ if (!schemeFiles.contains(suffixedFileName)) {
98​ schemeFiles.append(suffixedFileName);
97 } 99​ }
98 } 100​ }
101​ }
102​ std::transform(schemeFiles.begin(), schemeFiles.end(), schemeFiles.begin(), [](const QString &item) {
103​ return QStandardPaths::locate(QStandardPaths::GenericDataLocation, item);
104​ });
99 for (const QString &schemeFile : qAsConst(schemeFiles)) { 105​ for (const QString &schemeFile : qAsConst(schemeFiles)) {
100 KSharedConfigPtr config = KSharedConfig::openConfig(schemeFile, KConfig::SimpleConfig); 106​ KSharedConfigPtr config = KSharedConfig::openConfig(schemeFile, KConfig::SimpleConfig);
101 KConfigGroup group(config, QStringLiteral("General")); 107​ KConfigGroup group(config, QStringLiteral("General"));
102 const QString name = group.readEntry("Name", QFileInfo(schemeFile).baseName()); 108​ const QString name = group.readEntry("Name", QFileInfo(schemeFile).baseName());
103 const KColorSchemeModelData data = {name, schemeFile, QIcon()}; 109​ const KColorSchemeModelData data = {name, schemeFile, QIcon()};
104 m_data.append(data); 110​ m_data.append(data);
105 } 111​ }
106 std::sort(m_data.begin(), m_data.end(), [](const KColorSchemeModelData & first, const KColorSchemeModelData & second) { 112​ std::sort(m_data.begin(), m_data.end(), [](const KColorSchemeModelData & first, const KColorSchemeModelData & second) {
▲ Show 20 Lines • Show All 128 Lines • Show Last 20 Lines