diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-04-02 11:06:56 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-04-02 11:07:39 +0200 |
| commit | 30c2dd8d0598afac9319d3a813a89a682b9c0d34 (patch) | |
| tree | 158224feed93469c6f43b30be077698a23e15939 /src/wallet/wallet.h | |
| parent | a67bc5e128541155e357be9ef9ffd401f0945639 (diff) | |
| parent | 25340b7cd58c3451ae91c7b501fdff70ef05ec80 (diff) | |
| download | bitcoin-30c2dd8d0598afac9319d3a813a89a682b9c0d34.tar.xz | |
Merge #7691: [Wallet] refactor wallet/init interaction
25340b7 [Wallet] refactor wallet/init interaction (Jonas Schnelli)
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 5db36f52d1..867f33a7b5 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -28,6 +28,8 @@ #include <boost/shared_ptr.hpp> +extern CWallet* pwalletMain; + /** * Settings */ @@ -841,7 +843,7 @@ public: void Flush(bool shutdown=false); //! Verify the wallet database and perform salvage if required - static bool Verify(const std::string& walletFile, std::string& warningString, std::string& errorString); + static bool Verify(); /** * Address book entry changed. @@ -876,8 +878,11 @@ public: /* Returns the wallets help message */ static std::string GetWalletHelpString(bool showDebug); - /* initializes the wallet, returns a new CWallet instance or a null pointer in case of an error */ - static CWallet* InitLoadWallet(bool fDisableWallet, const std::string& strWalletFile, std::string& warningString, std::string& errorString); + /* Initializes the wallet, returns a new CWallet instance or a null pointer in case of an error */ + static bool InitLoadWallet(); + + /* Wallets parameter interaction */ + static bool ParameterInteraction(); }; /** A key allocated from the key pool. */ |