Use override keyword for all overriden functions

Sergey · gladcow · commit 95b7c383887c · 2018-02-13T17:17:49.000+03:00
diff --git a/src/governance-exceptions.h b/src/governance-exceptions.h
@@ -76,7 +76,7 @@ class CGovernanceException : public std::exception
 
     virtual ~CGovernanceException() throw() {}
 
-    virtual const char* what() const throw()
+    virtual const char* what() const throw() override 
     {
         return strMessage.c_str();
     }
diff --git a/src/httprpc.cpp b/src/httprpc.cpp
@@ -48,11 +48,11 @@ class HTTPRPCTimerInterface : public RPCTimerInterface
     HTTPRPCTimerInterface(struct event_base* _base) : base(_base)
     {
     }
-    const char* Name()
+    const char* Name() override
     {
         return "HTTP";
     }
-    RPCTimerBase* NewTimer(boost::function<void(void)>& func, int64_t millis)
+    RPCTimerBase* NewTimer(boost::function<void(void)>& func, int64_t millis) override
     {
         return new HTTPRPCTimer(base, func, millis);
     }
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
@@ -46,7 +46,7 @@ class HTTPWorkItem : public HTTPClosure
         req(std::move(_req)), path(_path), func(_func)
     {
     }
-    void operator()()
+    void operator()() override
     {
         func(req.get(), path);
     }
diff --git a/src/keystore.h b/src/keystore.h
@@ -64,9 +64,9 @@ class CBasicKeyStore : public CKeyStore
     CHDChain hdChain;
 
 public:
-    bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey);
-    bool GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const;
-    bool HaveKey(const CKeyID &address) const
+    bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey) override;
+    bool GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const override;
+    bool HaveKey(const CKeyID &address) const override
     {
         bool result;
         {
@@ -75,7 +75,7 @@ class CBasicKeyStore : public CKeyStore
         }
         return result;
     }
-    void GetKeys(std::set<CKeyID> &setAddress) const
+    void GetKeys(std::set<CKeyID> &setAddress) const override
     {
         setAddress.clear();
         {
@@ -88,7 +88,7 @@ class CBasicKeyStore : public CKeyStore
             }
         }
     }
-    bool GetKey(const CKeyID &address, CKey &keyOut) const
+    bool GetKey(const CKeyID &address, CKey &keyOut) const override
     {
         {
             LOCK(cs_KeyStore);
@@ -101,16 +101,16 @@ class CBasicKeyStore : public CKeyStore
         }
         return false;
     }
-    virtual bool AddCScript(const CScript& redeemScript);
-    virtual bool HaveCScript(const CScriptID &hash) const;
-    virtual bool GetCScript(const CScriptID &hash, CScript& redeemScriptOut) const;
+    virtual bool AddCScript(const CScript& redeemScript) override;
+    virtual bool HaveCScript(const CScriptID &hash) const override;
+    virtual bool GetCScript(const CScriptID &hash, CScript& redeemScriptOut) const override;
 
-    virtual bool AddWatchOnly(const CScript &dest);
-    virtual bool RemoveWatchOnly(const CScript &dest);
-    virtual bool HaveWatchOnly(const CScript &dest) const;
-    virtual bool HaveWatchOnly() const;
+    virtual bool AddWatchOnly(const CScript &dest) override;
+    virtual bool RemoveWatchOnly(const CScript &dest) override;
+    virtual bool HaveWatchOnly(const CScript &dest) const override;
+    virtual bool HaveWatchOnly() const override;
 
-    bool GetHDChain(CHDChain& hdChainRet) const;
+    virtual bool GetHDChain(CHDChain& hdChainRet) const;
 };
 
 typedef std::vector<unsigned char, secure_allocator<unsigned char> > CKeyingMaterial;
