aboutsummaryrefslogtreecommitdiff
path: root/src/qt/bitcoin.h
diff options
context:
space:
mode:
authorJonas Schnelli <dev@jonasschnelli.ch>2019-01-18 10:20:55 -1000
committerJonas Schnelli <dev@jonasschnelli.ch>2019-01-18 10:21:08 -1000
commit63144335becb705a233b32fb8d63f37b7d62071a (patch)
tree14a4b012b4ae3137d68cd512bafeabdf7b782177 /src/qt/bitcoin.h
parentcd42553b1178a48a16017eff0b70669c84c3895c (diff)
parent0dd9bdefa1427746ae94b4dd3da1a5257c1ec68e (diff)
downloadbitcoin-63144335becb705a233b32fb8d63f37b7d62071a.tar.xz
Merge #15101: gui: Add WalletController
0dd9bdefa gui: Refactor to use WalletController (João Barbosa) 8fa271f08 gui: Add WalletController (João Barbosa) cefb399e2 gui: Use AutoConnection for WalletModel::unload signal (João Barbosa) Pull request description: This PR is a subset of the work done in the context of #13100. This change consists in extracting from the application class the code that manages the wallet models. The role of the `WalletController` instance is to coordinate wallet operations and the window. Tree-SHA512: 6a824054376730eb7d16c643dd2003f5f60778e8ad3af707b82bc12c48438db179ca4446316b28fb17b206f4b9aba8998419aab8c5dd1f7c32467015732b5094
Diffstat (limited to 'src/qt/bitcoin.h')
-rw-r--r--src/qt/bitcoin.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/qt/bitcoin.h b/src/qt/bitcoin.h
index ffed45236c..370712d953 100644
--- a/src/qt/bitcoin.h
+++ b/src/qt/bitcoin.h
@@ -19,6 +19,7 @@ class NetworkStyle;
class OptionsModel;
class PaymentServer;
class PlatformStyle;
+class WalletController;
class WalletModel;
namespace interfaces {
@@ -93,8 +94,6 @@ public Q_SLOTS:
void shutdownResult();
/// Handle runaway exceptions. Shows a message box with the problem and quits the program.
void handleRunawayException(const QString &message);
- void addWallet(WalletModel* walletModel);
- void removeWallet();
Q_SIGNALS:
void requestedInitialize();
@@ -110,9 +109,8 @@ private:
BitcoinGUI *window;
QTimer *pollShutdownTimer;
#ifdef ENABLE_WALLET
- PaymentServer* paymentServer;
- std::vector<WalletModel*> m_wallet_models;
- std::unique_ptr<interfaces::Handler> m_handler_load_wallet;
+ PaymentServer* paymentServer{nullptr};
+ WalletController* m_wallet_controller{nullptr};
#endif
int returnValue;
const PlatformStyle *platformStyle;