diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-09-23 12:44:09 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-09-23 12:44:35 +0200 |
| commit | 5d0219d983b6cb8de5b4faf3f78a6781c99e442b (patch) | |
| tree | a6f613a511056681f0a294a129f876845bf7f777 /src/qt/walletmodel.cpp | |
| parent | Merge #8785: Comment on CNode::nLocalServices meaning (diff) | |
| parent | Do not shadow in src/qt (diff) | |
| download | discoin-5d0219d983b6cb8de5b4faf3f78a6781c99e442b.tar.xz discoin-5d0219d983b6cb8de5b4faf3f78a6781c99e442b.zip | |
Merge #8793: Do not shadow in src/qt
f839350 Do not shadow in src/qt (Pavel JanÃk)
Diffstat (limited to 'src/qt/walletmodel.cpp')
| -rw-r--r-- | src/qt/walletmodel.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index ad3ba996f..c8a2cb37e 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -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) { } |