From 018d70b58726b361b6951e0e6de04f13eb97a89d Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Tue, 14 Jun 2022 10:38:51 +0200 Subject: scripted-diff: Avoid incompatibility with CMake AUTOUIC feature -BEGIN VERIFY SCRIPT- sed -i "s|node/ui_interface|node/interface_ui|g" $(git grep -l "node/ui_interface" ./src) git mv src/node/ui_interface.cpp src/node/interface_ui.cpp git mv src/node/ui_interface.h src/node/interface_ui.h sed -i "s|BITCOIN_NODE_UI_INTERFACE_H|BITCOIN_NODE_INTERFACE_UI_H|g" src/node/interface_ui.h -END VERIFY SCRIPT- --- src/Makefile.am | 6 +-- src/banman.cpp | 2 +- src/bitcoind.cpp | 2 +- src/httpserver.cpp | 2 +- src/index/base.cpp | 2 +- src/init.cpp | 2 +- src/init/common.cpp | 2 +- src/net.cpp | 2 +- src/node/interface_ui.cpp | 68 +++++++++++++++++++++++++ src/node/interface_ui.h | 123 +++++++++++++++++++++++++++++++++++++++++++++ src/node/interfaces.cpp | 2 +- src/node/ui_interface.cpp | 68 ------------------------- src/node/ui_interface.h | 123 --------------------------------------------- src/noui.cpp | 2 +- src/qt/bitcoin.cpp | 2 +- src/qt/bitcoingui.cpp | 2 +- src/qt/paymentserver.cpp | 2 +- src/qt/sendcoinsdialog.cpp | 2 +- src/qt/transactionview.cpp | 2 +- src/qt/walletframe.cpp | 2 +- src/qt/walletmodel.cpp | 2 +- src/qt/walletview.cpp | 2 +- src/shutdown.cpp | 2 +- src/timedata.cpp | 2 +- src/validation.cpp | 2 +- src/wallet/init.cpp | 2 +- 26 files changed, 215 insertions(+), 215 deletions(-) create mode 100644 src/node/interface_ui.cpp create mode 100644 src/node/interface_ui.h delete mode 100644 src/node/ui_interface.cpp delete mode 100644 src/node/ui_interface.h (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 89329f5f69..f90c14bab8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -198,7 +198,7 @@ BITCOIN_CORE_H = \ node/minisketchwrapper.h \ node/psbt.h \ node/transaction.h \ - node/ui_interface.h \ + node/interface_ui.h \ node/utxo_snapshot.h \ noui.h \ outputtype.h \ @@ -375,7 +375,7 @@ libbitcoin_node_a_SOURCES = \ node/minisketchwrapper.cpp \ node/psbt.cpp \ node/transaction.cpp \ - node/ui_interface.cpp \ + node/interface_ui.cpp \ noui.cpp \ policy/fees.cpp \ policy/packages.cpp \ @@ -877,7 +877,7 @@ libbitcoinkernel_la_SOURCES = \ logging.cpp \ node/blockstorage.cpp \ node/chainstate.cpp \ - node/ui_interface.cpp \ + node/interface_ui.cpp \ policy/feerate.cpp \ policy/fees.cpp \ policy/packages.cpp \ diff --git a/src/banman.cpp b/src/banman.cpp index 2a6e0e010f..508383d9f2 100644 --- a/src/banman.cpp +++ b/src/banman.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 227bc47793..be894e192e 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/httpserver.cpp b/src/httpserver.cpp index 44937dc523..d1d2046ba4 100644 --- a/src/httpserver.cpp +++ b/src/httpserver.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include // For HTTP status codes #include #include diff --git a/src/index/base.cpp b/src/index/base.cpp index 9f0c1dea24..323547900d 100644 --- a/src/index/base.cpp +++ b/src/index/base.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/init.cpp b/src/init.cpp index f6e6f7cf43..75297d54ea 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/init/common.cpp b/src/init/common.cpp index d4e45454d2..a0cdf44f47 100644 --- a/src/init/common.cpp +++ b/src/init/common.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/net.cpp b/src/net.cpp index 0cdf98c40f..d0c95dafb4 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/node/interface_ui.cpp b/src/node/interface_ui.cpp new file mode 100644 index 0000000000..370cde84f8 --- /dev/null +++ b/src/node/interface_ui.cpp @@ -0,0 +1,68 @@ +// Copyright (c) 2010-2021 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#include + +#include + +#include +#include + +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; +}; +static UISignals g_ui_signals; + +#define ADD_SIGNALS_IMPL_WRAPPER(signal_name) \ + boost::signals2::connection CClientUIInterface::signal_name##_connect(std::function fn) \ + { \ + return g_ui_signals.signal_name.connect(fn); \ + } + +ADD_SIGNALS_IMPL_WRAPPER(ThreadSafeMessageBox); +ADD_SIGNALS_IMPL_WRAPPER(ThreadSafeQuestion); +ADD_SIGNALS_IMPL_WRAPPER(InitMessage); +ADD_SIGNALS_IMPL_WRAPPER(InitWallet); +ADD_SIGNALS_IMPL_WRAPPER(NotifyNumConnectionsChanged); +ADD_SIGNALS_IMPL_WRAPPER(NotifyNetworkActiveChanged); +ADD_SIGNALS_IMPL_WRAPPER(NotifyAlertChanged); +ADD_SIGNALS_IMPL_WRAPPER(ShowProgress); +ADD_SIGNALS_IMPL_WRAPPER(NotifyBlockTip); +ADD_SIGNALS_IMPL_WRAPPER(NotifyHeaderTip); +ADD_SIGNALS_IMPL_WRAPPER(BannedListChanged); + +bool CClientUIInterface::ThreadSafeMessageBox(const bilingual_str& message, const std::string& caption, unsigned int style) { return g_ui_signals.ThreadSafeMessageBox(message, caption, style).value_or(false);} +bool CClientUIInterface::ThreadSafeQuestion(const bilingual_str& message, const std::string& non_interactive_message, const std::string& caption, unsigned int style) { return g_ui_signals.ThreadSafeQuestion(message, non_interactive_message, caption, style).value_or(false);} +void CClientUIInterface::InitMessage(const std::string& message) { return g_ui_signals.InitMessage(message); } +void CClientUIInterface::InitWallet() { return g_ui_signals.InitWallet(); } +void CClientUIInterface::NotifyNumConnectionsChanged(int newNumConnections) { return g_ui_signals.NotifyNumConnectionsChanged(newNumConnections); } +void CClientUIInterface::NotifyNetworkActiveChanged(bool networkActive) { return g_ui_signals.NotifyNetworkActiveChanged(networkActive); } +void CClientUIInterface::NotifyAlertChanged() { return g_ui_signals.NotifyAlertChanged(); } +void CClientUIInterface::ShowProgress(const std::string& title, int nProgress, bool resume_possible) { return g_ui_signals.ShowProgress(title, nProgress, resume_possible); } +void CClientUIInterface::NotifyBlockTip(SynchronizationState s, const CBlockIndex* i) { return g_ui_signals.NotifyBlockTip(s, i); } +void CClientUIInterface::NotifyHeaderTip(SynchronizationState s, const CBlockIndex* i) { return g_ui_signals.NotifyHeaderTip(s, i); } +void CClientUIInterface::BannedListChanged() { return g_ui_signals.BannedListChanged(); } + +bool InitError(const bilingual_str& str) +{ + uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_ERROR); + return false; +} + +void InitWarning(const bilingual_str& str) +{ + uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_WARNING); +} diff --git a/src/node/interface_ui.h b/src/node/interface_ui.h new file mode 100644 index 0000000000..37c0f6392b --- /dev/null +++ b/src/node/interface_ui.h @@ -0,0 +1,123 @@ +// Copyright (c) 2010 Satoshi Nakamoto +// Copyright (c) 2012-2021 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#ifndef BITCOIN_NODE_INTERFACE_UI_H +#define BITCOIN_NODE_INTERFACE_UI_H + +#include +#include +#include + +class CBlockIndex; +enum class SynchronizationState; +struct bilingual_str; + +namespace boost { +namespace signals2 { +class connection; +} +} // namespace boost + +/** Signals for UI communication. */ +class CClientUIInterface +{ +public: + /** Flags for CClientUIInterface::ThreadSafeMessageBox */ + enum MessageBoxFlags : uint32_t { + ICON_INFORMATION = 0, + ICON_WARNING = (1U << 0), + ICON_ERROR = (1U << 1), + /** + * Mask of all available icons in CClientUIInterface::MessageBoxFlags + * This needs to be updated, when icons are changed there! + */ + ICON_MASK = (ICON_INFORMATION | ICON_WARNING | ICON_ERROR), + + /** These values are taken from qmessagebox.h "enum StandardButton" to be directly usable */ + BTN_OK = 0x00000400U, // QMessageBox::Ok + BTN_YES = 0x00004000U, // QMessageBox::Yes + BTN_NO = 0x00010000U, // QMessageBox::No + BTN_ABORT = 0x00040000U, // QMessageBox::Abort + BTN_RETRY = 0x00080000U, // QMessageBox::Retry + BTN_IGNORE = 0x00100000U, // QMessageBox::Ignore + BTN_CLOSE = 0x00200000U, // QMessageBox::Close + BTN_CANCEL = 0x00400000U, // QMessageBox::Cancel + BTN_DISCARD = 0x00800000U, // QMessageBox::Discard + BTN_HELP = 0x01000000U, // QMessageBox::Help + BTN_APPLY = 0x02000000U, // QMessageBox::Apply + BTN_RESET = 0x04000000U, // QMessageBox::Reset + /** + * Mask of all available buttons in CClientUIInterface::MessageBoxFlags + * This needs to be updated, when buttons are changed there! + */ + BTN_MASK = (BTN_OK | BTN_YES | BTN_NO | BTN_ABORT | BTN_RETRY | BTN_IGNORE | + BTN_CLOSE | BTN_CANCEL | BTN_DISCARD | BTN_HELP | BTN_APPLY | BTN_RESET), + + /** Force blocking, modal message box dialog (not just OS notification) */ + MODAL = 0x10000000U, + + /** Do not print contents of message to debug log */ + SECURE = 0x40000000U, + + /** Predefined combinations for certain default usage cases */ + MSG_INFORMATION = ICON_INFORMATION, + MSG_WARNING = (ICON_WARNING | BTN_OK | MODAL), + MSG_ERROR = (ICON_ERROR | BTN_OK | MODAL) + }; + +#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); + + /** Show message box. */ + ADD_SIGNALS_DECL_WRAPPER(ThreadSafeMessageBox, bool, const bilingual_str& message, const std::string& caption, unsigned int style); + + /** If possible, ask the user a question. If not, falls back to ThreadSafeMessageBox(noninteractive_message, caption, style) and returns false. */ + ADD_SIGNALS_DECL_WRAPPER(ThreadSafeQuestion, bool, const bilingual_str& message, const std::string& noninteractive_message, const std::string& caption, unsigned int style); + + /** Progress message during initialization. */ + ADD_SIGNALS_DECL_WRAPPER(InitMessage, void, const std::string& message); + + /** Wallet loader created. */ + ADD_SIGNALS_DECL_WRAPPER(InitWallet, void, ); + + /** Number of network connections changed. */ + ADD_SIGNALS_DECL_WRAPPER(NotifyNumConnectionsChanged, void, int newNumConnections); + + /** Network activity state changed. */ + ADD_SIGNALS_DECL_WRAPPER(NotifyNetworkActiveChanged, void, bool networkActive); + + /** + * Status bar alerts changed. + */ + ADD_SIGNALS_DECL_WRAPPER(NotifyAlertChanged, void, ); + + /** + * Show progress e.g. for verifychain. + * resume_possible indicates shutting down now will result in the current progress action resuming upon restart. + */ + ADD_SIGNALS_DECL_WRAPPER(ShowProgress, void, const std::string& title, int nProgress, bool resume_possible); + + /** New block has been accepted */ + ADD_SIGNALS_DECL_WRAPPER(NotifyBlockTip, void, SynchronizationState, const CBlockIndex*); + + /** Best header has changed */ + ADD_SIGNALS_DECL_WRAPPER(NotifyHeaderTip, void, SynchronizationState, const CBlockIndex*); + + /** Banlist did change. */ + ADD_SIGNALS_DECL_WRAPPER(BannedListChanged, void, void); +}; + +/** Show warning message **/ +void InitWarning(const bilingual_str& str); + +/** Show error message **/ +bool InitError(const bilingual_str& str); +constexpr auto AbortError = InitError; + +extern CClientUIInterface uiInterface; + +#endif // BITCOIN_NODE_INTERFACE_UI_H diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp index 7752fb0f65..1905a4df29 100644 --- a/src/node/interfaces.cpp +++ b/src/node/interfaces.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/node/ui_interface.cpp b/src/node/ui_interface.cpp deleted file mode 100644 index a3a6ede39a..0000000000 --- a/src/node/ui_interface.cpp +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright (c) 2010-2021 The Bitcoin Core developers -// Distributed under the MIT software license, see the accompanying -// file COPYING or http://www.opensource.org/licenses/mit-license.php. - -#include - -#include - -#include -#include - -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; -}; -static UISignals g_ui_signals; - -#define ADD_SIGNALS_IMPL_WRAPPER(signal_name) \ - boost::signals2::connection CClientUIInterface::signal_name##_connect(std::function fn) \ - { \ - return g_ui_signals.signal_name.connect(fn); \ - } - -ADD_SIGNALS_IMPL_WRAPPER(ThreadSafeMessageBox); -ADD_SIGNALS_IMPL_WRAPPER(ThreadSafeQuestion); -ADD_SIGNALS_IMPL_WRAPPER(InitMessage); -ADD_SIGNALS_IMPL_WRAPPER(InitWallet); -ADD_SIGNALS_IMPL_WRAPPER(NotifyNumConnectionsChanged); -ADD_SIGNALS_IMPL_WRAPPER(NotifyNetworkActiveChanged); -ADD_SIGNALS_IMPL_WRAPPER(NotifyAlertChanged); -ADD_SIGNALS_IMPL_WRAPPER(ShowProgress); -ADD_SIGNALS_IMPL_WRAPPER(NotifyBlockTip); -ADD_SIGNALS_IMPL_WRAPPER(NotifyHeaderTip); -ADD_SIGNALS_IMPL_WRAPPER(BannedListChanged); - -bool CClientUIInterface::ThreadSafeMessageBox(const bilingual_str& message, const std::string& caption, unsigned int style) { return g_ui_signals.ThreadSafeMessageBox(message, caption, style).value_or(false);} -bool CClientUIInterface::ThreadSafeQuestion(const bilingual_str& message, const std::string& non_interactive_message, const std::string& caption, unsigned int style) { return g_ui_signals.ThreadSafeQuestion(message, non_interactive_message, caption, style).value_or(false);} -void CClientUIInterface::InitMessage(const std::string& message) { return g_ui_signals.InitMessage(message); } -void CClientUIInterface::InitWallet() { return g_ui_signals.InitWallet(); } -void CClientUIInterface::NotifyNumConnectionsChanged(int newNumConnections) { return g_ui_signals.NotifyNumConnectionsChanged(newNumConnections); } -void CClientUIInterface::NotifyNetworkActiveChanged(bool networkActive) { return g_ui_signals.NotifyNetworkActiveChanged(networkActive); } -void CClientUIInterface::NotifyAlertChanged() { return g_ui_signals.NotifyAlertChanged(); } -void CClientUIInterface::ShowProgress(const std::string& title, int nProgress, bool resume_possible) { return g_ui_signals.ShowProgress(title, nProgress, resume_possible); } -void CClientUIInterface::NotifyBlockTip(SynchronizationState s, const CBlockIndex* i) { return g_ui_signals.NotifyBlockTip(s, i); } -void CClientUIInterface::NotifyHeaderTip(SynchronizationState s, const CBlockIndex* i) { return g_ui_signals.NotifyHeaderTip(s, i); } -void CClientUIInterface::BannedListChanged() { return g_ui_signals.BannedListChanged(); } - -bool InitError(const bilingual_str& str) -{ - uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_ERROR); - return false; -} - -void InitWarning(const bilingual_str& str) -{ - uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_WARNING); -} diff --git a/src/node/ui_interface.h b/src/node/ui_interface.h deleted file mode 100644 index d02238b549..0000000000 --- a/src/node/ui_interface.h +++ /dev/null @@ -1,123 +0,0 @@ -// Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2012-2021 The Bitcoin Core developers -// Distributed under the MIT software license, see the accompanying -// file COPYING or http://www.opensource.org/licenses/mit-license.php. - -#ifndef BITCOIN_NODE_UI_INTERFACE_H -#define BITCOIN_NODE_UI_INTERFACE_H - -#include -#include -#include - -class CBlockIndex; -enum class SynchronizationState; -struct bilingual_str; - -namespace boost { -namespace signals2 { -class connection; -} -} // namespace boost - -/** Signals for UI communication. */ -class CClientUIInterface -{ -public: - /** Flags for CClientUIInterface::ThreadSafeMessageBox */ - enum MessageBoxFlags : uint32_t { - ICON_INFORMATION = 0, - ICON_WARNING = (1U << 0), - ICON_ERROR = (1U << 1), - /** - * Mask of all available icons in CClientUIInterface::MessageBoxFlags - * This needs to be updated, when icons are changed there! - */ - ICON_MASK = (ICON_INFORMATION | ICON_WARNING | ICON_ERROR), - - /** These values are taken from qmessagebox.h "enum StandardButton" to be directly usable */ - BTN_OK = 0x00000400U, // QMessageBox::Ok - BTN_YES = 0x00004000U, // QMessageBox::Yes - BTN_NO = 0x00010000U, // QMessageBox::No - BTN_ABORT = 0x00040000U, // QMessageBox::Abort - BTN_RETRY = 0x00080000U, // QMessageBox::Retry - BTN_IGNORE = 0x00100000U, // QMessageBox::Ignore - BTN_CLOSE = 0x00200000U, // QMessageBox::Close - BTN_CANCEL = 0x00400000U, // QMessageBox::Cancel - BTN_DISCARD = 0x00800000U, // QMessageBox::Discard - BTN_HELP = 0x01000000U, // QMessageBox::Help - BTN_APPLY = 0x02000000U, // QMessageBox::Apply - BTN_RESET = 0x04000000U, // QMessageBox::Reset - /** - * Mask of all available buttons in CClientUIInterface::MessageBoxFlags - * This needs to be updated, when buttons are changed there! - */ - BTN_MASK = (BTN_OK | BTN_YES | BTN_NO | BTN_ABORT | BTN_RETRY | BTN_IGNORE | - BTN_CLOSE | BTN_CANCEL | BTN_DISCARD | BTN_HELP | BTN_APPLY | BTN_RESET), - - /** Force blocking, modal message box dialog (not just OS notification) */ - MODAL = 0x10000000U, - - /** Do not print contents of message to debug log */ - SECURE = 0x40000000U, - - /** Predefined combinations for certain default usage cases */ - MSG_INFORMATION = ICON_INFORMATION, - MSG_WARNING = (ICON_WARNING | BTN_OK | MODAL), - MSG_ERROR = (ICON_ERROR | BTN_OK | MODAL) - }; - -#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); - - /** Show message box. */ - ADD_SIGNALS_DECL_WRAPPER(ThreadSafeMessageBox, bool, const bilingual_str& message, const std::string& caption, unsigned int style); - - /** If possible, ask the user a question. If not, falls back to ThreadSafeMessageBox(noninteractive_message, caption, style) and returns false. */ - ADD_SIGNALS_DECL_WRAPPER(ThreadSafeQuestion, bool, const bilingual_str& message, const std::string& noninteractive_message, const std::string& caption, unsigned int style); - - /** Progress message during initialization. */ - ADD_SIGNALS_DECL_WRAPPER(InitMessage, void, const std::string& message); - - /** Wallet loader created. */ - ADD_SIGNALS_DECL_WRAPPER(InitWallet, void, ); - - /** Number of network connections changed. */ - ADD_SIGNALS_DECL_WRAPPER(NotifyNumConnectionsChanged, void, int newNumConnections); - - /** Network activity state changed. */ - ADD_SIGNALS_DECL_WRAPPER(NotifyNetworkActiveChanged, void, bool networkActive); - - /** - * Status bar alerts changed. - */ - ADD_SIGNALS_DECL_WRAPPER(NotifyAlertChanged, void, ); - - /** - * Show progress e.g. for verifychain. - * resume_possible indicates shutting down now will result in the current progress action resuming upon restart. - */ - ADD_SIGNALS_DECL_WRAPPER(ShowProgress, void, const std::string& title, int nProgress, bool resume_possible); - - /** New block has been accepted */ - ADD_SIGNALS_DECL_WRAPPER(NotifyBlockTip, void, SynchronizationState, const CBlockIndex*); - - /** Best header has changed */ - ADD_SIGNALS_DECL_WRAPPER(NotifyHeaderTip, void, SynchronizationState, const CBlockIndex*); - - /** Banlist did change. */ - ADD_SIGNALS_DECL_WRAPPER(BannedListChanged, void, void); -}; - -/** Show warning message **/ -void InitWarning(const bilingual_str& str); - -/** Show error message **/ -bool InitError(const bilingual_str& str); -constexpr auto AbortError = InitError; - -extern CClientUIInterface uiInterface; - -#endif // BITCOIN_NODE_UI_INTERFACE_H diff --git a/src/noui.cpp b/src/noui.cpp index 6fe5c5638c..54cb5f3cbf 100644 --- a/src/noui.cpp +++ b/src/noui.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index bd6a1f5eca..f11ddad30f 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index bfcdf6f316..6fea8e1cba 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index be6f604932..9f87c15c94 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 61d2782222..bd44d12781 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp index 47f3ba7e7f..b7432a0d77 100644 --- a/src/qt/transactionview.cpp +++ b/src/qt/transactionview.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp index 11bea85b21..6b38e207d3 100644 --- a/src/qt/walletframe.cpp +++ b/src/qt/walletframe.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 454c9a05d0..ab4d1cae3f 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include // for GetBoolArg #include diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp index 2f92c57607..10fc0fb6d0 100644 --- a/src/qt/walletview.cpp +++ b/src/qt/walletview.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/src/shutdown.cpp b/src/shutdown.cpp index fdf726b5f1..1dbc55aeb5 100644 --- a/src/shutdown.cpp +++ b/src/shutdown.cpp @@ -10,7 +10,7 @@ #endif #include -#include +#include #include #include diff --git a/src/timedata.cpp b/src/timedata.cpp index d0ca609a48..ceee08e68c 100644 --- a/src/timedata.cpp +++ b/src/timedata.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/validation.cpp b/src/validation.cpp index 1a8f501863..26ce286c63 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp index 7f038eda84..174c68744c 100644 --- a/src/wallet/init.cpp +++ b/src/wallet/init.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include -- cgit v1.2.3