Changeset 9b513f6

Timestamp:

10/05/17 22:50:44 (5 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master

Children:

e618f18

Parents:

68efead

Message:

AppSettings? returns the proxy type as QNetworkProxy instead of int now.

Location:

src

Files:

• app/appsettings.cpp (modified) (2 diffs)
• app/appsettings.h (modified) (1 diff)
• gui/settingsdialog.cpp (modified) (2 diffs)

src/app/appsettings.cpp

@@ -37 +37 @@
 }
 
-//QNetworkProxy::ProxyType
-int AppSettings::proxyType()
+QNetworkProxy::ProxyType AppSettings::proxyType()
 {
-    return mSettings.value(PROXY_TYPE_SETTING).toInt();
+    bool ok;
+    int proxyType = mSettings.value(PROXY_TYPE_SETTING).toInt(&ok);
+    if (!ok || proxyType < 0 || proxyType > 5) return QNetworkProxy::DefaultProxy;
+    return QNetworkProxy::ProxyType(proxyType);
 }
 
@@ -58 +60 @@
 }
 
-// QNetworkProxy::ProxyType
-void AppSettings::setProxyType(const int aType)
+void AppSettings::setProxyType(QNetworkProxy::ProxyType aProxyType)
 {
-    mSettings.setValue(PROXY_TYPE_SETTING, aType);
+    mSettings.setValue(PROXY_TYPE_SETTING, aProxyType);
 }
 

src/app/appsettings.h

@@ -37 +37 @@
         static QString proxyAddress();
         static quint16 proxyPort();
-        static int proxyType(); // QNetworkProxy::ProxyType
+        static QNetworkProxy::ProxyType proxyType();
         static bool isDirectConnection();
 
         static void setProxyAddress(const QString &aAddress);
         static void setProxyPort(const quint16 aPort);
-        static void setProxyType(const int aProxyType); // QNetworkProxy::ProxyType
+        static void setProxyType(QNetworkProxy::ProxyType aProxyType);
         static void setDirectConnection(bool aDirectConnection);
         static int preEventAlarmSec() {return 60*15;} ///< seconds that alarm should ring before an event starts

src/gui/settingsdialog.cpp

@@ -36 +36 @@
     address->setText(AppSettings::proxyAddress());
     port->setValue(AppSettings::proxyPort());
-    const int proxyType = AppSettings::proxyType(); // QNetworkProxy::ProxyType
-    proxyTypeHTTP->setChecked(proxyType != 1); // HTTP=3, but we enable it by default, i.e. unless SOCKS5=1
-    proxyTypeSOCKS5->setChecked(proxyType == 1);
+    const QNetworkProxy::ProxyType proxyType = AppSettings::proxyType();
+    proxyTypeHTTP->setChecked(proxyType != QNetworkProxy::Socks5Proxy); // we enable it by default unless SOCKS5=1
+    proxyTypeSOCKS5->setChecked(proxyType == QNetworkProxy::Socks5Proxy);
     directConnection->setChecked(AppSettings::isDirectConnection());
     proxyWidget->setDisabled(directConnection->isChecked());
@@ -49 +49 @@
     AppSettings::setProxyAddress(address->text());
     AppSettings::setProxyPort(port->value());
-    AppSettings::setProxyType(proxyTypeHTTP->isChecked() ? 3 : proxyTypeSOCKS5->isChecked() ? 1 : 0);
+    AppSettings::setProxyType(proxyTypeHTTP->isChecked() ? QNetworkProxy::HttpProxy : proxyTypeSOCKS5->isChecked() ? QNetworkProxy::Socks5Proxy : QNetworkProxy::DefaultProxy);
     AppSettings::setDirectConnection(directConnection->isChecked());
 }