diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-03-09 10:27:03 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-03-09 10:27:31 +0100 |
| commit | c71f0ca5f8394eda9300d79138d0f2bca60f151a (patch) | |
| tree | 276a0a7f09064982d94e62d37ac9b94ea5edbcb4 /src/wallet | |
| parent | b403ec5c0f2fa0464a9d40f9d5c25beb0bd3c5df (diff) | |
| parent | 3cef95058c0c30045fb41f8bd957f0ed3ba01df9 (diff) | |
| download | bitcoin-c71f0ca5f8394eda9300d79138d0f2bca60f151a.tar.xz | |
Merge #9960: Trivial: Add const modifier to GetHDChain and IsHDEnabled
3cef950 Trivial: Add const modifier to GetHDChain and IsHDEnabled (NicolasDorier)
Tree-SHA512: 73126689e179d70e6823950b51aae4da0a1e348436bc72338814f3afeec27868bb479d9e8261f86e4fe851e84492778a30c5f1fe76c9d7dd91796d0e38baeaf0
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/wallet.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 07b34ae10e..965fba67fc 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1327,7 +1327,7 @@ bool CWallet::SetHDChain(const CHDChain& chain, bool memonly) return true; } -bool CWallet::IsHDEnabled() +bool CWallet::IsHDEnabled() const { return !hdChain.masterKeyID.IsNull(); } diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 9f89c89bc2..cae92a0b09 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -1015,10 +1015,10 @@ public: /* Set the HD chain model (chain child index counters) */ bool SetHDChain(const CHDChain& chain, bool memonly); - const CHDChain& GetHDChain() { return hdChain; } + const CHDChain& GetHDChain() const { return hdChain; } /* Returns true if HD is enabled */ - bool IsHDEnabled(); + bool IsHDEnabled() const; /* Generates a new HD master key (will not be activated) */ CPubKey GenerateNewHDMasterKey(); |