diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-03-15 10:30:37 +0100 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-03-22 08:20:59 +0100 |
| commit | 25340b7cd58c3451ae91c7b501fdff70ef05ec80 (patch) | |
| tree | 8adcbc5d93a710f8c955bf25d7b7ce78db07a974 /src/wallet/wallet.h | |
| parent | a6a860796a44a2805a58391a009ba22752f64e32 (diff) | |
[Wallet] refactor wallet/init interaction
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 d009211a92..257d6f2e70 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -28,6 +28,8 @@ #include <boost/shared_ptr.hpp> +extern CWallet* pwalletMain; + /** * Settings */ @@ -840,7 +842,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. @@ -875,8 +877,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. */ |