diff --git a/src/btcsignals.h b/src/btcsignals.h index 816d912571e..415d8b8651f 100644 --- a/src/btcsignals.h +++ b/src/btcsignals.h @@ -9,4 +9,6 @@ #include #include +namespace btcsignals = boost::signals2; + #endif // BITCOIN_BTCSIGNALS_H diff --git a/src/common/interfaces.cpp b/src/common/interfaces.cpp index dc98fac6c63..de028f9ca25 100644 --- a/src/common/interfaces.cpp +++ b/src/common/interfaces.cpp @@ -23,11 +23,11 @@ public: class SignalHandler : public interfaces::Handler { public: - explicit SignalHandler(boost::signals2::connection connection) : m_connection(std::move(connection)) {} + explicit SignalHandler(btcsignals::connection connection) : m_connection(std::move(connection)) {} void disconnect() override { m_connection.disconnect(); } - boost::signals2::scoped_connection m_connection; + btcsignals::scoped_connection m_connection; }; class EchoImpl : public interfaces::Echo @@ -44,7 +44,7 @@ std::unique_ptr MakeCleanupHandler(std::function cleanup) return std::make_unique(std::move(cleanup)); } -std::unique_ptr MakeSignalHandler(boost::signals2::connection connection) +std::unique_ptr MakeSignalHandler(btcsignals::connection connection) { return std::make_unique(std::move(connection)); } diff --git a/src/interfaces/handler.h b/src/interfaces/handler.h index 5de131ee98e..09c2363891f 100644 --- a/src/interfaces/handler.h +++ b/src/interfaces/handler.h @@ -24,8 +24,8 @@ public: virtual void disconnect() = 0; }; -//! Return handler wrapping a boost signal connection. -std::unique_ptr MakeSignalHandler(boost::signals2::connection connection); +//! Return handler wrapping a btcsignals connection. +std::unique_ptr MakeSignalHandler(btcsignals::connection connection); //! Return handler wrapping a cleanup function. std::unique_ptr MakeCleanupHandler(std::function cleanup); diff --git a/src/node/interface_ui.cpp b/src/node/interface_ui.cpp index 525d341e717..6b1fe72fae4 100644 --- a/src/node/interface_ui.cpp +++ b/src/node/interface_ui.cpp @@ -13,22 +13,22 @@ using util::MakeUnorderedList; CClientUIInterface uiInterface; struct UISignals { - boost::signals2::signal> ThreadSafeMessageBox; - boost::signals2::signal> ThreadSafeQuestion; - boost::signals2::signal InitMessage; - boost::signals2::signal InitWallet; - boost::signals2::signal NotifyNumConnectionsChanged; - boost::signals2::signal NotifyNetworkActiveChanged; - boost::signals2::signal NotifyAlertChanged; - boost::signals2::signal ShowProgress; - boost::signals2::signal NotifyBlockTip; - boost::signals2::signal NotifyHeaderTip; - boost::signals2::signal BannedListChanged; + btcsignals::signal> ThreadSafeMessageBox; + btcsignals::signal> ThreadSafeQuestion; + btcsignals::signal InitMessage; + btcsignals::signal InitWallet; + btcsignals::signal NotifyNumConnectionsChanged; + btcsignals::signal NotifyNetworkActiveChanged; + btcsignals::signal NotifyAlertChanged; + btcsignals::signal ShowProgress; + btcsignals::signal NotifyBlockTip; + btcsignals::signal NotifyHeaderTip; + btcsignals::signal BannedListChanged; }; static UISignals g_ui_signals; #define ADD_SIGNALS_IMPL_WRAPPER(signal_name) \ - boost::signals2::connection CClientUIInterface::signal_name##_connect(std::function fn) \ + btcsignals::connection CClientUIInterface::signal_name##_connect(std::function fn) \ { \ return g_ui_signals.signal_name.connect(fn); \ } diff --git a/src/node/interface_ui.h b/src/node/interface_ui.h index 8c90bdf4fef..c33df59a93a 100644 --- a/src/node/interface_ui.h +++ b/src/node/interface_ui.h @@ -67,7 +67,7 @@ public: #define ADD_SIGNALS_DECL_WRAPPER(signal_name, rtype, ...) \ rtype signal_name(__VA_ARGS__); \ using signal_name##Sig = rtype(__VA_ARGS__); \ - boost::signals2::connection signal_name##_connect(std::function fn) + btcsignals::connection signal_name##_connect(std::function fn) /** Show message box. */ ADD_SIGNALS_DECL_WRAPPER(ThreadSafeMessageBox, bool, const bilingual_str& message, unsigned int style); diff --git a/src/noui.cpp b/src/noui.cpp index af04cb00823..6f33b22728d 100644 --- a/src/noui.cpp +++ b/src/noui.cpp @@ -13,9 +13,9 @@ #include /** Store connections so we can disconnect them when suppressing output */ -boost::signals2::connection noui_ThreadSafeMessageBoxConn; -boost::signals2::connection noui_ThreadSafeQuestionConn; -boost::signals2::connection noui_InitMessageConn; +btcsignals::connection noui_ThreadSafeMessageBoxConn; +btcsignals::connection noui_ThreadSafeQuestionConn; +btcsignals::connection noui_InitMessageConn; bool noui_ThreadSafeMessageBox(const bilingual_str& message, unsigned int style) { diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index cb236bd7209..0b89c605b9c 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -485,9 +485,9 @@ int GuiMain(int argc, char* argv[]) util::ThreadSetInternalName("main"); // Subscribe to global signals from core - boost::signals2::scoped_connection handler_message_box = ::uiInterface.ThreadSafeMessageBox_connect(noui_ThreadSafeMessageBox); - boost::signals2::scoped_connection handler_question = ::uiInterface.ThreadSafeQuestion_connect(noui_ThreadSafeQuestion); - boost::signals2::scoped_connection handler_init_message = ::uiInterface.InitMessage_connect(noui_InitMessage); + btcsignals::scoped_connection handler_message_box = ::uiInterface.ThreadSafeMessageBox_connect(noui_ThreadSafeMessageBox); + btcsignals::scoped_connection handler_question = ::uiInterface.ThreadSafeQuestion_connect(noui_ThreadSafeQuestion); + btcsignals::scoped_connection handler_init_message = ::uiInterface.InitMessage_connect(noui_InitMessage); // Do not refer to data directory yet, this can be overridden by Intro::pickDataDirectory diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp index b62b2a3b82f..4369a078be2 100644 --- a/src/qt/test/wallettests.cpp +++ b/src/qt/test/wallettests.cpp @@ -87,7 +87,7 @@ Txid SendCoins(CWallet& wallet, SendCoinsDialog& sendCoinsDialog, const CTxDesti ->findChild("optInRBF") ->setCheckState(rbf ? Qt::Checked : Qt::Unchecked); Txid txid; - boost::signals2::scoped_connection c(wallet.NotifyTransactionChanged.connect([&txid](const Txid& hash, ChangeType status) { + btcsignals::scoped_connection c(wallet.NotifyTransactionChanged.connect([&txid](const Txid& hash, ChangeType status) { if (status == CT_NEW) txid = hash; })); ConfirmSend(/*text=*/nullptr, confirm_type); diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h index 8647ae48943..f6eb9cd3ed5 100644 --- a/src/wallet/scriptpubkeyman.h +++ b/src/wallet/scriptpubkeyman.h @@ -155,10 +155,10 @@ public: }; /** Keypool has new keys */ - boost::signals2::signal NotifyCanGetAddressesChanged; + btcsignals::signal NotifyCanGetAddressesChanged; /** Birth time changed */ - boost::signals2::signal NotifyFirstKeyTimeChanged; + btcsignals::signal NotifyFirstKeyTimeChanged; }; /** OutputTypes supported by the LegacyScriptPubKeyMan */ diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index a46a6455552..7d14ecff25d 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -826,13 +826,13 @@ public: void Close(); /** Wallet is about to be unloaded */ - boost::signals2::signal NotifyUnload; + btcsignals::signal NotifyUnload; /** * Address book entry changed. * @note called without lock cs_wallet held. */ - boost::signals2::signal NotifyAddressBookChanged; @@ -841,19 +841,19 @@ public: * Wallet transaction added, removed or updated. * @note called with lock cs_wallet held. */ - boost::signals2::signal NotifyTransactionChanged; + btcsignals::signal NotifyTransactionChanged; /** Show progress e.g. for rescan */ - boost::signals2::signal ShowProgress; + btcsignals::signal ShowProgress; /** Keypool has new keys */ - boost::signals2::signal NotifyCanGetAddressesChanged; + btcsignals::signal NotifyCanGetAddressesChanged; /** * Wallet status (encrypted, locked) changed. * Note: Called without locks held. */ - boost::signals2::signal NotifyStatusChanged; + btcsignals::signal NotifyStatusChanged; /** Inquire whether this wallet broadcasts transactions. */ bool GetBroadcastTransactions() const { return fBroadcastTransactions; }