From ac992e5aa03e904cfc1b76b69cc7e7f9651fc70e Mon Sep 17 00:00:00 2001 From: Oleg Shparber Date: Sun, 6 Aug 2023 14:14:05 -0400 Subject: [PATCH] style: fix minor coding style issues --- src/libs/core/application.cpp | 8 +++----- src/libs/core/settings.cpp | 4 ++-- src/libs/core/settings.h | 2 +- src/libs/ui/docsetsdialog.cpp | 1 - src/libs/ui/settingsdialog.cpp | 4 ++-- src/libs/ui/settingsdialog.ui | 2 +- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/libs/core/application.cpp b/src/libs/core/application.cpp index fab5c59..983ed79 100644 --- a/src/libs/core/application.cpp +++ b/src/libs/core/application.cpp @@ -66,10 +66,9 @@ Application::Application(QObject *parent) m_fileManager = new FileManager(this); m_httpServer = new HttpServer(this); - connect(m_networkManager, &QNetworkAccessManager::sslErrors, this, [this](QNetworkReply *reply, const QList &errors) - { - if (m_settings->isIgnoreSSLErrorsEnabled) { - // Ignore all SSL errors + connect(m_networkManager, &QNetworkAccessManager::sslErrors, + this, [this](QNetworkReply *reply, const QList &errors) { + if (m_settings->isIgnoreSslErrorsEnabled) { reply->ignoreSslErrors(); } }); @@ -285,7 +284,6 @@ void Application::applySettings() // Force NM to pick up changes. m_networkManager->clearAccessCache(); - } QString Application::userAgent() diff --git a/src/libs/core/settings.cpp b/src/libs/core/settings.cpp index 93ad37e..54cb0b1 100644 --- a/src/libs/core/settings.cpp +++ b/src/libs/core/settings.cpp @@ -181,7 +181,7 @@ void Settings::load() proxyAuthenticate = settings->value(QStringLiteral("authenticate"), false).toBool(); proxyUserName = settings->value(QStringLiteral("username")).toString(); proxyPassword = settings->value(QStringLiteral("password")).toString(); - isIgnoreSSLErrorsEnabled = settings->value(QStringLiteral("ignore_ssl_errors"), false).toBool(); + isIgnoreSslErrorsEnabled = settings->value(QStringLiteral("ignore_ssl_errors"), false).toBool(); settings->endGroup(); settings->beginGroup(GroupDocsets); @@ -269,7 +269,7 @@ void Settings::save() settings->setValue(QStringLiteral("authenticate"), proxyAuthenticate); settings->setValue(QStringLiteral("username"), proxyUserName); settings->setValue(QStringLiteral("password"), proxyPassword); - settings->setValue(QStringLiteral("ignore_ssl_errors"), isIgnoreSSLErrorsEnabled); + settings->setValue(QStringLiteral("ignore_ssl_errors"), isIgnoreSslErrorsEnabled); settings->endGroup(); settings->beginGroup(GroupDocsets); diff --git a/src/libs/core/settings.h b/src/libs/core/settings.h index 6633251..f82355d 100644 --- a/src/libs/core/settings.h +++ b/src/libs/core/settings.h @@ -99,7 +99,6 @@ public: Socks5 = 4 }; Q_ENUM(ProxyType) - bool isIgnoreSSLErrorsEnabled; // Internal // -------- @@ -114,6 +113,7 @@ public: bool proxyAuthenticate; QString proxyUserName; QString proxyPassword; + bool isIgnoreSslErrorsEnabled; // Other QString docsetPath; diff --git a/src/libs/ui/docsetsdialog.cpp b/src/libs/ui/docsetsdialog.cpp index 6991073..5195454 100644 --- a/src/libs/ui/docsetsdialog.cpp +++ b/src/libs/ui/docsetsdialog.cpp @@ -675,7 +675,6 @@ bool DocsetsDialog::updatesAvailable() const QNetworkReply *DocsetsDialog::download(const QUrl &url) { QNetworkReply *reply = m_application->download(url); - connect(reply, &QNetworkReply::downloadProgress, this, &DocsetsDialog::downloadProgress); connect(reply, &QNetworkReply::finished, this, &DocsetsDialog::downloadCompleted); m_replies.append(reply); diff --git a/src/libs/ui/settingsdialog.cpp b/src/libs/ui/settingsdialog.cpp index c25bccd..4aaaeb9 100644 --- a/src/libs/ui/settingsdialog.cpp +++ b/src/libs/ui/settingsdialog.cpp @@ -256,7 +256,7 @@ void SettingsDialog::loadSettings() ui->proxyUsernameEdit->setText(settings->proxyUserName); ui->proxyPasswordEdit->setText(settings->proxyPassword); - ui->ignoreSSLErrorsCheckBox->setChecked(settings->isIgnoreSSLErrorsEnabled); + ui->ignoreSslErrorsCheckBox->setChecked(settings->isIgnoreSslErrorsEnabled); } void SettingsDialog::saveSettings() @@ -332,7 +332,7 @@ void SettingsDialog::saveSettings() settings->proxyUserName = ui->proxyUsernameEdit->text(); settings->proxyPassword = ui->proxyPasswordEdit->text(); - settings->isIgnoreSSLErrorsEnabled = ui->ignoreSSLErrorsCheckBox->isChecked(); + settings->isIgnoreSslErrorsEnabled = ui->ignoreSslErrorsCheckBox->isChecked(); settings->save(); } diff --git a/src/libs/ui/settingsdialog.ui b/src/libs/ui/settingsdialog.ui index 2caec49..58bab27 100644 --- a/src/libs/ui/settingsdialog.ui +++ b/src/libs/ui/settingsdialog.ui @@ -752,7 +752,7 @@ - + Ignore SSL errors