Skip to content

Commit d211edb

Browse files
committed
Merge #15464: gui: Drop unused return values in WalletFrame
28c86de gui: Drop unused return values in WalletFrame (João Barbosa) Pull request description: This is a small cleanup since the return value of `WalletFrame` methods are not used. This is in line with the usual async slot declaration. Tree-SHA512: ff0ca098804118bba200a58cd796ff90e853a6430e58125bd178b7bfa9b2b763c13d17b81e8f3ebd94395cac249d80379ba1529680c47682ba6a2ed81492ba33
2 parents 3db0cc3 + 28c86de commit d211edb

File tree

2 files changed

+10
-20
lines changed

2 files changed

+10
-20
lines changed

src/qt/walletframe.cpp

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,11 @@ void WalletFrame::setClientModel(ClientModel *_clientModel)
4040
this->clientModel = _clientModel;
4141
}
4242

43-
bool WalletFrame::addWallet(WalletModel *walletModel)
43+
void WalletFrame::addWallet(WalletModel *walletModel)
4444
{
45-
if (!gui || !clientModel || !walletModel) {
46-
return false;
47-
}
45+
if (!gui || !clientModel || !walletModel) return;
4846

49-
if (mapWalletViews.count(walletModel) > 0) {
50-
return false;
51-
}
47+
if (mapWalletViews.count(walletModel) > 0) return;
5248

5349
WalletView *walletView = new WalletView(platformStyle, this);
5450
walletView->setBitcoinGUI(gui);
@@ -72,31 +68,25 @@ bool WalletFrame::addWallet(WalletModel *walletModel)
7268
});
7369

7470
connect(walletView, &WalletView::outOfSyncWarningClicked, this, &WalletFrame::outOfSyncWarningClicked);
75-
76-
return true;
7771
}
7872

79-
bool WalletFrame::setCurrentWallet(WalletModel* wallet_model)
73+
void WalletFrame::setCurrentWallet(WalletModel* wallet_model)
8074
{
81-
if (mapWalletViews.count(wallet_model) == 0)
82-
return false;
75+
if (mapWalletViews.count(wallet_model) == 0) return;
8376

8477
WalletView *walletView = mapWalletViews.value(wallet_model);
8578
walletStack->setCurrentWidget(walletView);
8679
assert(walletView);
8780
walletView->updateEncryptionStatus();
88-
return true;
8981
}
9082

91-
bool WalletFrame::removeWallet(WalletModel* wallet_model)
83+
void WalletFrame::removeWallet(WalletModel* wallet_model)
9284
{
93-
if (mapWalletViews.count(wallet_model) == 0)
94-
return false;
85+
if (mapWalletViews.count(wallet_model) == 0) return;
9586

9687
WalletView *walletView = mapWalletViews.take(wallet_model);
9788
walletStack->removeWidget(walletView);
9889
delete walletView;
99-
return true;
10090
}
10191

10292
void WalletFrame::removeAllWallets()

src/qt/walletframe.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ class WalletFrame : public QFrame
3636

3737
void setClientModel(ClientModel *clientModel);
3838

39-
bool addWallet(WalletModel *walletModel);
40-
bool setCurrentWallet(WalletModel* wallet_model);
41-
bool removeWallet(WalletModel* wallet_model);
39+
void addWallet(WalletModel *walletModel);
40+
void setCurrentWallet(WalletModel* wallet_model);
41+
void removeWallet(WalletModel* wallet_model);
4242
void removeAllWallets();
4343

4444
bool handlePaymentRequest(const SendCoinsRecipient& recipient);

0 commit comments

Comments
 (0)