Wallet API: add some missing override keyword

Also remove dust() from UnsignedTransactionImpl (already in PendingTransactionImpl)

1 files changed, 92 insertions, 92 deletions

diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h
index 08232cafd..eefb2fe94 100644
--- a/src/wallet/api/wallet.h
+++ b/src/wallet/api/wallet.h
@@ -57,7 +57,7 @@ public:
     bool create(const std::string &path, const std::string &password,
                 const std::string &language);
     bool createWatchOnly(const std::string &path, const std::string &password,
-                            const std::string &language) const;
+                            const std::string &language) const override;
     bool open(const std::string &path, const std::string &password);
     bool recover(const std::string &path,const std::string &password,
                             const std::string &seed);
@@ -80,58 +80,58 @@ public:
                            const std::string &password,
                            const std::string &device_name);
     bool close(bool store = true);
-    std::string seed() const;
-    std::string getSeedLanguage() const;
-    void setSeedLanguage(const std::string &arg);
+    std::string seed() const override;
+    std::string getSeedLanguage() const override;
+    void setSeedLanguage(const std::string &arg) override;
     // void setListener(Listener *) {}
-    int status() const;
-    std::string errorString() const;
+    int status() const override;
+    std::string errorString() const override;
     void statusWithErrorString(int& status, std::string& errorString) const override;
-    bool setPassword(const std::string &password);
-    std::string address(uint32_t accountIndex = 0, uint32_t addressIndex = 0) const;
-    std::string integratedAddress(const std::string &payment_id) const;
-    std::string secretViewKey() const;
-    std::string publicViewKey() const;
-    std::string secretSpendKey() const;
-    std::string publicSpendKey() const;
-    std::string publicMultisigSignerKey() const;
-    std::string path() const;
-    bool store(const std::string &path);
-    std::string filename() const;
-    std::string keysFilename() const;
-    bool init(const std::string &daemon_address, uint64_t upper_transaction_size_limit = 0, const std::string &daemon_username = "", const std::string &daemon_password = "", bool use_ssl = false, bool lightWallet = false);
-    bool connectToDaemon();
-    ConnectionStatus connected() const;
-    void setTrustedDaemon(bool arg);
-    bool trustedDaemon() const;
-    uint64_t balance(uint32_t accountIndex = 0) const;
-    uint64_t unlockedBalance(uint32_t accountIndex = 0) const;
-    uint64_t blockChainHeight() const;
-    uint64_t approximateBlockChainHeight() const;
-    uint64_t daemonBlockChainHeight() const;
-    uint64_t daemonBlockChainTargetHeight() const;
-    bool synchronized() const;
-    bool refresh();
-    void refreshAsync();
-    void setAutoRefreshInterval(int millis);
-    int autoRefreshInterval() const;
-    void setRefreshFromBlockHeight(uint64_t refresh_from_block_height);
-    uint64_t getRefreshFromBlockHeight() const { return m_wallet->get_refresh_from_block_height(); };
-    void setRecoveringFromSeed(bool recoveringFromSeed);
+    bool setPassword(const std::string &password) override;
+    std::string address(uint32_t accountIndex = 0, uint32_t addressIndex = 0) const override;
+    std::string integratedAddress(const std::string &payment_id) const override;
+    std::string secretViewKey() const override;
+    std::string publicViewKey() const override;
+    std::string secretSpendKey() const override;
+    std::string publicSpendKey() const override;
+    std::string publicMultisigSignerKey() const override;
+    std::string path() const override;
+    bool store(const std::string &path) override;
+    std::string filename() const override;
+    std::string keysFilename() const override;
+    bool init(const std::string &daemon_address, uint64_t upper_transaction_size_limit = 0, const std::string &daemon_username = "", const std::string &daemon_password = "", bool use_ssl = false, bool lightWallet = false) override;
+    bool connectToDaemon() override;
+    ConnectionStatus connected() const override;
+    void setTrustedDaemon(bool arg) override;
+    bool trustedDaemon() const override;
+    uint64_t balance(uint32_t accountIndex = 0) const override;
+    uint64_t unlockedBalance(uint32_t accountIndex = 0) const override;
+    uint64_t blockChainHeight() const override;
+    uint64_t approximateBlockChainHeight() const override;
+    uint64_t daemonBlockChainHeight() const override;
+    uint64_t daemonBlockChainTargetHeight() const override;
+    bool synchronized() const override;
+    bool refresh() override;
+    void refreshAsync() override;
+    void setAutoRefreshInterval(int millis) override;
+    int autoRefreshInterval() const override;
+    void setRefreshFromBlockHeight(uint64_t refresh_from_block_height) override;
+    uint64_t getRefreshFromBlockHeight() const override { return m_wallet->get_refresh_from_block_height(); };
+    void setRecoveringFromSeed(bool recoveringFromSeed) override;
     void setRecoveringFromDevice(bool recoveringFromDevice) override;
     void setSubaddressLookahead(uint32_t major, uint32_t minor) override;
