mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-10 22:18:54 +01:00
Do not shadow in src/qt
This commit is contained in:
committed by
Wladimir J. van der Laan
parent
26b370a937
commit
f839350420
@@ -59,9 +59,9 @@ struct TxLessThan
|
||||
class TransactionTablePriv
|
||||
{
|
||||
public:
|
||||
TransactionTablePriv(CWallet *wallet, TransactionTableModel *parent) :
|
||||
wallet(wallet),
|
||||
parent(parent)
|
||||
TransactionTablePriv(CWallet *_wallet, TransactionTableModel *_parent) :
|
||||
wallet(_wallet),
|
||||
parent(_parent)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -235,13 +235,13 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
TransactionTableModel::TransactionTableModel(const PlatformStyle *platformStyle, CWallet* wallet, WalletModel *parent):
|
||||
TransactionTableModel::TransactionTableModel(const PlatformStyle *_platformStyle, CWallet* _wallet, WalletModel *parent):
|
||||
QAbstractTableModel(parent),
|
||||
wallet(wallet),
|
||||
wallet(_wallet),
|
||||
walletModel(parent),
|
||||
priv(new TransactionTablePriv(wallet, this)),
|
||||
priv(new TransactionTablePriv(_wallet, this)),
|
||||
fProcessingQueuedTransactions(false),
|
||||
platformStyle(platformStyle)
|
||||
platformStyle(_platformStyle)
|
||||
{
|
||||
columns << QString() << QString() << tr("Date") << tr("Type") << tr("Label") << BitcoinUnits::getAmountColumnTitle(walletModel->getOptionsModel()->getDisplayUnit());
|
||||
priv->refreshWallet();
|
||||
@@ -714,8 +714,8 @@ struct TransactionNotification
|
||||
{
|
||||
public:
|
||||
TransactionNotification() {}
|
||||
TransactionNotification(uint256 hash, ChangeType status, bool showTransaction):
|
||||
hash(hash), status(status), showTransaction(showTransaction) {}
|
||||
TransactionNotification(uint256 _hash, ChangeType _status, bool _showTransaction):
|
||||
hash(_hash), status(_status), showTransaction(_showTransaction) {}
|
||||
|
||||
void invoke(QObject *ttm)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user