diff options
author | Russell Yanofsky <russ@yanofsky.org> | 2018-08-23 13:42:31 -0400 |
---|---|---|
committer | Russell Yanofsky <russ@yanofsky.org> | 2020-08-26 05:52:31 -0400 |
commit | 102abff9eb6c267af64f2a3560712147d1896e13 (patch) | |
tree | c9501b6cc14050d044f50bbfc45d668370679be0 /src/qt/bitcoin.h | |
parent | 91aced7c7e6e75c1f5896b7e3843015177f32748 (diff) |
gui: Replace interface::Node references with pointers
No change in behavior. Replacing references with pointers allows Node interface
creation to be delayed until later during gui startup next commit to support
implementing -ipcconnect option
Diffstat (limited to 'src/qt/bitcoin.h')
-rw-r--r-- | src/qt/bitcoin.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/qt/bitcoin.h b/src/qt/bitcoin.h index 20c6dfc047..69e0a5921e 100644 --- a/src/qt/bitcoin.h +++ b/src/qt/bitcoin.h @@ -10,6 +10,7 @@ #endif #include <QApplication> +#include <assert.h> #include <memory> #include <interfaces/node.h> @@ -20,6 +21,7 @@ class NetworkStyle; class OptionsModel; class PaymentServer; class PlatformStyle; +class SplashScreen; class WalletController; class WalletModel; @@ -54,7 +56,7 @@ class BitcoinApplication: public QApplication { Q_OBJECT public: - explicit BitcoinApplication(interfaces::Node& node); + explicit BitcoinApplication(); ~BitcoinApplication(); #ifdef ENABLE_WALLET @@ -88,6 +90,9 @@ public: /// Setup platform style void setupPlatformStyle(); + interfaces::Node& node() const { assert(m_node); return *m_node; } + void setNode(interfaces::Node& node); + public Q_SLOTS: void initializeResult(bool success, interfaces::BlockAndHeaderTipInfo tip_info); void shutdownResult(); @@ -102,7 +107,6 @@ Q_SIGNALS: private: QThread *coreThread; - interfaces::Node& m_node; OptionsModel *optionsModel; ClientModel *clientModel; BitcoinGUI *window; @@ -114,6 +118,8 @@ private: int returnValue; const PlatformStyle *platformStyle; std::unique_ptr<QWidget> shutdownWindow; + SplashScreen* m_splash = nullptr; + interfaces::Node* m_node = nullptr; void startThread(); }; |