diff options
author | Laurent Montel <montel@kde.org> | 2021-08-28 18:05:30 +0200 |
---|---|---|
committer | Laurent Montel <montel@kde.org> | 2021-08-28 18:05:30 +0200 |
commit | dffdff73fa98a4fdebca38fb4a41938541ffb1c1 (patch) | |
tree | 7f1c9fb2c402eef2b7ecc90ec9d31cc506160b1e /src/core | |
parent | 3259a6e6530cb0526bf71733ba28015f481f056e (diff) | |
download | kconfig-dffdff73fa98a4fdebca38fb4a41938541ffb1c1.tar.gz kconfig-dffdff73fa98a4fdebca38fb4a41938541ffb1c1.tar.bz2 |
GIT_SILENT: we can use std::as_const directly
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/kauthorized.cpp | 2 | ||||
-rw-r--r-- | src/core/kconfig.cpp | 2 | ||||
-rw-r--r-- | src/core/kconfigini.cpp | 2 | ||||
-rw-r--r-- | src/core/kconfigwatcher.cpp | 2 | ||||
-rw-r--r-- | src/core/kcoreconfigskeleton.cpp | 12 | ||||
-rw-r--r-- | src/core/ksharedconfig.cpp | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/core/kauthorized.cpp b/src/core/kauthorized.cpp index a8784a1c..3c0941d5 100644 --- a/src/core/kauthorized.cpp +++ b/src/core/kauthorized.cpp @@ -378,7 +378,7 @@ authorizeUrlActionInternal(const QString &action, const QUrl &_baseURL, const QU QUrl destURL(_destURL); destURL.setPath(QDir::cleanPath(destURL.path())); - for (const URLActionRule &rule : qAsConst(d->urlActionRestrictions)) { + for (const URLActionRule &rule : std::as_const(d->urlActionRestrictions)) { if ((result != rule.permission) && // No need to check if it doesn't make a difference (action == QLatin1String(rule.action.constData())) && rule.baseMatch(baseURL, baseClass) && rule.destMatch(destURL, destClass, baseURL, baseClass)) { diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp index 0bf6cccd..506e3f90 100644 --- a/src/core/kconfig.cpp +++ b/src/core/kconfig.cpp @@ -774,7 +774,7 @@ void KConfigPrivate::parseConfigFiles() // qDebug() << "parsing local files" << files; const QByteArray utf8Locale = locale.toUtf8(); - for (const QString &file : qAsConst(files)) { + for (const QString &file : std::as_const(files)) { if (file.compare(mBackend->filePath(), sPathCaseSensitivity) == 0) { switch (mBackend->parseConfig(utf8Locale, entryMap, KConfigBackend::ParseExpansions)) { case KConfigBackend::ParseOk: diff --git a/src/core/kconfigini.cpp b/src/core/kconfigini.cpp index 5bc8743c..7c1e15f0 100644 --- a/src/core/kconfigini.cpp +++ b/src/core/kconfigini.cpp @@ -287,7 +287,7 @@ KConfigBackend::ParseInfo KConfigIniBackend::parseConfig(const QByteArray &curre } // now make sure immutable groups are marked immutable - for (const QByteArray &group : qAsConst(immutableGroups)) { + for (const QByteArray &group : std::as_const(immutableGroups)) { entryMap.setEntry(group, QByteArray(), QByteArray(), KEntryMap::EntryImmutable); } diff --git a/src/core/kconfigwatcher.cpp b/src/core/kconfigwatcher.cpp index 3da2d535..ec3cb541 100644 --- a/src/core/kconfigwatcher.cpp +++ b/src/core/kconfigwatcher.cpp @@ -66,7 +66,7 @@ KConfigWatcher::KConfigWatcher(const KSharedConfig::Ptr &config) watchedPaths << QStringLiteral("/kdeglobals"); } - for (const QString &path : qAsConst(watchedPaths)) { + for (const QString &path : std::as_const(watchedPaths)) { QDBusConnection::sessionBus().connect(QString(), path, QStringLiteral("org.kde.kconfig.notify"), diff --git a/src/core/kcoreconfigskeleton.cpp b/src/core/kcoreconfigskeleton.cpp index e1c5c1dd..f8097055 100644 --- a/src/core/kcoreconfigskeleton.cpp +++ b/src/core/kcoreconfigskeleton.cpp @@ -1038,7 +1038,7 @@ void KCoreConfigSkeleton::ItemUrlList::readConfig(KConfig *config) mReference = mDefault; } else { QStringList strList; - for (const QUrl &url : qAsConst(mDefault)) { + for (const QUrl &url : std::as_const(mDefault)) { strList.append(url.toString()); } mReference.clear(); @@ -1060,7 +1060,7 @@ void KCoreConfigSkeleton::ItemUrlList::writeConfig(KConfig *config) cg.revertToDefault(mKey, writeFlags()); } else { QStringList strList; - for (const QUrl &url : qAsConst(mReference)) { + for (const QUrl &url : std::as_const(mReference)) { strList.append(url.toString()); } cg.writeEntry<QStringList>(mKey, strList, writeFlags()); @@ -1183,7 +1183,7 @@ bool KCoreConfigSkeleton::useDefaults(bool b) } d->mUseDefaults = b; - for (auto *skelItem : qAsConst(d->mItems)) { + for (auto *skelItem : std::as_const(d->mItems)) { skelItem->swapDefault(); } @@ -1193,7 +1193,7 @@ bool KCoreConfigSkeleton::useDefaults(bool b) void KCoreConfigSkeleton::setDefaults() { - for (auto *skelItem : qAsConst(d->mItems)) { + for (auto *skelItem : std::as_const(d->mItems)) { skelItem->setDefault(); } usrSetDefaults(); @@ -1207,7 +1207,7 @@ void KCoreConfigSkeleton::load() void KCoreConfigSkeleton::read() { - for (auto *skelItem : qAsConst(d->mItems)) { + for (auto *skelItem : std::as_const(d->mItems)) { skelItem->readConfig(d->mConfig.data()); } usrRead(); @@ -1230,7 +1230,7 @@ bool KCoreConfigSkeleton::isSaveNeeded() const bool KCoreConfigSkeleton::save() { // qDebug(); - for (auto *skelItem : qAsConst(d->mItems)) { + for (auto *skelItem : std::as_const(d->mItems)) { skelItem->writeConfig(d->mConfig.data()); } diff --git a/src/core/ksharedconfig.cpp b/src/core/ksharedconfig.cpp index 98aa4c5e..09cd35f1 100644 --- a/src/core/ksharedconfig.cpp +++ b/src/core/ksharedconfig.cpp @@ -78,7 +78,7 @@ KSharedConfigPtr KSharedConfig::openConfig(const QString &_fileName, OpenFlags f list->mainConfig = nullptr; } - for (auto *cfg : qAsConst(*list)) { + for (auto *cfg : std::as_const(*list)) { if (cfg->name() == fileName && cfg->d_ptr->openFlags == flags && cfg->locationType() == resType // cfg->backend()->type() == backend ) { |