diff options
| author | Russell Yanofsky <russ@yanofsky.org> | 2018-04-08 14:37:50 -0400 |
|---|---|---|
| committer | Russell Yanofsky <russ@yanofsky.org> | 2019-02-22 15:43:02 -0400 |
| commit | 1106a6fde4bfde31a16de45e4cc84ed5da05c5a4 (patch) | |
| tree | 7d8168d42ef198f19f5f200833d22c77a6b0c86d /src/ui_interface.h | |
| parent | 318f41fb2cae0a46b4e4be49156562b8ed640f0c (diff) | |
| download | bitcoin-1106a6fde4bfde31a16de45e4cc84ed5da05c5a4.tar.xz | |
Remove use of uiInterface.LoadWallet in wallet code
This also changes the uiInterface.LoadWallet signal argument type from
shared_ptr<CWallet> to unique_ptr<interfaces::Wallet> because CWallet is an
internal wallet class that shouldn't be used in non-wallet code (and also can't
be passed across process boundaries).
This commit does not change behavior.
Diffstat (limited to 'src/ui_interface.h')
| -rw-r--r-- | src/ui_interface.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/ui_interface.h b/src/ui_interface.h index fe466b3ca4..f1aebce3bb 100644 --- a/src/ui_interface.h +++ b/src/ui_interface.h @@ -11,7 +11,6 @@ #include <stdint.h> #include <string> -class CWallet; class CBlockIndex; namespace boost { namespace signals2 { @@ -19,6 +18,10 @@ class connection; } } // namespace boost +namespace interfaces { +class Wallet; +} // namespace interfaces + /** General change type (added, updated, removed). */ enum ChangeType { @@ -102,7 +105,7 @@ public: ADD_SIGNALS_DECL_WRAPPER(NotifyAlertChanged, void, ); /** A wallet has been loaded. */ - ADD_SIGNALS_DECL_WRAPPER(LoadWallet, void, std::shared_ptr<CWallet> wallet); + ADD_SIGNALS_DECL_WRAPPER(LoadWallet, void, std::unique_ptr<interfaces::Wallet>& wallet); /** * Show progress e.g. for verifychain. |