mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-11 22:50:59 +01:00
Do not shadow in src/qt
This commit is contained in:
committed by
Wladimir J. van der Laan
parent
26b370a937
commit
f839350420
@@ -27,8 +27,8 @@
|
||||
|
||||
#include <boost/foreach.hpp>
|
||||
|
||||
WalletModel::WalletModel(const PlatformStyle *platformStyle, CWallet *wallet, OptionsModel *optionsModel, QObject *parent) :
|
||||
QObject(parent), wallet(wallet), optionsModel(optionsModel), addressTableModel(0),
|
||||
WalletModel::WalletModel(const PlatformStyle *platformStyle, CWallet *_wallet, OptionsModel *_optionsModel, QObject *parent) :
|
||||
QObject(parent), wallet(_wallet), optionsModel(_optionsModel), addressTableModel(0),
|
||||
transactionTableModel(0),
|
||||
recentRequestsTableModel(0),
|
||||
cachedBalance(0), cachedUnconfirmedBalance(0), cachedImmatureBalance(0),
|
||||
@@ -531,10 +531,10 @@ WalletModel::UnlockContext WalletModel::requestUnlock()
|
||||
return UnlockContext(this, valid, was_locked);
|
||||
}
|
||||
|
||||
WalletModel::UnlockContext::UnlockContext(WalletModel *wallet, bool valid, bool relock):
|
||||
wallet(wallet),
|
||||
valid(valid),
|
||||
relock(relock)
|
||||
WalletModel::UnlockContext::UnlockContext(WalletModel *_wallet, bool _valid, bool _relock):
|
||||
wallet(_wallet),
|
||||
valid(_valid),
|
||||
relock(_relock)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user