Merge pull request #363 from svost/c++11

[novacoin.git] / src / qt / optionsmodel.cpp

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 80fc84f..7e80615 100644 (file)
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -16,25 +16,21 @@ bool static ApplyProxySettings()
 {
     QSettings settings;
     CService addrProxy(settings.value("addrProxy", "127.0.0.1:9050").toString().toStdString());
-    int nSocksVersion(settings.value("nSocksVersion", 5).toInt());
     if (!settings.value("fUseProxy", false).toBool()) {
         addrProxy = CService();
-        nSocksVersion = 0;
         return false;
     }
-    if (nSocksVersion && !addrProxy.IsValid())
+    if (!addrProxy.IsValid())
         return false;
 
     if (!IsLimited(NET_IPV4))
-        SetProxy(NET_IPV4, addrProxy, nSocksVersion);
-    if (nSocksVersion > 4) {
+        SetProxy(NET_IPV4, addrProxy);
 #ifdef USE_IPV6
         if (!IsLimited(NET_IPV6))
-            SetProxy(NET_IPV6, addrProxy, nSocksVersion);
+            SetProxy(NET_IPV6, addrProxy);
 #endif
-    }
 
-    SetNameProxy(addrProxy, nSocksVersion);
+    SetNameProxy(addrProxy);
 
     return true;
 }
@@ -50,7 +46,7 @@ bool static ApplyTorSettings()
     if (!addrTor.IsValid())
         return false;
 
-    SetProxy(NET_TOR, addrTor, 5);
+    SetProxy(NET_TOR, addrTor);
     SetReachable(NET_TOR);
 
     return true;
@@ -132,32 +128,30 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const
         case ProxyIP: {
             proxyType proxy;
             if (GetProxy(NET_IPV4, proxy))
-                return QVariant(QString::fromStdString(proxy.first.ToStringIP()));
+                return QVariant(QString::fromStdString(proxy.ToStringIP()));
             else
                 return QVariant(QString::fromStdString("127.0.0.1"));
         }
         case ProxyPort: {
             proxyType proxy;
             if (GetProxy(NET_IPV4, proxy))
-                return QVariant(proxy.first.GetPort());
+                return QVariant(proxy.GetPort());
             else
                 return QVariant(nSocksDefault);
         }
-        case ProxySocksVersion:
-            return settings.value("nSocksVersion", 5);
         case TorUse:
             return settings.value("fUseTor", false);
         case TorIP: {
             proxyType proxy;
             if (GetProxy(NET_TOR, proxy))
-                return QVariant(QString::fromStdString(proxy.first.ToStringIP()));
+                return QVariant(QString::fromStdString(proxy.ToStringIP()));
             else
                 return QVariant(QString::fromStdString("127.0.0.1"));
         }
         case TorPort: {
             proxyType proxy;
             if (GetProxy(NET_TOR, proxy))
-                return QVariant(proxy.first.GetPort());
+                return QVariant(proxy.GetPort());
             else
                 return QVariant(nSocksDefault);
         }
@@ -213,32 +207,22 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
             break;
         case ProxyIP: {
             proxyType proxy;
-            proxy.first = CService("127.0.0.1", nSocksDefault);
+            proxy = CService("127.0.0.1", nSocksDefault);
             GetProxy(NET_IPV4, proxy);
 
             CNetAddr addr(value.toString().toStdString());
-            proxy.first.SetIP(addr);
-            settings.setValue("addrProxy", proxy.first.ToStringIPPort().c_str());
+            proxy.SetIP(addr);
+            settings.setValue("addrProxy", proxy.ToStringIPPort().c_str());
             successful = ApplyProxySettings();
         }
         break;
         case ProxyPort: {
             proxyType proxy;
-            proxy.first = CService("127.0.0.1", nSocksDefault);
-            GetProxy(NET_IPV4, proxy);
-
-            proxy.first.SetupPort(value.toInt());
-            settings.setValue("addrProxy", proxy.first.ToStringIPPort().c_str());
-            successful = ApplyProxySettings();
-        }
-        break;
-        case ProxySocksVersion: {
-            proxyType proxy;
-            proxy.second = 5;
+            proxy = CService("127.0.0.1", nSocksDefault);
             GetProxy(NET_IPV4, proxy);
 
-            proxy.second = value.toInt();
-            settings.setValue("nSocksVersion", proxy.second);
+            proxy.SetupPort(value.toInt());
+            settings.setValue("addrProxy", proxy.ToStringIPPort().c_str());
             successful = ApplyProxySettings();
         }
         break;
@@ -249,22 +233,22 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
         break;
         case TorIP: {
             proxyType proxy;
-            proxy.first = CService("127.0.0.1", nSocksDefault);
+            proxy = CService("127.0.0.1", nSocksDefault);
             GetProxy(NET_TOR, proxy);
 
             CNetAddr addr(value.toString().toStdString());
-            proxy.first.SetIP(addr);
-            settings.setValue("addrTor", proxy.first.ToStringIPPort().c_str());
+            proxy.SetIP(addr);
+            settings.setValue("addrTor", proxy.ToStringIPPort().c_str());
             successful = ApplyTorSettings();
         }
         break;
         case TorPort: {
             proxyType proxy;
-            proxy.first = CService("127.0.0.1", nSocksDefault);
+            proxy = CService("127.0.0.1", nSocksDefault);
             GetProxy(NET_TOR, proxy);
 
-            proxy.first.SetupPort((uint16_t)value.toUInt());
-            settings.setValue("addrTor", proxy.first.ToStringIPPort().c_str());
+            proxy.SetupPort((uint16_t)value.toUInt());
+            settings.setValue("addrTor", proxy.ToStringIPPort().c_str());
             successful = ApplyTorSettings();
         }
         break;