-    bool watchOnly() const;
-    bool rescanSpent();
-    NetworkType nettype() const {return static_cast<NetworkType>(m_wallet->nettype());}
-    void hardForkInfo(uint8_t &version, uint64_t &earliest_height) const;
-    bool useForkRules(uint8_t version, int64_t early_blocks) const;
-
-    void addSubaddressAccount(const std::string& label);
-    size_t numSubaddressAccounts() const;
-    size_t numSubaddresses(uint32_t accountIndex) const;
-    void addSubaddress(uint32_t accountIndex, const std::string& label);
-    std::string getSubaddressLabel(uint32_t accountIndex, uint32_t addressIndex) const;
-    void setSubaddressLabel(uint32_t accountIndex, uint32_t addressIndex, const std::string &label);
+    bool watchOnly() const override;
+    bool rescanSpent() override;
+    NetworkType nettype() const override {return static_cast<NetworkType>(m_wallet->nettype());}
+    void hardForkInfo(uint8_t &version, uint64_t &earliest_height) const override;
+    bool useForkRules(uint8_t version, int64_t early_blocks) const override;
+
+    void addSubaddressAccount(const std::string& label) override;
+    size_t numSubaddressAccounts() const override;
+    size_t numSubaddresses(uint32_t accountIndex) const override;
+    void addSubaddress(uint32_t accountIndex, const std::string& label) override;
+    std::string getSubaddressLabel(uint32_t accountIndex, uint32_t addressIndex) const override;
+    void setSubaddressLabel(uint32_t accountIndex, uint32_t addressIndex, const std::string &label) override;
 
     MultisigState multisig() const override;
     std::string getMultisigInfo() const override;
@@ -145,49 +145,49 @@ public:
                                         optional<uint64_t> amount, uint32_t mixin_count,
                                         PendingTransaction::Priority priority = PendingTransaction::Priority_Low,
                                         uint32_t subaddr_account = 0,
