From f0549b4cb2894182ac877f61a4ad867c2a85558a Mon Sep 17 00:00:00 2001
From: thalieht <eretrus@outlook.com>
Date: Thu, 16 Apr 2020 20:02:45 +0300
Subject: [PATCH] Make a few cosmetic changes in code
---
src/gui/optionsdialog.cpp | 11 +++++------
src/gui/optionsdialog.h | 2 +-
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/gui/optionsdialog.cpp b/src/gui/optionsdialog.cpp
index c181b0ea0..f2cef9353 100644
--- a/src/gui/optionsdialog.cpp
+++ b/src/gui/optionsdialog.cpp
@@ -882,7 +882,6 @@ Net::ProxyType OptionsDialog::getProxyType() const
switch (m_ui->comboProxyType->currentIndex()) {
case 1:
return Net::ProxyType::SOCKS4;
- break;
case 2:
if (isProxyAuthEnabled())
return Net::ProxyType::SOCKS5_PW;
@@ -1443,16 +1442,16 @@ void OptionsDialog::toggleComboRatioLimitAct()
m_ui->comboRatioLimitAct->setEnabled(m_ui->checkMaxRatio->isChecked() || m_ui->checkMaxSeedingMinutes->isChecked());
}
-void OptionsDialog::enableProxy(int index)
+void OptionsDialog::enableProxy(const int index)
{
- if (index) {
+ if (index >= 1) { // Any proxy type is used
//enable
m_ui->lblProxyIP->setEnabled(true);
m_ui->textProxyIP->setEnabled(true);
m_ui->lblProxyPort->setEnabled(true);
m_ui->spinProxyPort->setEnabled(true);
m_ui->checkProxyPeerConnecs->setEnabled(true);
- if (index > 1) {
+ if (index >= 2) { // SOCKS5 or HTTP
m_ui->checkProxyAuth->setEnabled(true);
m_ui->isProxyOnlyForTorrents->setEnabled(true);
}
@@ -1463,8 +1462,8 @@ void OptionsDialog::enableProxy(int index)
m_ui->isProxyOnlyForTorrents->setChecked(true);
}
}
- else {
- //disable
+ else { // No proxy
+ // disable
m_ui->lblProxyIP->setEnabled(false);
m_ui->textProxyIP->setEnabled(false);
m_ui->lblProxyPort->setEnabled(false);
diff --git a/src/gui/optionsdialog.h b/src/gui/optionsdialog.h
index 72ee2e343..884756778 100644
--- a/src/gui/optionsdialog.h
+++ b/src/gui/optionsdialog.h
@@ -82,7 +82,7 @@ class OptionsDialog : public QDialog
public:
// Constructor / Destructor
OptionsDialog(QWidget *parent = nullptr);
- ~OptionsDialog();
+ ~OptionsDialog() override;
public slots:
void showConnectionTab();