diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-05-24 10:36:52 +0200 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-05-24 10:48:27 +0200 |
| commit | 136863443300752e7a5b5b4e7b20219bd932ace3 (patch) | |
| tree | 1ab62ac8c6f8a2b126482fba1286ab0b6a807d06 /src/qt/optionsmodel.h | |
| parent | aa5cd3cc6d47e8c372cbdc5b05dab717fed828c8 (diff) | |
| parent | 31122aa979c4c9a40e276cfc44243420c367ba4f (diff) | |
Merge bitcoin-core/gui#601: refactor: Pass interfaces::Node references to OptionsModel constructor
31122aa979c4c9a40e276cfc44243420c367ba4f refactor: Pass interfaces::Node references to OptionsModel constructor (Ryan Ofsky)
Pull request description:
Giving OptionsModel access to the node interface is needed as part of #602 to get bitcoind and bitcoin-qt to use the same settings instead of different settings.
It has been split off from #602 to simplify that PR. Previously these commits were part of bitcoin/bitcoin#15936 and also had some review discussion there.
ACKs for top commit:
promag:
Code review ACK 31122aa979c4c9a40e276cfc44243420c367ba4f.
furszy:
Code ACK 31122aa9
jarolrod:
ACK 31122aa979c4c9a40e276cfc44243420c367ba4f
Tree-SHA512: b8529322fd7ba97e19864129e6cf5f9acc58c124f2e5a7c50aca15772c8549de3c24e8b0c27e8cf2c06fd26529e9cdb898b0788a1de3cbfdfbdd3f85c9f0fe69
Diffstat (limited to 'src/qt/optionsmodel.h')
| -rw-r--r-- | src/qt/optionsmodel.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h index 396c2b7f16..92f80ecf21 100644 --- a/src/qt/optionsmodel.h +++ b/src/qt/optionsmodel.h @@ -41,7 +41,7 @@ class OptionsModel : public QAbstractListModel Q_OBJECT public: - explicit OptionsModel(QObject *parent = nullptr, bool resetSettings = false); + explicit OptionsModel(interfaces::Node& node, QObject *parent = nullptr, bool resetSettings = false); enum OptionID { StartAtStartup, // bool @@ -105,11 +105,10 @@ public: void setRestartRequired(bool fRequired); bool isRestartRequired() const; - interfaces::Node& node() const { assert(m_node); return *m_node; } - void setNode(interfaces::Node& node) { assert(!m_node); m_node = &node; } + interfaces::Node& node() const { return m_node; } private: - interfaces::Node* m_node = nullptr; + interfaces::Node& m_node; /* Qt-only settings */ bool m_show_tray_icon; bool fMinimizeToTray; |