-                                        std::set<uint32_t> subaddr_indices = {});
-    virtual PendingTransaction * createSweepUnmixableTransaction();
-    bool submitTransaction(const std::string &fileName);
-    virtual UnsignedTransaction * loadUnsignedTx(const std::string &unsigned_filename);
-    bool exportKeyImages(const std::string &filename);
-    bool importKeyImages(const std::string &filename);
-
-    virtual void disposeTransaction(PendingTransaction * t);
-    virtual TransactionHistory * history();
-    virtual AddressBook * addressBook();
-    virtual Subaddress * subaddress();
-    virtual SubaddressAccount * subaddressAccount();
-    virtual void setListener(WalletListener * l);
-    virtual uint32_t defaultMixin() const;
-    virtual void setDefaultMixin(uint32_t arg);
-    virtual bool setUserNote(const std::string &txid, const std::string &note);
-    virtual std::string getUserNote(const std::string &txid) const;
-    virtual std::string getTxKey(const std::string &txid) const;
-    virtual bool checkTxKey(const std::string &txid, std::string tx_key, const std::string &address, uint64_t &received, bool &in_pool, uint64_t &confirmations);
-    virtual std::string getTxProof(const std::string &txid, const std::string &address, const std::string &message) const;
-    virtual bool checkTxProof(const std::string &txid, const std::string &address, const std::string &message, const std::string &signature, bool &good, uint64_t &received, bool &in_pool, uint64_t &confirmations);
-    virtual std::string getSpendProof(const std::string &txid, const std::string &message) const;
-    virtual bool checkSpendProof(const std::string &txid, const std::string &message, const std::string &signature, bool &good) const;
-    virtual std::string getReserveProof(bool all, uint32_t account_index, uint64_t amount, const std::string &message) const;
-    virtual bool checkReserveProof(const std::string &address, const std::string &message, const std::string &signature, bool &good, uint64_t &total, uint64_t &spent) const;
-    virtual std::string signMessage(const std::string &message);
-    virtual bool verifySignedMessage(const std::string &message, const std::string &address, const std::string &signature) const;
-    virtual std::string signMultisigParticipant(const std::string &message) const;
-    virtual bool verifyMessageWithPublicKey(const std::string &message, const std::string &publicKey, const std::string &signature) const;
-    virtual void startRefresh();
-    virtual void pauseRefresh();
-    virtual bool parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &amount, std::string &tx_description, std::string &recipient_name, std::vector<std::string> &unknown_parameters, std::string &error);
-    virtual std::string getDefaultDataDir() const;
-    virtual bool lightWalletLogin(bool &isNewWallet) const;
-    virtual bool lightWalletImportWalletRequest(std::string &payment_id, uint64_t &fee, bool &new_request, bool &request_fulfilled, std::string &payment_address, std::string &status);
-    virtual bool blackballOutputs(const std::vector<std::string> &pubkeys, bool add);
-    virtual bool unblackballOutput(const std::string &pubkey);
-    virtual bool getRing(const std::string &key_image, std::vector<uint64_t> &ring) const;
-    virtual bool getRings(const std::string &txid, std::vector<std::pair<std::string, std::vector<uint64_t>>> &rings) const;
-    virtual bool setRing(const std::string &key_image, const std::vector<uint64_t> &ring, bool relative);
-    virtual void segregatePreForkOutputs(bool segregate);
-    virtual void segregationHeight(uint64_t height);
-    virtual void keyReuseMitigation2(bool mitigation);
+                                        std::set<uint32_t> subaddr_indices = {}) override;
+    virtual PendingTransaction * createSweepUnmixableTransaction() override;
+    bool submitTransaction(const std::string &fileName) override;
+    virtual UnsignedTransaction * loadUnsignedTx(const std::string &unsigned_filename) override;
+    bool exportKeyImages(const std::string &filename) override;
+    bool importKeyImages(const std::string &filename) override;
+
+    virtual void disposeTransaction(PendingTransaction * t) override;
+    virtual TransactionHistory * history() override;
+    virtual AddressBook * addressBook() override;
+    virtual Subaddress * subaddress() override;
+    virtual SubaddressAccount * subaddressAccount() override;
+    virtual void setListener(WalletListener * l) override;
+    virtual uint32_t defaultMixin() const override;
+    virtual void setDefaultMixin(uint32_t arg) override;
+    virtual bool setUserNote(const std::string &txid, const std::string &note) override;
+    virtual std::string getUserNote(const std::string &txid) const override;
+    virtual std::string getTxKey(const std::string &txid) const override;
+    virtual bool checkTxKey(const std::string &txid, std::string tx_key, const std::string &address, uint64_t &received, bool &in_pool, uint64_t &confirmations) override;
+    virtual std::string getTxProof(const std::string &txid, const std::string &address, const std::string &message) const override;
+    virtual bool checkTxProof(const std::string &txid, const std::string &address, const std::string &message, const std::string &signature, bool &good, uint64_t &received, bool &in_pool, uint64_t &confirmations) override;
+    virtual std::string getSpendProof(const std::string &txid, const std::string &message) const override;
+    virtual bool checkSpendProof(const std::string &txid, const std::string &message, const std::string &signature, bool &good) const override;
+    virtual std::string getReserveProof(bool all, uint32_t account_index, uint64_t amount, const std::string &message) const override;
+    virtual bool checkReserveProof(const std::string &address, const std::string &message, const std::string &signature, bool &good, uint64_t &total, uint64_t &spent) const override;
+    virtual std::string signMessage(const std::string &message) override;
+    virtual bool verifySignedMessage(const std::string &message, const std::string &address, const std::string &signature) const override;
+    virtual std::string signMultisigParticipant(const std::string &message) const override;
+    virtual bool verifyMessageWithPublicKey(const std::string &message, const std::string &publicKey, const std::string &signature) const override;
+    virtual void startRefresh() override;
+    virtual void pauseRefresh() override;
+    virtual bool parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &amount, std::string &tx_description, std::string &recipient_name, std::vector<std::string> &unknown_parameters, std::string &error) override;
+    virtual std::string getDefaultDataDir() const override;
+    virtual bool lightWalletLogin(bool &isNewWallet) const override;
+    virtual bool lightWalletImportWalletRequest(std::string &payment_id, uint64_t &fee, bool &new_request, bool &request_fulfilled, std::string &payment_address, std::string &status) override;
+    virtual bool blackballOutputs(const std::vector<std::string> &pubkeys, bool add) override;
+    virtual bool unblackballOutput(const std::string &pubkey) override;
+    virtual bool getRing(const std::string &key_image, std::vector<uint64_t> &ring) const override;
+    virtual bool getRings(const std::string &txid, std::vector<std::pair<std::string, std::vector<uint64_t>>> &rings) const override;
+    virtual bool setRing(const std::string &key_image, const std::vector<uint64_t> &ring, bool relative) override;
+    virtual void segregatePreForkOutputs(bool segregate) override;
+    virtual void segregationHeight(uint64_t height) override;
+    virtual void keyReuseMitigation2(bool mitigation) override;
 
 private:
     void clearStatus() const;