aboutsummaryrefslogtreecommitdiff
path: root/src/qt/optionsmodel.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@protonmail.com>2019-10-26 11:34:25 +0200
committerWladimir J. van der Laan <laanwj@protonmail.com>2019-10-26 11:35:45 +0200
commitd91af4768c1cbc1a6ec0f69a3a6d17f69c0cee07 (patch)
tree8e3c746d8ac1f53ac7cf8e4724f5642d3bc52ffb /src/qt/optionsmodel.cpp
parent25d7e2e78137d07eb612c44d19b0d496050c947a (diff)
parent8c6081a884cd0969160955ce8687d4d4ed074db3 (diff)
downloadbitcoin-d91af4768c1cbc1a6ec0f69a3a6d17f69c0cee07.tar.xz
Merge #17165: Remove BIP70 support
8c6081a884cd0969160955ce8687d4d4ed074db3 compat: remove bswap_* check on macOS (fanquake) 2cba35ab38b492768e85bd77442a566dda169466 build: skip building OpenSSL lib_ssl (fanquake) 45a2d3c5526551c279b624e111fe83d1f30b10db build: remove OpenSSL from Qt build (fanquake) befbc40eb5928ac20a85fd3446946895cd2e66cb build: remove EVP_MD_CTX_new detection (fanquake) fcee10c2d028cba11416d902f5abf13fea7a65f4 build: remove SSL lib detection (fanquake) c7f30dbca8034f70488cb494b4d1736c961301b9 gui: Update BIP70 support message (fanquake) a3e810326d7e70a774ece9e9aa0c571cc9216aab build: remove BIP70 entries from macOS Info.plist (fanquake) 72fe13a58d5894afbaf1bb6789ee9b9b6576f20f gui: remove payment request file handling from OpenURI dialog (fanquake) 3548e4aac72e9148d41b440052a89d89328f7661 Remove BIP70 Support (fanquake) 1cb9a4e28cccd3056e2b8d9cdabc45bf3e4dd2a6 docs: remove protobuf from docs (fanquake) 67328bb7ca57fa0df867ec73dbeeb97d61450a4e build: remove protobuf from depends (fanquake) Pull request description: This removes [BIP70](https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki) support. It also removes OpenSSL linking from Qt and building OpenSSLs `lib_ssl` in depends, as well as SSL lib detection from the build system. It's something that I'd optimistically like to do for `0.20.0`. ACKs for top commit: laanwj: Code review ACK 8c6081a884cd0969160955ce8687d4d4ed074db3 MarcoFalke: ACK 8c6081a884cd0969160955ce8687d4d4ed074db3 fjahr: ACK 8c6081a Tree-SHA512: 9dd9153afa4eca1a795f983e5b31f5fee9fa9a064c2a95d2f98810689add3ad0bf221c4608282299e66e4d1ec31cd556d4b16eea55de7912c3b9931f64735883
Diffstat (limited to 'src/qt/optionsmodel.cpp')
-rw-r--r--src/qt/optionsmodel.cpp20
1 files changed, 1 insertions, 19 deletions
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index d047a82475..d74d0dbfeb 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -18,7 +18,7 @@
#include <netbase.h>
#include <txdb.h> // for -dbcache defaults
-#include <QNetworkProxy>
+#include <QDebug>
#include <QSettings>
#include <QStringList>
@@ -483,24 +483,6 @@ void OptionsModel::setDisplayUnit(const QVariant &value)
}
}
-bool OptionsModel::getProxySettings(QNetworkProxy& proxy) const
-{
- // Directly query current base proxy, because
- // GUI settings can be overridden with -proxy.
- proxyType curProxy;
- if (m_node.getProxy(NET_IPV4, curProxy)) {
- proxy.setType(QNetworkProxy::Socks5Proxy);
- proxy.setHostName(QString::fromStdString(curProxy.proxy.ToStringIP()));
- proxy.setPort(curProxy.proxy.GetPort());
-
- return true;
- }
- else
- proxy.setType(QNetworkProxy::NoProxy);
-
- return false;
-}
-
void OptionsModel::setRestartRequired(bool fRequired)
{
QSettings settings;