c08d94b8a5
* Build against Qt6. * Add zeal-deprecate-qAsConst.patch -- replace deprecated qAsConst with std::as_const() (gh#zealdocs/zeal#1565); patch taken from upstream commit. * Use qt6 RPM macros for build. * Pass -DCMAKE_SKIP_INSTALL_RPATH=ON to cmake to avoid rpath being left to installed binary. * Drop deprecated scriptlets from %post(un). OBS-URL: https://build.opensuse.org/request/show/1124387 OBS-URL: https://build.opensuse.org/package/show/devel:tools/zeal?expand=0&rev=33
108 lines
4.7 KiB
Diff
108 lines
4.7 KiB
Diff
From 9630cc94c155d87295e51b41fbab2bd5798f8229 Mon Sep 17 00:00:00 2001
|
|
From: Nick Cao <nickcao@nichi.co>
|
|
Date: Sun, 29 Oct 2023 02:50:40 -0400
|
|
Subject: [PATCH] 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
|
|
---
|
|
src/libs/registry/docset.cpp | 4 ++--
|
|
src/libs/registry/docsetmetadata.cpp | 2 +-
|
|
src/libs/registry/docsetregistry.cpp | 6 +++---
|
|
src/libs/ui/docsetsdialog.cpp | 2 +-
|
|
src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp | 2 +-
|
|
5 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/src/libs/registry/docset.cpp b/src/libs/registry/docset.cpp
|
|
index 0c0dbb72..e82c9c9b 100644
|
|
--- a/src/libs/registry/docset.cpp
|
|
+++ b/src/libs/registry/docset.cpp
|
|
@@ -458,7 +458,7 @@ void Docset::loadSymbols(const QString &symbolType) const
|
|
// with it.first and it.second respectively pointing to the start and the end
|
|
// of the range of nodes having symbolType as key. It effectively represents a
|
|
// contiguous view over the nodes with a specified key.
|
|
- for (auto it = qAsConst(m_symbolStrings).equal_range(symbolType); it.first != it.second; ++it.first) {
|
|
+ for (auto it = std::as_const(m_symbolStrings).equal_range(symbolType); it.first != it.second; ++it.first) {
|
|
loadSymbols(symbolType, it.first.value());
|
|
}
|
|
}
|
|
@@ -519,7 +519,7 @@ void Docset::createIndex()
|
|
}
|
|
|
|
// Drop old indexes
|
|
- for (const QString &oldIndexName : qAsConst(oldIndexes)) {
|
|
+ for (const QString &oldIndexName : std::as_const(oldIndexes)) {
|
|
m_db->execute(indexDropQuery.arg(oldIndexName));
|
|
}
|
|
|
|
diff --git a/src/libs/registry/docsetmetadata.cpp b/src/libs/registry/docsetmetadata.cpp
|
|
index 0678a130..5144e2fe 100644
|
|
--- a/src/libs/registry/docsetmetadata.cpp
|
|
+++ b/src/libs/registry/docsetmetadata.cpp
|
|
@@ -97,7 +97,7 @@ void DocsetMetadata::save(const QString &path, const QString &version)
|
|
|
|
if (!m_urls.isEmpty()) {
|
|
QJsonArray urls;
|
|
- for (const QUrl &url : qAsConst(m_urls)) {
|
|
+ for (const QUrl &url : std::as_const(m_urls)) {
|
|
urls.append(url.toString());
|
|
}
|
|
|
|
diff --git a/src/libs/registry/docsetregistry.cpp b/src/libs/registry/docsetregistry.cpp
|
|
index 9776a19a..17be79ea 100644
|
|
--- a/src/libs/registry/docsetregistry.cpp
|
|
+++ b/src/libs/registry/docsetregistry.cpp
|
|
@@ -101,7 +101,7 @@ void DocsetRegistry::setFuzzySearchEnabled(bool enabled)
|
|
|
|
m_isFuzzySearchEnabled = enabled;
|
|
|
|
- for (Docset *docset : qAsConst(m_docsets)) {
|
|
+ for (Docset *docset : std::as_const(m_docsets)) {
|
|
docset->setFuzzySearchEnabled(enabled);
|
|
}
|
|
}
|
|
@@ -193,7 +193,7 @@ Docset *DocsetRegistry::docset(int index) const
|
|
|
|
Docset *DocsetRegistry::docsetForUrl(const QUrl &url)
|
|
{
|
|
- for (Docset *docset : qAsConst(m_docsets)) {
|
|
+ for (Docset *docset : std::as_const(m_docsets)) {
|
|
if (docset->baseUrl().isParentOf(url))
|
|
return docset;
|
|
}
|
|
@@ -226,7 +226,7 @@ void DocsetRegistry::_runQuery(const QString &query)
|
|
|
|
const SearchQuery searchQuery = SearchQuery::fromString(query);
|
|
if (searchQuery.hasKeywords()) {
|
|
- for (Docset *docset : qAsConst(m_docsets)) {
|
|
+ for (Docset *docset : std::as_const(m_docsets)) {
|
|
if (searchQuery.hasKeywords(docset->keywords()))
|
|
enabledDocsets << docset;
|
|
}
|
|
diff --git a/src/libs/ui/docsetsdialog.cpp b/src/libs/ui/docsetsdialog.cpp
|
|
index 4e3788bb..18d0409c 100644
|
|
--- a/src/libs/ui/docsetsdialog.cpp
|
|
+++ b/src/libs/ui/docsetsdialog.cpp
|
|
@@ -687,7 +687,7 @@ QNetworkReply *DocsetsDialog::download(const QUrl &url)
|
|
|
|
void DocsetsDialog::cancelDownloads()
|
|
{
|
|
- for (QNetworkReply *reply : qAsConst(m_replies)) {
|
|
+ for (QNetworkReply *reply : std::as_const(m_replies)) {
|
|
// Hide progress bar
|
|
QListWidgetItem *listItem
|
|
= ui->availableDocsetList->item(reply->property(ListItemIndexProperty).toInt());
|
|
diff --git a/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp b/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp
|
|
index a40c7720..7a832ad2 100644
|
|
--- a/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp
|
|
+++ b/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp
|
|
@@ -152,7 +152,7 @@ bool QxtGlobalShortcutPrivate::registerShortcut(quint32 nativeKey, quint32 nativ
|
|
}
|
|
|
|
bool failed = false;
|
|
- for (xcb_void_cookie_t cookie : qAsConst(xcbCookies)) {
|
|
+ for (xcb_void_cookie_t cookie : std::as_const(xcbCookies)) {
|
|
QScopedPointer<xcb_generic_error_t, QScopedPointerPodDeleter> error(xcb_request_check(xcbConnection, cookie));
|
|
failed = !error.isNull();
|
|
}
|