mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-12 23:18:14 +01:00
qt: Add BitcoinCore::m_thread member
This change makes BitcoinCore self-contained to improve its re-usability. BitcoinApplication::coreThread member is now unused, and removed.
This commit is contained in:
@@ -9,11 +9,14 @@
|
||||
#include <config/bitcoin-config.h>
|
||||
#endif
|
||||
|
||||
#include <QApplication>
|
||||
#include <interfaces/node.h>
|
||||
|
||||
#include <assert.h>
|
||||
#include <memory>
|
||||
#include <optional>
|
||||
|
||||
#include <interfaces/node.h>
|
||||
#include <QApplication>
|
||||
#include <QThread>
|
||||
|
||||
class BitcoinGUI;
|
||||
class ClientModel;
|
||||
@@ -34,6 +37,7 @@ class BitcoinCore: public QObject
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit BitcoinCore(interfaces::Node& node);
|
||||
~BitcoinCore();
|
||||
|
||||
public Q_SLOTS:
|
||||
void initialize();
|
||||
@@ -49,6 +53,7 @@ private:
|
||||
void handleRunawayException(const std::exception *e);
|
||||
|
||||
interfaces::Node& m_node;
|
||||
QThread m_thread;
|
||||
};
|
||||
|
||||
/** Main Bitcoin application object */
|
||||
@@ -112,7 +117,7 @@ Q_SIGNALS:
|
||||
void windowShown(BitcoinGUI* window);
|
||||
|
||||
private:
|
||||
QThread *coreThread;
|
||||
std::optional<BitcoinCore> m_executor;
|
||||
OptionsModel *optionsModel;
|
||||
ClientModel *clientModel;
|
||||
BitcoinGUI *window;
|
||||
|
||||
Reference in New Issue
Block a user