diff options
| author | Russell Yanofsky <russ@yanofsky.org> | 2017-04-17 16:43:47 -0400 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2018-04-04 16:52:40 -0400 |
| commit | 90d4640b7eff3154a0750c5acb52d39bd41e0bbb (patch) | |
| tree | 514691c9e9e6b52d6f866030a800681ca0554376 | |
| parent | 582daf6d22da5394d02a12003b9542d9f5865ae2 (diff) | |
| download | bitcoin-90d4640b7eff3154a0750c5acb52d39bd41e0bbb.tar.xz | |
Remove direct bitcoin calls from qt/optionsdialog.cpp
| -rw-r--r-- | src/qt/optionsdialog.cpp | 7 | ||||
| -rw-r--r-- | src/qt/optionsmodel.h | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index 5bef473c63..438e9e70f1 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -13,6 +13,7 @@ #include <qt/guiutil.h> #include <qt/optionsmodel.h> +#include <interface/node.h> #include <validation.h> // for DEFAULT_SCRIPTCHECK_THREADS and MAX_SCRIPTCHECK_THREADS #include <netbase.h> #include <txdb.h> // for -dbcache defaults @@ -313,17 +314,17 @@ void OptionsDialog::updateDefaultProxyNets() std::string strProxy; QString strDefaultProxyGUI; - GetProxy(NET_IPV4, proxy); + model->node().getProxy(NET_IPV4, proxy); strProxy = proxy.proxy.ToStringIP() + ":" + proxy.proxy.ToStringPort(); strDefaultProxyGUI = ui->proxyIp->text() + ":" + ui->proxyPort->text(); (strProxy == strDefaultProxyGUI.toStdString()) ? ui->proxyReachIPv4->setChecked(true) : ui->proxyReachIPv4->setChecked(false); - GetProxy(NET_IPV6, proxy); + model->node().getProxy(NET_IPV6, proxy); strProxy = proxy.proxy.ToStringIP() + ":" + proxy.proxy.ToStringPort(); strDefaultProxyGUI = ui->proxyIp->text() + ":" + ui->proxyPort->text(); (strProxy == strDefaultProxyGUI.toStdString()) ? ui->proxyReachIPv6->setChecked(true) : ui->proxyReachIPv6->setChecked(false); - GetProxy(NET_TOR, proxy); + model->node().getProxy(NET_TOR, proxy); strProxy = proxy.proxy.ToStringIP() + ":" + proxy.proxy.ToStringPort(); strDefaultProxyGUI = ui->proxyIp->text() + ":" + ui->proxyPort->text(); (strProxy == strDefaultProxyGUI.toStdString()) ? ui->proxyReachTor->setChecked(true) : ui->proxyReachTor->setChecked(false); diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h index 1d6bc19475..96c6b8fa45 100644 --- a/src/qt/optionsmodel.h +++ b/src/qt/optionsmodel.h @@ -79,6 +79,8 @@ public: void setRestartRequired(bool fRequired); bool isRestartRequired() const; + interface::Node& node() const { return m_node; } + private: interface::Node& m_node; /* Qt-only settings */ |