Compare commits
8 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7eac9df0c4 | ||
|
|
6d549305b5 | ||
|
|
a96df4465b | ||
|
|
60ac18c3b7 | ||
|
|
3262b9c0df | ||
|
|
b92bd39650 | ||
|
|
ebc95b5dd1 | ||
|
|
efb5a1441b |
4 changed files with 3 additions and 129 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -4,3 +4,4 @@
|
|||
/zeal-1cfa7c637f745be9d98777f06b4f8dec90892bf2.tar.gz
|
||||
/zeal-1cfa7c6.tar.gz
|
||||
/zeal-0.7.0.tar.gz
|
||||
/zeal-0.7.1.tar.gz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (zeal-0.7.0.tar.gz) = 5980d521ee923e9ef009aafdf24c146f63de5a8dccac63078d1125e86f1f36503d9c1ca2dc1b1365be71e67abfc18f43c48c212a52340ecc96aac25db072047e
|
||||
SHA512 (zeal-0.7.1.tar.gz) = 8d831aaf4d43e55c60b065beda59e7f8377c4aa778f22e4ddc81d025eeb2d90abe6ffd4e26918a61db374b97ba1236a41b55bce8916b22f55f7394fb266d7543
|
||||
|
|
|
|||
|
|
@ -1,126 +0,0 @@
|
|||
diff --git a/src/libs/registry/docset.cpp b/src/libs/registry/docset.cpp
|
||||
index 0c0dbb7..e82c9c9 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 f08d891..76f9aa1 100644
|
||||
--- a/src/libs/registry/docsetmetadata.cpp
|
||||
+++ b/src/libs/registry/docsetmetadata.cpp
|
||||
@@ -33,6 +33,8 @@
|
||||
#include <QVariant>
|
||||
#include <QXmlStreamReader>
|
||||
|
||||
+#include <utility>
|
||||
+
|
||||
using namespace Zeal::Registry;
|
||||
|
||||
DocsetMetadata::DocsetMetadata(const QJsonObject &jsonObject)
|
||||
@@ -97,7 +99,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 9776a19..8777474 100644
|
||||
--- a/src/libs/registry/docsetregistry.cpp
|
||||
+++ b/src/libs/registry/docsetregistry.cpp
|
||||
@@ -38,6 +38,7 @@
|
||||
|
||||
#include <functional>
|
||||
#include <future>
|
||||
+#include <utility>
|
||||
|
||||
using namespace Zeal::Registry;
|
||||
|
||||
@@ -101,7 +102,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 +194,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 +227,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 4e3788b..9cfc3fc 100644
|
||||
--- a/src/libs/ui/docsetsdialog.cpp
|
||||
+++ b/src/libs/ui/docsetsdialog.cpp
|
||||
@@ -47,6 +47,7 @@
|
||||
#include <QUrl>
|
||||
|
||||
#include <memory>
|
||||
+#include <utility>
|
||||
|
||||
using namespace Zeal;
|
||||
using namespace Zeal::WidgetUi;
|
||||
@@ -687,7 +688,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 a40c772..b7b8378 100644
|
||||
--- a/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp
|
||||
+++ b/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp
|
||||
@@ -62,6 +62,8 @@
|
||||
#include <QtGui/private/qtx11extras_p.h>
|
||||
#endif
|
||||
|
||||
+#include <utility>
|
||||
+
|
||||
#include <X11/Xlib.h>
|
||||
#include <xcb/xcb.h>
|
||||
#include <xcb/xcb_keysyms.h>
|
||||
@@ -152,7 +154,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();
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
%global debug_package %{nil}
|
||||
|
||||
Name: zeal
|
||||
Version: 0.7.0
|
||||
Version: 0.7.1
|
||||
Release: %autorelease
|
||||
Summary: Offline documentation browser inspired by Dash
|
||||
|
||||
|
|
@ -9,7 +9,6 @@ License: GPLv3+
|
|||
URL: https://zealdocs.org/
|
||||
Source: https://github.com/zealdocs/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
Patch0: 0001-apply-websettings.patch
|
||||
Patch1: zeal-qasconst-deprecated.patch
|
||||
|
||||
# We should use %%qt6_qtwebengine_arches provided by qt6-srpm-macros
|
||||
# but one of our dependency qt6-qtwebengine is available only
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue