From fead9075b6cdaec15e70bf77d9c1d5654e781340 Mon Sep 17 00:00:00 2001 From: sowle Date: Sat, 9 Nov 2024 19:42:15 +0100 Subject: [PATCH] wallet: minor improvements (override keyword) --- src/wallet/wallet_id_adapter.h | 23 ++++++++++++++--------- src/wallet/wallets_manager.h | 6 +++--- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/wallet/wallet_id_adapter.h b/src/wallet/wallet_id_adapter.h index 73b3627b..f13ce0c7 100644 --- a/src/wallet/wallet_id_adapter.h +++ b/src/wallet/wallet_id_adapter.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Zano Project +// Copyright (c) 2014-2024 Zano Project // Copyright (c) 2014-2018 The Louisdor Project // Copyright (c) 2012-2013 The Boolberry developers // Distributed under the MIT/X11 software license, see the accompanying @@ -29,31 +29,36 @@ struct i_wallet_to_i_backend_adapter: public tools::i_wallet2_callback m_wallet_id(wallet_id) {} - virtual void on_new_block(uint64_t height, const currency::block& block) { + virtual void on_new_block(uint64_t height, const currency::block& block) override + { m_pbackend->on_new_block(m_wallet_id, height, block); } - virtual void on_transfer2(const tools::wallet_public::wallet_transfer_info& wti, const std::list& balances, uint64_t total_mined) { + virtual void on_transfer2(const tools::wallet_public::wallet_transfer_info& wti, const std::list& balances, uint64_t total_mined) override + { m_pbackend->on_transfer2(m_wallet_id, wti, balances, total_mined); } - virtual void on_pos_block_found(const currency::block& wti) { + virtual void on_pos_block_found(const currency::block& wti) override + { m_pbackend->on_pos_block_found(m_wallet_id, wti); } - virtual void on_sync_progress(const uint64_t& progress) { + virtual void on_sync_progress(const uint64_t& progress) override + { m_pbackend->on_sync_progress(m_wallet_id, progress); } - virtual void on_transfer_canceled(const tools::wallet_public::wallet_transfer_info& wti) { + virtual void on_transfer_canceled(const tools::wallet_public::wallet_transfer_info& wti) override + { m_pbackend->on_transfer_canceled(m_wallet_id, wti); } - virtual void on_tor_status_change(const std::string& state) + virtual void on_tor_status_change(const std::string& state) override { m_pbackend->on_tor_status_change(m_wallet_id, state); } - virtual void on_mw_get_wallets(std::vector& wallets) + virtual void on_mw_get_wallets(std::vector& wallets) override { m_pbackend->on_mw_get_wallets(wallets); } - virtual bool on_mw_select_wallet(uint64_t wallet_id) + virtual bool on_mw_select_wallet(uint64_t wallet_id) override { return m_pbackend->on_mw_select_wallet(wallet_id); } diff --git a/src/wallet/wallets_manager.h b/src/wallet/wallets_manager.h index 6fa14328..76a8191e 100644 --- a/src/wallet/wallets_manager.h +++ b/src/wallet/wallets_manager.h @@ -207,10 +207,10 @@ private: virtual bool on_mw_select_wallet(uint64_t wallet_id) override; //----- i_wallet_provider ------ - virtual void lock(); - virtual void unlock(); + virtual void lock() override; + virtual void unlock() override; //#ifndef MOBILE_WALLET_BUILD - virtual std::shared_ptr get_wallet(); + virtual std::shared_ptr get_wallet() override; //#endif //--------