diff options
| author | John-Gee <[email protected]> | 2020-12-22 06:25:23 -0800 |
|---|---|---|
| committer | John-Gee <[email protected]> | 2021-02-02 03:54:57 -0800 |
| commit | 41406bfa1747a9c1038355a3ed4c5e455591afe8 (patch) | |
| tree | 67f6160f7cfa6232b5cc85269842f491c195a7c1 /src/qt/splashscreen.cpp | |
| parent | Merge pull request #1669 from carsenk/master (diff) | |
| download | discoin-41406bfa1747a9c1038355a3ed4c5e455591afe8.tar.xz discoin-41406bfa1747a9c1038355a3ed4c5e455591afe8.zip | |
Fix for Boost 1.74
Diffstat (limited to 'src/qt/splashscreen.cpp')
| -rw-r--r-- | src/qt/splashscreen.cpp | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index 656a2875c..c271c7fb9 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -26,6 +26,8 @@ #include <QPainter> #include <QRadialGradient> +#include <boost/bind/bind.hpp> + SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle *networkStyle) : QWidget(0, f), curAlignment(0) { @@ -167,7 +169,9 @@ static void ShowProgress(SplashScreen *splash, const std::string &title, int nPr #ifdef ENABLE_WALLET void SplashScreen::ConnectWallet(CWallet* wallet) { - wallet->ShowProgress.connect(boost::bind(ShowProgress, this, _1, _2)); + wallet->ShowProgress.connect(boost::bind(ShowProgress, this, + boost::placeholders::_1, + boost::placeholders::_2)); connectedWallets.push_back(wallet); } #endif @@ -175,21 +179,29 @@ void SplashScreen::ConnectWallet(CWallet* wallet) void SplashScreen::subscribeToCoreSignals() { // Connect signals to client - uiInterface.InitMessage.connect(boost::bind(InitMessage, this, _1)); - uiInterface.ShowProgress.connect(boost::bind(ShowProgress, this, _1, _2)); + uiInterface.InitMessage.connect(boost::bind(InitMessage, this, + boost::placeholders::_1)); + uiInterface.ShowProgress.connect(boost::bind(ShowProgress, this, + boost::placeholders::_1,boost::placeholders::_2)); #ifdef ENABLE_WALLET - uiInterface.LoadWallet.connect(boost::bind(&SplashScreen::ConnectWallet, this, _1)); + uiInterface.LoadWallet.connect(boost::bind(&SplashScreen::ConnectWallet, this, + boost::placeholders::_1)); #endif } void SplashScreen::unsubscribeFromCoreSignals() { // Disconnect signals from client - uiInterface.InitMessage.disconnect(boost::bind(InitMessage, this, _1)); - uiInterface.ShowProgress.disconnect(boost::bind(ShowProgress, this, _1, _2)); + uiInterface.InitMessage.disconnect(boost::bind(InitMessage, this, + boost::placeholders::_1)); + uiInterface.ShowProgress.disconnect(boost::bind(ShowProgress, this, + boost::placeholders::_1, + boost::placeholders::_2)); #ifdef ENABLE_WALLET Q_FOREACH(CWallet* const & pwallet, connectedWallets) { - pwallet->ShowProgress.disconnect(boost::bind(ShowProgress, this, _1, _2)); + pwallet->ShowProgress.disconnect(boost::bind(ShowProgress, this, + boost::placeholders::_1, + boost::placeholders::_2)); } #endif } |