From cccc2784a3bb10fa8e43be7e68207cafb12bd915 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Fri, 19 Jun 2020 18:14:17 -0400 Subject: scripted-diff: Move ui_interface to the node lib -BEGIN VERIFY SCRIPT- # Move files git mv src/ui_interface.h src/node/ui_interface.h git mv src/ui_interface.cpp src/node/ui_interface.cpp sed -i -e 's/BITCOIN_UI_INTERFACE_H/BITCOIN_NODE_UI_INTERFACE_H/g' src/node/ui_interface.h # Adjust includes and makefile sed -i -e 's|ui_interface|node/ui_interface|g' $(git grep -l ui_interface) # Sort includes git diff -U0 | clang-format-diff -p1 -i -v -END VERIFY SCRIPT- --- src/ui_interface.cpp | 65 ---------------------------------------------------- 1 file changed, 65 deletions(-) delete mode 100644 src/ui_interface.cpp (limited to 'src/ui_interface.cpp') diff --git a/src/ui_interface.cpp b/src/ui_interface.cpp deleted file mode 100644 index 15795bd67..000000000 --- a/src/ui_interface.cpp +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright (c) 2010-2020 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 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(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); } -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); } -void CClientUIInterface::InitMessage(const std::string& message) { return g_ui_signals.InitMessage(message); } -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); -} -- cgit v1.2.3