From fa90fe6440301edba71a6f0b1ba3ef1c78d5eae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Barbosa?= <joao.paulo.barbosa@gmail.com> Date: Mon, 27 May 2019 22:14:29 +0100 Subject: [PATCH] refactor: Rename getWallets to getOpenWallets in WalletController --- src/qt/bitcoingui.cpp | 2 +- src/qt/walletcontroller.cpp | 2 +- src/qt/walletcontroller.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 1fa05d550..98c291aa6 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -639,7 +639,7 @@ void BitcoinGUI::setWalletController(WalletController* wallet_controller) connect(wallet_controller, &WalletController::walletAdded, this, &BitcoinGUI::addWallet); connect(wallet_controller, &WalletController::walletRemoved, this, &BitcoinGUI::removeWallet); - for (WalletModel* wallet_model : m_wallet_controller->getWallets()) { + for (WalletModel* wallet_model : m_wallet_controller->getOpenWallets()) { addWallet(wallet_model); } } diff --git a/src/qt/walletcontroller.cpp b/src/qt/walletcontroller.cpp index 3bb0b8dbb..4d489d7f4 100644 --- a/src/qt/walletcontroller.cpp +++ b/src/qt/walletcontroller.cpp @@ -40,7 +40,7 @@ WalletController::~WalletController() m_activity_thread.wait(); } -std::vector<WalletModel*> WalletController::getWallets() const +std::vector<WalletModel*> WalletController::getOpenWallets() const { QMutexLocker locker(&m_mutex); return m_wallets; diff --git a/src/qt/walletcontroller.h b/src/qt/walletcontroller.h index dcd64aac7..03039dd79 100644 --- a/src/qt/walletcontroller.h +++ b/src/qt/walletcontroller.h @@ -40,7 +40,8 @@ public: WalletController(interfaces::Node& node, const PlatformStyle* platform_style, OptionsModel* options_model, QObject* parent); ~WalletController(); - std::vector<WalletModel*> getWallets() const; + //! Returns wallet models currently open. + std::vector<WalletModel*> getOpenWallets() const; //! Returns all wallet names in the wallet dir mapped to whether the wallet //! is loaded.