Changeset View
Changeset View
Standalone View
Standalone View
src/sddmkcm.cpp
Show First 20 Lines • Show All 57 Lines • ▼ Show 20 Line(s) | 48 | { | |||
---|---|---|---|---|---|
58 | setAboutData(aboutData); | 58 | setAboutData(aboutData); | ||
59 | setNeedsAuthorization(true); | 59 | setNeedsAuthorization(true); | ||
60 | 60 | | |||
61 | mSddmConfig = KSharedConfig::openConfig(SDDM_CONFIG_FILE, KConfig::CascadeConfig); | 61 | mSddmConfig = KSharedConfig::openConfig(SDDM_CONFIG_FILE, KConfig::CascadeConfig); | ||
62 | 62 | | |||
63 | // This does not listen for new config files in the directory. | 63 | // This does not listen for new config files in the directory. | ||
64 | QStringList configFiles = QDir(SDDM_CONFIG_DIR).entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware), | 64 | QStringList configFiles = QDir(SDDM_CONFIG_DIR).entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware), | ||
65 | systemConfigFiles = QDir(SDDM_SYSTEM_CONFIG_DIR).entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware); | 65 | systemConfigFiles = QDir(SDDM_SYSTEM_CONFIG_DIR).entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware); | ||
66 | | ||||
67 | // QStringBuilder keeps dangling references, so force return of QString (QTBUG-47066) | ||||
66 | std::transform(systemConfigFiles.begin(), systemConfigFiles.end(), systemConfigFiles.begin(), | 68 | std::transform(systemConfigFiles.begin(), systemConfigFiles.end(), systemConfigFiles.begin(), | ||
67 | [](const QString &filename) { return QStringLiteral(SDDM_SYSTEM_CONFIG_DIR "/") + filename; }); | 69 | [](const QString &filename) -> QString { return QStringLiteral(SDDM_SYSTEM_CONFIG_DIR "/") + filename; }); | ||
68 | std::transform(configFiles.begin(), configFiles.end(), configFiles.begin(), | 70 | std::transform(configFiles.begin(), configFiles.end(), configFiles.begin(), | ||
69 | [](const QString &filename) { return QStringLiteral(SDDM_CONFIG_DIR "/") + filename; }); | 71 | [](const QString &filename) -> QString { return QStringLiteral(SDDM_CONFIG_DIR "/") + filename; }); | ||
70 | 72 | | |||
71 | mSddmConfig->addConfigSources(systemConfigFiles + configFiles); | 73 | mSddmConfig->addConfigSources(systemConfigFiles + configFiles); | ||
72 | 74 | | |||
73 | prepareUi(); | 75 | prepareUi(); | ||
74 | } | 76 | } | ||
75 | 77 | | |||
76 | SddmKcm::~SddmKcm() | 78 | SddmKcm::~SddmKcm() | ||
77 | { | 79 | { | ||
▲ Show 20 Lines • Show All 53 Lines • Show Last 20 Lines |