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

diff --git a/src/app/appsettings.cpp b/src/app/appsettings.cpp
index 477c1b0e40317ab686832cabcac09c7d07e2600d..f220969b04de2d21dcdda4aa0fd0161b5e9cc1c7 100644 (file)
--- a/src/app/appsettings.cpp
+++ b/src/app/appsettings.cpp
@@ -36,10 +36,12 @@ quint16 AppSettings::proxyPort()
     return mSettings.value(PROXY_PORT_SETTING).toUInt();
 }
 
     return mSettings.value(PROXY_PORT_SETTING).toUInt();
 }
 

-//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);

 }
 
 bool AppSettings::isDirectConnection()
 }
 
 bool AppSettings::isDirectConnection()


@@ -57,10 +59,9 @@ void AppSettings::setProxyPort(const quint16 aPort)
     mSettings.setValue(PROXY_PORT_SETTING, aPort);
 }
 
     mSettings.setValue(PROXY_PORT_SETTING, aPort);
 }
 

-// 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);

 }
 
 void AppSettings::setDirectConnection(bool aDirectConnection)
 }
 
 void AppSettings::setDirectConnection(bool aDirectConnection)

diff --git a/src/app/appsettings.h b/src/app/appsettings.h
index 7f264412474a0716fa58f3abc28dbdfadebb34ab..1b5a16bddd3ffd6b9f7c368725f22c3fb234feed 100644 (file)
--- a/src/app/appsettings.h
+++ b/src/app/appsettings.h
@@ -36,12 +36,12 @@ class AppSettings
 
         static QString proxyAddress();
         static quint16 proxyPort();
 
         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 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
 };
         static void setDirectConnection(bool aDirectConnection);
         static int preEventAlarmSec() {return 60*15;} ///< seconds that alarm should ring before an event starts
 };

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 3e29c78d5d3494b8627252c2a91d97e95e67d6eb..91f5fdc0f7dcc539f012e695077ba78bce50f226 100644 (file)
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -35,9 +35,9 @@ void SettingsDialog::loadDialogData()
     // deserialize dialog data
     address->setText(AppSettings::proxyAddress());
     port->setValue(AppSettings::proxyPort());
     // deserialize dialog data
     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());
 }
     directConnection->setChecked(AppSettings::isDirectConnection());
     proxyWidget->setDisabled(directConnection->isChecked());
 }


@@ -48,7 +48,7 @@ void SettingsDialog::saveDialogData()
     // serialize dialog data
     AppSettings::setProxyAddress(address->text());
     AppSettings::setProxyPort(port->value());
     // serialize dialog data
     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());
 }
 
     AppSettings::setDirectConnection(directConnection->isChecked());
 }