From 9c4dd932c6d692178bb8d5265c634126cb415767 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Tue, 26 May 2020 22:23:25 +0300 Subject: Turn on more warnings by default - fix clazy warnings - fix various other compiler warnings - bugfix: connect profiles' downloadRequested signal --- lib/bookmarks/bookmarkmodel.cpp | 7 ++++--- lib/bookmarks/formats/ffjson.cpp | 8 +++++--- lib/downloads/widgets/downloaditemwidget.cpp | 21 ++++++++------------- lib/downloads/widgets/downloaditemwidget.h | 2 +- lib/pluginloader/pluginloader.cpp | 6 +++++- lib/pluginloader/pluginloader.h | 2 +- lib/session_formats/session_json.cpp | 16 +++++++++++----- 7 files changed, 35 insertions(+), 27 deletions(-) (limited to 'lib') diff --git a/lib/bookmarks/bookmarkmodel.cpp b/lib/bookmarks/bookmarkmodel.cpp index 8599f1d..0775ff2 100644 --- a/lib/bookmarks/bookmarkmodel.cpp +++ b/lib/bookmarks/bookmarkmodel.cpp @@ -241,10 +241,11 @@ inline QStringList searchThrough(const QString &term, const QStringList &tags, B if(has(tags, child->data(BookmarkItem::Tags).toStringList())) { // append all bookmarks - for(int i = 0; i < child->childCount(); ++i) { - auto *subChild = child->child(i); - if(subChild->type() == BookmarkItem::Bookmark) + for(int j = 0; j < child->childCount(); ++j) { + auto *subChild = child->child(j); + if(subChild->type() == BookmarkItem::Bookmark) { results.append(subChild->data(BookmarkItem::Href).toString()); + } } } results.append(searchThrough(term, tags, child)); diff --git a/lib/bookmarks/formats/ffjson.cpp b/lib/bookmarks/formats/ffjson.cpp index 1fe6a96..f9e0866 100644 --- a/lib/bookmarks/formats/ffjson.cpp +++ b/lib/bookmarks/formats/ffjson.cpp @@ -32,7 +32,8 @@ inline void readElementData(const QJsonObject &object, BookmarkItem *item) item->setData(BookmarkItem::Tags, tags); // descriptions - for(const auto &a : object["annos"].toArray()) { + const auto annos_array = object["annos"].toArray(); + for(const auto &a : annos_array) { const auto anno = a.toObject(); if(anno["name"] == "bookmarkProperties/description") { item->setData(BookmarkItem::Description, anno["value"].toString()); @@ -40,9 +41,10 @@ inline void readElementData(const QJsonObject &object, BookmarkItem *item) } } -void readChildElements(const QJsonObject &object, BookmarkItem *item) +inline void readChildElements(const QJsonObject &object, BookmarkItem *item) { - for(const auto c : object["children"].toArray()) { + const auto children_array = object["children"].toArray(); + for(const auto &c : children_array) { const auto child = c.toObject(); const auto type = child["type"].toString(); diff --git a/lib/downloads/widgets/downloaditemwidget.cpp b/lib/downloads/widgets/downloaditemwidget.cpp index 241b90b..e0c8a60 100644 --- a/lib/downloads/widgets/downloaditemwidget.cpp +++ b/lib/downloads/widgets/downloaditemwidget.cpp @@ -13,7 +13,7 @@ #include #include -inline QString sizeString(int size) +inline QString sizeString(qint64 size) { if(size < 1024) { return QString("%1 bytes").arg(size); @@ -30,12 +30,12 @@ inline QString sizeString(int size) return QString("%1 GB").arg(size / (1024 * 1024 * 1024)); } -DownloadItemWidget::DownloadItemWidget(QWebEngineDownloadItem *item, QWidget *parent) +DownloadItemWidget::DownloadItemWidget(QWebEngineDownloadItem *m_item, QWidget *parent) : QWidget(parent) , ui(new Ui::DownloadItemForm) { Q_CHECK_PTR(item); - this->item = item; + m_item = item; ui->setupUi(this); { // pause/resume icons @@ -56,15 +56,11 @@ DownloadItemWidget::DownloadItemWidget(QWebEngineDownloadItem *item, QWidget *pa connect(item, &QWebEngineDownloadItem::finished, this, &DownloadItemWidget::updateFinished); connect(ui->abort_toolButton, &QToolButton::clicked, item, &QWebEngineDownloadItem::cancel); - connect(ui->pause_toolButton, &QToolButton::clicked, item, [item](bool clicked) { - if(clicked) { - item->pause(); - } else { - item->resume(); - } + connect(ui->pause_toolButton, &QToolButton::clicked, item, [m_item](bool clicked) { + clicked ? m_item->pause() : m_item->resume(); }); - connect(ui->open_toolButton, &QToolButton::clicked, item, [item]() { - QDesktopServices::openUrl(QUrl::fromLocalFile(item->downloadDirectory()+'/'+item->downloadFileName())); + connect(ui->open_toolButton, &QToolButton::clicked, item, [m_item]() { + QDesktopServices::openUrl(QUrl::fromLocalFile(m_item->downloadDirectory() + '/' + m_item->downloadFileName())); }); } @@ -113,8 +109,7 @@ void DownloadItemWidget::updateState(QWebEngineDownloadItem::DownloadState state void DownloadItemWidget::updateProgress(qint64 value, qint64 total) { - ui->progressBar->setMaximum(total); - ui->progressBar->setValue(value); + ui->progressBar->setValue(static_cast((static_cast(value) / static_cast(total)) * 100)); ui->progressBar->setFormat(QString("%1 / %2").arg(sizeString(value), sizeString(total))); } diff --git a/lib/downloads/widgets/downloaditemwidget.h b/lib/downloads/widgets/downloaditemwidget.h index c2809d2..a1de175 100644 --- a/lib/downloads/widgets/downloaditemwidget.h +++ b/lib/downloads/widgets/downloaditemwidget.h @@ -22,7 +22,7 @@ class DownloadItemWidget : public QWidget Q_OBJECT public: - explicit DownloadItemWidget(QWebEngineDownloadItem *item, QWidget *parent = 0); + explicit DownloadItemWidget(QWebEngineDownloadItem *m_item, QWidget *parent = 0); ~DownloadItemWidget() override; private slots: diff --git a/lib/pluginloader/pluginloader.cpp b/lib/pluginloader/pluginloader.cpp index 082a449..ce84c7a 100644 --- a/lib/pluginloader/pluginloader.cpp +++ b/lib/pluginloader/pluginloader.cpp @@ -65,7 +65,11 @@ bool PluginLoader::verify(const char *hashName) const std::size_t buffer_size = 1024; std::vector buffer(buffer_size); - while(const auto sz = plugin.readsome(&buffer.front(), buffer_size)) { + std::size_t sz = 0; + while(true) { + sz = static_cast(plugin.readsome(&buffer.front(), buffer_size)); + if(sz <= 0) + break; rc = EVP_DigestVerifyUpdate(ctx, reinterpret_cast(buffer.data()), sz); if(rc != 1) { m_sigError = tr("Failed to compute signature (stage=update)"); diff --git a/lib/pluginloader/pluginloader.h b/lib/pluginloader/pluginloader.h index 703c285..cc67901 100644 --- a/lib/pluginloader/pluginloader.h +++ b/lib/pluginloader/pluginloader.h @@ -45,6 +45,6 @@ public: bool verify(const char *hashName = "SHA256"); private: - const int m_state; + const signature_state_t m_state; QString m_sigError; }; diff --git a/lib/session_formats/session_json.cpp b/lib/session_formats/session_json.cpp index eca96f2..96319ac 100644 --- a/lib/session_formats/session_json.cpp +++ b/lib/session_formats/session_json.cpp @@ -10,7 +10,7 @@ #include #include -[[nodiscard]] QVector toWindowList(const QString &profile, const QStringList &urls) +[[nodiscard]] inline QVector toWindowList(const QString &profile, const QStringList &urls) { Session::SubWindow main_; main_.profile = profile; @@ -22,7 +22,7 @@ return { main }; } -[[nodiscard]] QJsonObject toJson(const QVector &windows) +[[nodiscard]] inline QJsonObject toJson(const QVector &windows) { QJsonObject root; QJsonArray windows_; @@ -76,12 +76,18 @@ QByteArray JsonSession::serialize() const QVector JsonSession::get() const { QVector windows; - for(const auto &windowData : root["windows"].toArray()) { + const auto root_array = root["windows"].toArray(); + for(const auto &windowData : root_array) { Session::MainWindow window; - for(const auto &subwindowData : windowData.toObject()["subwindows"].toArray()) { + + const auto subwindows_array = windowData.toObject()["subwindows"].toArray(); + for(const auto &subwindowData : subwindows_array) { Session::SubWindow subwindow; + subwindow.profile = subwindowData.toObject()["profile"].toString(); - for(const auto &tabData : subwindowData.toObject()["tabs"].toArray()) { + + const auto tabs_array = subwindowData.toObject()["tabs"].toArray(); + for(const auto &tabData : tabs_array) { Session::WebView tab{ tabData.toObject()["profile"].toString(), tabData.toObject()["url"].toString(), -- cgit v1.2.1