Skip to content

Commit 9630cc9

Browse files
authored
refactor: replace deprecated qAsConst with std::as_const() (#1565)
Reference: https://github.com/qt/qtbase/blob/v6.6.0/src/corelib/global/qttypetraits.h#L32
1 parent 2cefcd4 commit 9630cc9

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

src/libs/registry/docset.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ void Docset::loadSymbols(const QString &symbolType) const
458458
// with it.first and it.second respectively pointing to the start and the end
459459
// of the range of nodes having symbolType as key. It effectively represents a
460460
// contiguous view over the nodes with a specified key.
461-
for (auto it = qAsConst(m_symbolStrings).equal_range(symbolType); it.first != it.second; ++it.first) {
461+
for (auto it = std::as_const(m_symbolStrings).equal_range(symbolType); it.first != it.second; ++it.first) {
462462
loadSymbols(symbolType, it.first.value());
463463
}
464464
}
@@ -519,7 +519,7 @@ void Docset::createIndex()
519519
}
520520

521521
// Drop old indexes
522-
for (const QString &oldIndexName : qAsConst(oldIndexes)) {
522+
for (const QString &oldIndexName : std::as_const(oldIndexes)) {
523523
m_db->execute(indexDropQuery.arg(oldIndexName));
524524
}
525525

src/libs/registry/docsetmetadata.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ void DocsetMetadata::save(const QString &path, const QString &version)
9797

9898
if (!m_urls.isEmpty()) {
9999
QJsonArray urls;
100-
for (const QUrl &url : qAsConst(m_urls)) {
100+
for (const QUrl &url : std::as_const(m_urls)) {
101101
urls.append(url.toString());
102102
}
103103

src/libs/registry/docsetregistry.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ void DocsetRegistry::setFuzzySearchEnabled(bool enabled)
101101

102102
m_isFuzzySearchEnabled = enabled;
103103

104-
for (Docset *docset : qAsConst(m_docsets)) {
104+
for (Docset *docset : std::as_const(m_docsets)) {
105105
docset->setFuzzySearchEnabled(enabled);
106106
}
107107
}
@@ -193,7 +193,7 @@ Docset *DocsetRegistry::docset(int index) const
193193

194194
Docset *DocsetRegistry::docsetForUrl(const QUrl &url)
195195
{
196-
for (Docset *docset : qAsConst(m_docsets)) {
196+
for (Docset *docset : std::as_const(m_docsets)) {
197197
if (docset->baseUrl().isParentOf(url))
198198
return docset;
199199
}
@@ -226,7 +226,7 @@ void DocsetRegistry::_runQuery(const QString &query)
226226

227227
const SearchQuery searchQuery = SearchQuery::fromString(query);
228228
if (searchQuery.hasKeywords()) {
229-
for (Docset *docset : qAsConst(m_docsets)) {
229+
for (Docset *docset : std::as_const(m_docsets)) {
230230
if (searchQuery.hasKeywords(docset->keywords()))
231231
enabledDocsets << docset;
232232
}

src/libs/ui/docsetsdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ QNetworkReply *DocsetsDialog::download(const QUrl &url)
687687

688688
void DocsetsDialog::cancelDownloads()
689689
{
690-
for (QNetworkReply *reply : qAsConst(m_replies)) {
690+
for (QNetworkReply *reply : std::as_const(m_replies)) {
691691
// Hide progress bar
692692
QListWidgetItem *listItem
693693
= ui->availableDocsetList->item(reply->property(ListItemIndexProperty).toInt());

src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ bool QxtGlobalShortcutPrivate::registerShortcut(quint32 nativeKey, quint32 nativ
152152
}
153153

154154
bool failed = false;
155-
for (xcb_void_cookie_t cookie : qAsConst(xcbCookies)) {
155+
for (xcb_void_cookie_t cookie : std::as_const(xcbCookies)) {
156156
QScopedPointer<xcb_generic_error_t, QScopedPointerPodDeleter> error(xcb_request_check(xcbConnection, cookie));
157157
failed = !error.isNull();
158158
}

0 commit comments

Comments
 (0)