diff --git a/src/net_processing.h b/src/net_processing.h
@@ -33,9 +33,9 @@ class PeerLogicValidation : public CValidationInterface {
 public:
     PeerLogicValidation(CConnman* connmanIn);
 
-    virtual void SyncTransaction(const CTransaction& tx, const CBlockIndex* pindex, int nPosInBlock);
-    virtual void UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload);
-    virtual void BlockChecked(const CBlock& block, const CValidationState& state);
+    virtual void SyncTransaction(const CTransaction& tx, const CBlockIndex* pindex, int nPosInBlock) override;
+    virtual void UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload) override;
+    virtual void BlockChecked(const CBlock& block, const CValidationState& state) override;
 };
 
 struct CNodeStateStats {
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -127,8 +127,8 @@ class QtRPCTimerInterface: public RPCTimerInterface
 {
 public:
     ~QtRPCTimerInterface() {}
-    const char *Name() { return "Qt"; }
-    RPCTimerBase* NewTimer(boost::function<void(void)>& func, int64_t millis)
+    const char *Name() override { return "Qt"; }
+    RPCTimerBase* NewTimer(boost::function<void(void)>& func, int64_t millis) override
     {
         return new QtRPCTimerBase(func, millis);
     }
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -743,7 +743,7 @@ class submitblock_StateCatcher : public CValidationInterface
     submitblock_StateCatcher(const uint256 &hashIn) : hash(hashIn), found(false), state() {}
 
 protected:
-    virtual void BlockChecked(const CBlock& block, const CValidationState& stateIn) {
+    virtual void BlockChecked(const CBlock& block, const CValidationState& stateIn) override {
         if (block.GetHash() != hash)
             return;
         found = true;
diff --git a/src/script/interpreter.h b/src/script/interpreter.h
@@ -128,9 +128,9 @@ class TransactionSignatureChecker : public BaseSignatureChecker
 
 public:
     TransactionSignatureChecker(const CTransaction* txToIn, unsigned int nInIn) : txTo(txToIn), nIn(nInIn) {}
-    bool CheckSig(const std::vector<unsigned char>& scriptSig, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode) const;
-    bool CheckLockTime(const CScriptNum& nLockTime) const;
-    bool CheckSequence(const CScriptNum& nSequence) const;
+    bool CheckSig(const std::vector<unsigned char>& scriptSig, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode) const override;
+    bool CheckLockTime(const CScriptNum& nLockTime) const override;
+    bool CheckSequence(const CScriptNum& nSequence) const override;
 };
 
 class MutableTransactionSignatureChecker : public TransactionSignatureChecker
diff --git a/src/script/sigcache.h b/src/script/sigcache.h
@@ -27,7 +27,7 @@ class CachingTransactionSignatureChecker : public TransactionSignatureChecker
 public:
     CachingTransactionSignatureChecker(const CTransaction* txToIn, unsigned int nInIn, bool storeIn=true) : TransactionSignatureChecker(txToIn, nInIn), store(storeIn) {}
 
-    bool VerifySignature(const std::vector<unsigned char>& vchSig, const CPubKey& vchPubKey, const uint256& sighash) const;
+    bool VerifySignature(const std::vector<unsigned char>& vchSig, const CPubKey& vchPubKey, const uint256& sighash) const override;
 };
 
 void InitSignatureCache();
diff --git a/src/script/sign.cpp b/src/script/sign.cpp
@@ -284,7 +284,7 @@ class DummySignatureChecker : public BaseSignatureChecker
 public:
     DummySignatureChecker() {}
 
-    bool CheckSig(const std::vector<unsigned char>& scriptSig, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode) const
+    bool CheckSig(const std::vector<unsigned char>& scriptSig, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode) const override
     {
         return true;
     }
diff --git a/src/script/sign.h b/src/script/sign.h
@@ -39,16 +39,16 @@ class TransactionSignatureCreator : public BaseSignatureCreator {
 
 public:
     TransactionSignatureCreator(const CKeyStore* keystoreIn, const CTransaction* txToIn, unsigned int nInIn, int nHashTypeIn=SIGHASH_ALL);
-    const BaseSignatureChecker& Checker() const { return checker; }
-    bool CreateSig(std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode) const;
+    const BaseSignatureChecker& Checker() const  override{ return checker; }
+    bool CreateSig(std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode) const override;
 };
 
 /** A signature creator that just produces 72-byte empty signatures. */
 class DummySignatureCreator : public BaseSignatureCreator {
 public:
     DummySignatureCreator(const CKeyStore* keystoreIn) : BaseSignatureCreator(keystoreIn) {}
-    const BaseSignatureChecker& Checker() const;
-    bool CreateSig(std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode) const;
+    const BaseSignatureChecker& Checker() const override;
+    bool CreateSig(std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode) const override;
 };
 
 /** Produce a script signature using a generic signature creator. */
diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp
@@ -27,7 +27,7 @@ class CAddrManTest : public CAddrMan
         insecure_rand = FastRandomContext(true);
     }
 
-    int RandomInt(int nMax)
+    int RandomInt(int nMax) override
     {
         state = (CHashWriter(SER_GETHASH, 0) << state).GetHash().GetCheapHash();
         return (unsigned int)(state % nMax);
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
@@ -28,7 +28,7 @@ class CAddrManSerializationMock : public CAddrMan
 class CAddrManUncorrupted : public CAddrManSerializationMock
 {
 public:
-    void Serialize(CDataStream& s) const
+    void Serialize(CDataStream& s) const override
     {
         CAddrMan::Serialize(s);
     }
@@ -37,7 +37,7 @@ class CAddrManUncorrupted : public CAddrManSerializationMock
 class CAddrManCorrupted : public CAddrManSerializationMock
 {
 public:
-    void Serialize(CDataStream& s) const
+    void Serialize(CDataStream& s) const override
     {
         // Produces corrupt output that claims addrman has 20 addrs when it only has one addr.
         unsigned char nVersion = 1;
diff --git a/src/test/versionbits_tests.cpp b/src/test/versionbits_tests.cpp
@@ -23,11 +23,11 @@ class TestConditionChecker : public AbstractThresholdConditionChecker
     mutable ThresholdConditionCache cache;
 
 public:
-    int64_t BeginTime(const Consensus::Params& params) const { return TestTime(10000); }
-    int64_t EndTime(const Consensus::Params& params) const { return TestTime(20000); }
-    int Period(const Consensus::Params& params) const { return 1000; }
-    int Threshold(const Consensus::Params& params) const { return 900; }
-    bool Condition(const CBlockIndex* pindex, const Consensus::Params& params) const { return (pindex->nVersion & 0x100); }
+    int64_t BeginTime(const Consensus::Params& params) const override { return TestTime(10000); }
+    int64_t EndTime(const Consensus::Params& params) const override { return TestTime(20000); }
+    int Period(const Consensus::Params& params) const override { return 1000; }
+    int Threshold(const Consensus::Params& params) const override { return 900; }
+    bool Condition(const CBlockIndex* pindex, const Consensus::Params& params) const override { return (pindex->nVersion & 0x100); }
 
     ThresholdState GetStateFor(const CBlockIndex* pindexPrev) const { return AbstractThresholdConditionChecker::GetStateFor(pindexPrev, paramsDummy, cache); }
     int GetStateSinceHeightFor(const CBlockIndex* pindexPrev) const { return AbstractThresholdConditionChecker::GetStateSinceHeightFor(pindexPrev, paramsDummy, cache); }
diff --git a/src/txdb.h b/src/txdb.h
@@ -74,6 +74,7 @@ class CCoinsViewDB : public CCoinsView
 public:
     CCoinsViewDB(size_t nCacheSize, bool fMemory = false, bool fWipe = false);
 
+<<<<<<< HEAD
     bool GetCoin(const COutPoint &outpoint, Coin &coin) const override;
     bool HaveCoin(const COutPoint &outpoint) const override;
     uint256 GetBestBlock() const override;
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -1988,12 +1988,12 @@ class WarningBitsConditionChecker : public AbstractThresholdConditionChecker
 public:
     WarningBitsConditionChecker(int bitIn) : bit(bitIn) {}
 
-    int64_t BeginTime(const Consensus::Params& params) const { return 0; }
-    int64_t EndTime(const Consensus::Params& params) const { return std::numeric_limits<int64_t>::max(); }
-    int Period(const Consensus::Params& params) const { return params.nMinerConfirmationWindow; }
-    int Threshold(const Consensus::Params& params) const { return params.nRuleChangeActivationThreshold; }
+    int64_t BeginTime(const Consensus::Params& params) const override { return 0; }
+    int64_t EndTime(const Consensus::Params& params) const override { return std::numeric_limits<int64_t>::max(); }
+    int Period(const Consensus::Params& params) const override { return params.nMinerConfirmationWindow; }
+    int Threshold(const Consensus::Params& params) const override { return params.nRuleChangeActivationThreshold; }
 
-    bool Condition(const CBlockIndex* pindex, const Consensus::Params& params) const
+    bool Condition(const CBlockIndex* pindex, const Consensus::Params& params) const override
     {
         return ((pindex->nVersion & VERSIONBITS_TOP_MASK) == VERSIONBITS_TOP_BITS) &&
                ((pindex->nVersion >> bit) & 1) != 0 &&
diff --git a/src/versionbits.cpp b/src/versionbits.cpp
@@ -153,12 +153,12 @@ class VersionBitsConditionChecker : public AbstractThresholdConditionChecker {
     const Consensus::DeploymentPos id;
 
 protected:
-    int64_t BeginTime(const Consensus::Params& params) const { return params.vDeployments[id].nStartTime; }
-    int64_t EndTime(const Consensus::Params& params) const { return params.vDeployments[id].nTimeout; }
-    int Period(const Consensus::Params& params) const { return params.vDeployments[id].nWindowSize ? params.vDeployments[id].nWindowSize : params.nMinerConfirmationWindow; }
-    int Threshold(const Consensus::Params& params) const { return params.vDeployments[id].nThreshold ? params.vDeployments[id].nThreshold : params.nRuleChangeActivationThreshold; }
+    int64_t BeginTime(const Consensus::Params& params) const override { return params.vDeployments[id].nStartTime; }
+    int64_t EndTime(const Consensus::Params& params) const override { return params.vDeployments[id].nTimeout; }
+    int Period(const Consensus::Params& params) const override { return params.vDeployments[id].nWindowSize ? params.vDeployments[id].nWindowSize : params.nMinerConfirmationWindow; }
+    int Threshold(const Consensus::Params& params) const override { return params.vDeployments[id].nThreshold ? params.vDeployments[id].nThreshold : params.nRuleChangeActivationThreshold; }
 
-    bool Condition(const CBlockIndex* pindex, const Consensus::Params& params) const
+    bool Condition(const CBlockIndex* pindex, const Consensus::Params& params) const override
     {
         return (((pindex->nVersion & VERSIONBITS_TOP_MASK) == VERSIONBITS_TOP_BITS) && (pindex->nVersion & Mask(params)) != 0);
     }
diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h
@@ -189,8 +189,8 @@ class CCryptoKeyStore : public CBasicKeyStore
     bool Lock(bool fAllowMixing = false);
 
     virtual bool AddCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret);
-    bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey);
-    bool HaveKey(const CKeyID &address) const
+    bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey) override;
+    bool HaveKey(const CKeyID &address) const override
     {
         {
             LOCK(cs_KeyStore);
@@ -200,9 +200,9 @@ class CCryptoKeyStore : public CBasicKeyStore
         }
         return false;
     }
-    bool GetKey(const CKeyID &address, CKey& keyOut) const;
-    bool GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const;
-    void GetKeys(std::set<CKeyID> &setAddress) const
+    bool GetKey(const CKeyID &address, CKey& keyOut) const override;
+    bool GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const override;
+    void GetKeys(std::set<CKeyID> &setAddress) const override
     {
         if (!IsCrypted())
         {
@@ -218,7 +218,7 @@ class CCryptoKeyStore : public CBasicKeyStore
         }
     }
 
-    bool GetHDChain(CHDChain& hdChainRet) const;
+    virtual bool GetHDChain(CHDChain& hdChainRet) const override;
 
     /**
      * Wallet status (encrypted, locked) changed.
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -877,6 +877,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 
     //! Adds a watch-only address to the store, and saves it to disk.
     bool AddWatchOnly(const CScript& dest, int64_t nCreateTime);
+
     bool RemoveWatchOnly(const CScript &dest) override;
     //! Adds a watch-only address to the store, without saving it to disk (used by LoadWallet)
     bool LoadWatchOnly(const CScript &dest);
@@ -1142,7 +1143,7 @@ class CReserveKey : public CReserveScript
     void ReturnKey();
     bool GetReservedKey(CPubKey &pubkey, bool fInternalIn /*= false*/);
     void KeepKey();
-    void KeepScript() { KeepKey(); }
+    void KeepScript() override { KeepKey(); }
 };
 
 
diff --git a/src/zmq/zmqpublishnotifier.h b/src/zmq/zmqpublishnotifier.h
@@ -24,44 +24,44 @@ class CZMQAbstractPublishNotifier : public CZMQAbstractNotifier
     */
     bool SendMessage(const char *command, const void* data, size_t size);
 
-    bool Initialize(void *pcontext);
-    void Shutdown();
+    bool Initialize(void *pcontext) override;
+    void Shutdown() override;
 };
 
 class CZMQPublishHashBlockNotifier : public CZMQAbstractPublishNotifier
 {
 public:
-    bool NotifyBlock(const CBlockIndex *pindex);
+    bool NotifyBlock(const CBlockIndex *pindex) override;
 };
 
 class CZMQPublishHashTransactionNotifier : public CZMQAbstractPublishNotifier
 {
 public:
-    bool NotifyTransaction(const CTransaction &transaction);
+    bool NotifyTransaction(const CTransaction &transaction) override;
 };
 
 class CZMQPublishHashTransactionLockNotifier : public CZMQAbstractPublishNotifier
 {
 public:
-    bool NotifyTransactionLock(const CTransaction &transaction);
+    bool NotifyTransactionLock(const CTransaction &transaction) override;
 };
 
 class CZMQPublishRawBlockNotifier : public CZMQAbstractPublishNotifier
 {
 public:
-    bool NotifyBlock(const CBlockIndex *pindex);
+    bool NotifyBlock(const CBlockIndex *pindex) override;
 };
 
 class CZMQPublishRawTransactionNotifier : public CZMQAbstractPublishNotifier
 {
 public:
-    bool NotifyTransaction(const CTransaction &transaction);
+    bool NotifyTransaction(const CTransaction &transaction) override;
 };
 
 class CZMQPublishRawTransactionLockNotifier : public CZMQAbstractPublishNotifier
 {
 public:
-    bool NotifyTransactionLock(const CTransaction &transaction);
+    bool NotifyTransactionLock(const CTransaction &transaction) override;
 };
 
 #endif // BITCOIN_ZMQ_ZMQPUBLISHNOTIFIER_H

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ class CGovernanceException : public std::exception`
`76`	`76`
`77`	`77`	`virtual ~CGovernanceException() throw() {}`
`78`	`78`
`79`		`- virtual const char* what() const throw()`
	`79`	`+ virtual const char* what() const throw() override`
`80`	`80`	`{`
`81`	`81`	`return strMessage.c_str();`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,11 @@ class HTTPRPCTimerInterface : public RPCTimerInterface`
`48`	`48`	`HTTPRPCTimerInterface(struct event_base* _base) : base(_base)`
`49`	`49`	`{`
`50`	`50`	`}`
`51`		`- const char* Name()`
	`51`	`+ const char* Name() override`
`52`	`52`	`{`
`53`	`53`	`return "HTTP";`
`54`	`54`	`}`
`55`		`- RPCTimerBase* NewTimer(boost::function<void(void)>& func, int64_t millis)`
	`55`	`+ RPCTimerBase* NewTimer(boost::function<void(void)>& func, int64_t millis) override`
`56`	`56`	`{`
`57`	`57`	`return new HTTPRPCTimer(base, func, millis);`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class HTTPWorkItem : public HTTPClosure`
`46`	`46`	`req(std::move(_req)), path(_path), func(_func)`
`47`	`47`	`{`
`48`	`48`	`}`
`49`		`- void operator()()`
	`49`	`+ void operator()() override`
`50`	`50`	`{`
`51`	`51`	`func(req.get(), path);`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,9 @@ class CBasicKeyStore : public CKeyStore`
`64`	`64`	`CHDChain hdChain;`
`65`	`65`
`66`	`66`	`public:`
`67`		`- bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey);`
`68`		`- bool GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const;`
`69`		`- bool HaveKey(const CKeyID &address) const`
	`67`	`+ bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey) override;`
	`68`	`+ bool GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const override;`
	`69`	`+ bool HaveKey(const CKeyID &address) const override`
`70`	`70`	`{`
`71`	`71`	`bool result;`
`72`	`72`	`{`
`@@ -75,7 +75,7 @@ class CBasicKeyStore : public CKeyStore`
`75`	`75`	`}`
`76`	`76`	`return result;`
`77`	`77`	`}`
`78`		`- void GetKeys(std::set<CKeyID> &setAddress) const`
	`78`	`+ void GetKeys(std::set<CKeyID> &setAddress) const override`
`79`	`79`	`{`
`80`	`80`	`setAddress.clear();`
`81`	`81`	`{`
`@@ -88,7 +88,7 @@ class CBasicKeyStore : public CKeyStore`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`	`}`
`91`		`- bool GetKey(const CKeyID &address, CKey &keyOut) const`
	`91`	`+ bool GetKey(const CKeyID &address, CKey &keyOut) const override`
`92`	`92`	`{`
`93`	`93`	`{`
`94`	`94`	`LOCK(cs_KeyStore);`
`@@ -101,16 +101,16 @@ class CBasicKeyStore : public CKeyStore`
`101`	`101`	`}`
`102`	`102`	`return false;`
`103`	`103`	`}`
`104`		`- virtual bool AddCScript(const CScript& redeemScript);`
`105`		`- virtual bool HaveCScript(const CScriptID &hash) const;`
`106`		`- virtual bool GetCScript(const CScriptID &hash, CScript& redeemScriptOut) const;`
	`104`	`+ virtual bool AddCScript(const CScript& redeemScript) override;`
	`105`	`+ virtual bool HaveCScript(const CScriptID &hash) const override;`
	`106`	`+ virtual bool GetCScript(const CScriptID &hash, CScript& redeemScriptOut) const override;`
`107`	`107`
`108`		`- virtual bool AddWatchOnly(const CScript &dest);`
`109`		`- virtual bool RemoveWatchOnly(const CScript &dest);`
`110`		`- virtual bool HaveWatchOnly(const CScript &dest) const;`
`111`		`- virtual bool HaveWatchOnly() const;`
	`108`	`+ virtual bool AddWatchOnly(const CScript &dest) override;`
	`109`	`+ virtual bool RemoveWatchOnly(const CScript &dest) override;`
	`110`	`+ virtual bool HaveWatchOnly(const CScript &dest) const override;`
	`111`	`+ virtual bool HaveWatchOnly() const override;`
`112`	`112`
`113`		`- bool GetHDChain(CHDChain& hdChainRet) const;`
	`113`	`+ virtual bool GetHDChain(CHDChain& hdChainRet) const;`
`114`	`114`	`};`
`115`	`115`
`116`	`116`	`typedef std::vector<unsigned char, secure_allocator<unsigned char> > CKeyingMaterial;`
Original file line number	Diff line number	Diff line change
`@@ -127,8 +127,8 @@ class QtRPCTimerInterface: public RPCTimerInterface`
`127`	`127`	`{`
`128`	`128`	`public:`
`129`	`129`	`~QtRPCTimerInterface() {}`
`130`		`- const char *Name() { return "Qt"; }`
`131`		`- RPCTimerBase* NewTimer(boost::function<void(void)>& func, int64_t millis)`
	`130`	`+ const char *Name() override { return "Qt"; }`
	`131`	`+ RPCTimerBase* NewTimer(boost::function<void(void)>& func, int64_t millis) override`
`132`	`132`	`{`
`133`	`133`	`return new QtRPCTimerBase(func, millis);`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ class DummySignatureChecker : public BaseSignatureChecker`
`284`	`284`	`public:`
`285`	`285`	`DummySignatureChecker() {}`
`286`	`286`
`287`		`- bool CheckSig(const std::vector<unsigned char>& scriptSig, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode) const`
	`287`	`+ bool CheckSig(const std::vector<unsigned char>& scriptSig, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode) const override`
`288`	`288`	`{`
`289`	`289`	`return true;`
`290`	`290`	`}`