diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -132,8 +132,8 @@ compat/glibcxx_sanity.cpp compat/strnlen.cpp fs.cpp - interface/handler.cpp - interface/node.cpp + interfaces/handler.cpp + interfaces/node.cpp logging.cpp random.cpp rcu.cpp diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am @@ -141,8 +141,8 @@ httpserver.h \ indirectmap.h \ init.h \ - interface/handler.h \ - interface/node.h \ + interfaces/handler.h \ + interfaces/node.h \ key.h \ keystore.h \ dbwrapper.h \ @@ -432,8 +432,8 @@ compat/glibcxx_sanity.cpp \ compat/strnlen.cpp \ fs.cpp \ - interface/handler.cpp \ - interface/node.cpp \ + interfaces/handler.cpp \ + interfaces/node.cpp \ logging.cpp \ random.cpp \ rcu.cpp \ diff --git a/src/interface/handler.h b/src/interfaces/handler.h rename from src/interface/handler.h rename to src/interfaces/handler.h --- a/src/interface/handler.h +++ b/src/interfaces/handler.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_INTERFACE_HANDLER_H -#define BITCOIN_INTERFACE_HANDLER_H +#ifndef BITCOIN_INTERFACES_HANDLER_H +#define BITCOIN_INTERFACES_HANDLER_H #include @@ -13,7 +13,7 @@ } // namespace signals2 } // namespace boost -namespace interface { +namespace interfaces { //! Generic interface for managing an event handler or callback function //! registered with another interface. Has a single disconnect method to cancel @@ -29,6 +29,6 @@ //! Return handler wrapping a boost signal connection. std::unique_ptr MakeHandler(boost::signals2::connection connection); -} // namespace interface +} // namespace interfaces -#endif // BITCOIN_INTERFACE_HANDLER_H +#endif // BITCOIN_INTERFACES_HANDLER_H diff --git a/src/interface/handler.cpp b/src/interfaces/handler.cpp rename from src/interface/handler.cpp rename to src/interfaces/handler.cpp --- a/src/interface/handler.cpp +++ b/src/interfaces/handler.cpp @@ -2,7 +2,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include +#include #include @@ -10,7 +10,7 @@ #include #include -namespace interface { +namespace interfaces { namespace { class HandlerImpl : public Handler { @@ -29,4 +29,4 @@ return std::make_unique(std::move(connection)); } -} // namespace interface +} // namespace interfaces diff --git a/src/interface/node.h b/src/interfaces/node.h rename from src/interface/node.h rename to src/interfaces/node.h --- a/src/interface/node.h +++ b/src/interfaces/node.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_INTERFACE_NODE_H -#define BITCOIN_INTERFACE_NODE_H +#ifndef BITCOIN_INTERFACES_NODE_H +#define BITCOIN_INTERFACES_NODE_H #include // For Network @@ -16,7 +16,7 @@ class proxyType; class RPCServer; -namespace interface { +namespace interfaces { class Handler; @@ -93,6 +93,6 @@ //! Return implementation of Node interface. std::unique_ptr MakeNode(); -} // namespace interface +} // namespace interfaces -#endif // BITCOIN_INTERFACE_NODE_H +#endif // BITCOIN_INTERFACES_NODE_H diff --git a/src/interface/node.cpp b/src/interfaces/node.cpp rename from src/interface/node.cpp rename to src/interfaces/node.cpp --- a/src/interface/node.cpp +++ b/src/interfaces/node.cpp @@ -2,12 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include +#include #include #include #include -#include +#include #include #include #include @@ -20,7 +20,7 @@ class HTTPRPCRequestProcessor; -namespace interface { +namespace interfaces { namespace { class NodeImpl : public Node { @@ -89,4 +89,4 @@ return std::make_unique(); } -} // namespace interface +} // namespace interfaces diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -28,8 +28,8 @@ #endif #include "init.h" -#include "interface/handler.h" -#include "interface/node.h" +#include "interfaces/handler.h" +#include "interfaces/node.h" #include "rpc/server.h" #include "ui_interface.h" #include "uint256.h" @@ -175,7 +175,7 @@ class BitcoinABC : public QObject { Q_OBJECT public: - explicit BitcoinABC(interface::Node &node); + explicit BitcoinABC(interfaces::Node &node); public Q_SLOTS: void initialize(Config *config, @@ -191,14 +191,14 @@ /// Pass fatal exception message to UI thread void handleRunawayException(const std::exception *e); - interface::Node &m_node; + interfaces::Node &m_node; }; /** Main Bitcoin application object */ class BitcoinApplication : public QApplication { Q_OBJECT public: - explicit BitcoinApplication(interface::Node &node, int &argc, char **argv); + explicit BitcoinApplication(interfaces::Node &node, int &argc, char **argv); ~BitcoinApplication(); #ifdef ENABLE_WALLET @@ -242,7 +242,7 @@ private: QThread *coreThread; - interface::Node &m_node; + interfaces::Node &m_node; OptionsModel *optionsModel; ClientModel *clientModel; BitcoinGUI *window; @@ -260,7 +260,7 @@ #include "bitcoin.moc" -BitcoinABC::BitcoinABC(interface::Node &node) : QObject(), m_node(node) {} +BitcoinABC::BitcoinABC(interfaces::Node &node) : QObject(), m_node(node) {} void BitcoinABC::handleRunawayException(const std::exception *e) { PrintExceptionContinue(e, "Runaway exception"); @@ -294,7 +294,7 @@ } } -BitcoinApplication::BitcoinApplication(interface::Node &node, int &argc, +BitcoinApplication::BitcoinApplication(interfaces::Node &node, int &argc, char **argv) : QApplication(argc, argv), coreThread(0), m_node(node), optionsModel(0), clientModel(0), window(0), pollShutdownTimer(0), @@ -581,7 +581,7 @@ int main(int argc, char *argv[]) { SetupEnvironment(); - std::unique_ptr node = interface::MakeNode(); + std::unique_ptr node = interfaces::MakeNode(); /// 1. Parse command-line options. These take precedence over anything else. // Command-line options take precedence: @@ -750,7 +750,7 @@ app.createOptionsModel(gArgs.GetBoolArg("-resetguisettings", false)); // Subscribe to global signals from core - std::unique_ptr handler = + std::unique_ptr handler = node->handleInitMessage(InitMessage); // Get global config diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -36,7 +36,7 @@ class Config; class CWallet; -namespace interface { +namespace interfaces { class Handler; class Node; } @@ -59,7 +59,7 @@ public: static const std::string DEFAULT_UIPLATFORM; - explicit BitcoinGUI(interface::Node &node, const Config *, + explicit BitcoinGUI(interfaces::Node &node, const Config *, const PlatformStyle *platformStyle, const NetworkStyle *networkStyle, QWidget *parent = 0); ~BitcoinGUI(); @@ -91,9 +91,9 @@ bool eventFilter(QObject *object, QEvent *event) override; private: - interface::Node &m_node; - std::unique_ptr m_handler_message_box; - std::unique_ptr m_handler_question; + interfaces::Node &m_node; + std::unique_ptr m_handler_message_box; + std::unique_ptr m_handler_question; ClientModel *clientModel = nullptr; WalletFrame *walletFrame = nullptr; diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -34,8 +34,8 @@ #include "chainparams.h" #include "init.h" -#include "interface/handler.h" -#include "interface/node.h" +#include "interfaces/handler.h" +#include "interfaces/node.h" #include "ui_interface.h" #include "util.h" @@ -72,7 +72,7 @@ #endif ; -BitcoinGUI::BitcoinGUI(interface::Node &node, const Config *configIn, +BitcoinGUI::BitcoinGUI(interfaces::Node &node, const Config *configIn, const PlatformStyle *_platformStyle, const NetworkStyle *networkStyle, QWidget *parent) : QMainWindow(parent), enableWallet(false), m_node(node), diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h --- a/src/qt/optionsmodel.h +++ b/src/qt/optionsmodel.h @@ -9,7 +9,7 @@ #include -namespace interface { +namespace interfaces { class Node; } @@ -30,7 +30,7 @@ Q_OBJECT public: - explicit OptionsModel(interface::Node &node, QObject *parent = 0, + explicit OptionsModel(interfaces::Node &node, QObject *parent = 0, bool resetSettings = false); enum OptionID { @@ -85,7 +85,7 @@ bool isRestartRequired() const; private: - interface::Node &m_node; + interfaces::Node &m_node; /* Qt-only settings */ bool fHideTrayIcon; bool fMinimizeToTray; diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -12,7 +12,7 @@ #include "guiutil.h" #include "amount.h" -#include "interface/node.h" +#include "interfaces/node.h" #include "intro.h" #include "net.h" #include "netbase.h" @@ -25,7 +25,7 @@ const char *DEFAULT_GUI_PROXY_HOST = "127.0.0.1"; -OptionsModel::OptionsModel(interface::Node &node, QObject *parent, +OptionsModel::OptionsModel(interfaces::Node &node, QObject *parent, bool resetSettings) : QAbstractListModel(parent), m_node(node) { Init(resetSettings); diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp --- a/src/qt/test/paymentservertests.cpp +++ b/src/qt/test/paymentservertests.cpp @@ -8,7 +8,7 @@ #include "paymentrequestdata.h" #include "amount.h" -#include "interface/node.h" +#include "interfaces/node.h" #include "random.h" #include "script/script.h" #include "script/standard.h" @@ -65,7 +65,7 @@ void PaymentServerTests::paymentServerTests() { SelectParams(CBaseChainParams::MAIN); - auto node = interface::MakeNode(); + auto node = interfaces::MakeNode(); OptionsModel optionsModel(*node); PaymentServer *server = new PaymentServer(nullptr, false); X509_STORE *caStore = X509_STORE_new(); diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp --- a/src/qt/test/wallettests.cpp +++ b/src/qt/test/wallettests.cpp @@ -3,7 +3,7 @@ #include "chainparams.h" #include "config.h" #include "dstencode.h" -#include "interface/node.h" +#include "interfaces/node.h" #include "qt/bitcoinamountfield.h" #include "qt/optionsmodel.h" #include "qt/overviewpage.h" @@ -140,7 +140,7 @@ std::unique_ptr platformStyle( PlatformStyle::instantiate("other")); SendCoinsDialog sendCoinsDialog(platformStyle.get()); - auto node = interface::MakeNode(); + auto node = interfaces::MakeNode(); OptionsModel optionsModel(*node); WalletModel walletModel(platformStyle.get(), &wallet, &optionsModel); sendCoinsDialog.setModel(&walletModel);