diff --git a/src/api/KWallet/kwallet.cpp b/src/api/KWallet/kwallet.cpp --- a/src/api/KWallet/kwallet.cpp +++ b/src/api/KWallet/kwallet.cpp @@ -176,15 +176,13 @@ attrs[KSS_ATTR_ENTRYFOLDER] = folder; KSecretsService::SearchCollectionItemsJob *searchItemsJob = secretsCollection->searchItems(attrs); if (searchItemsJob->exec()) { - const QRegularExpression re(QRegularExpression::wildcardToRegularExpression(key)); + const QRegExp re(key, Qt::CaseSensitive, QRegExp::Wildcard); const auto list = searchItemsJob->items(); - QRegularExpressionMatch match; for (KSecretsService::SearchCollectionItemsJob::Item item : list) { KSecretsService::ReadItemPropertyJob *readLabelJob = item->label(); if (readLabelJob->exec()) { QString label = readLabelJob->propertyValue().toString(); - match = re.match(label); - if (match.hasMatch()) { + if (re.exactMatch(label)) { if (verb(this, label, item.data())) { rc = 0; // one successful iteration already produced results, so success return } diff --git a/src/runtime/kwalletd/backend/kwalletbackend.cc b/src/runtime/kwalletd/backend/kwalletbackend.cc --- a/src/runtime/kwalletd/backend/kwalletbackend.cc +++ b/src/runtime/kwalletd/backend/kwalletbackend.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include @@ -530,13 +530,11 @@ return rc; } - QRegularExpression re(QRegularExpression::wildcardToRegularExpression(key)); + const QRegExp re(key, Qt::CaseSensitive, QRegExp::Wildcard); const EntryMap &map = _entries[_folder]; - QRegularExpressionMatch match; for (EntryMap::ConstIterator i = map.begin(); i != map.end(); ++i) { - match = re.match(i.key()); - if (match.hasMatch()) { + if (re.exactMatch(i.key())) { rc.append(i.value()); } }