highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-13 07:28:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not shadow in src/qt

Browse Source
This commit is contained in:
Pavel Janík
2016-09-09 13:43:29 +02:00
committed by Wladimir J. van der Laan
parent 26b370a937
commit f839350420
33 changed files with 215 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/qt/walletview.cpp
View File

@@ -29,11 +29,11 @@
#include <QPushButton>
#include <QVBoxLayout>
WalletView::WalletView(const PlatformStyle *platformStyle, QWidget *parent):
WalletView::WalletView(const PlatformStyle *_platformStyle, QWidget *parent):
QStackedWidget(parent),
clientModel(0),
walletModel(0),
platformStyle(platformStyle)
platformStyle(_platformStyle)
{
// Create tabs
overviewPage = new OverviewPage(platformStyle);
@@ -104,47 +104,47 @@ void WalletView::setBitcoinGUI(BitcoinGUI *gui)
}
}
void WalletView::setClientModel(ClientModel *clientModel)
void WalletView::setClientModel(ClientModel *_clientModel)
{
this->clientModel = clientModel;
this->clientModel = _clientModel;
overviewPage->setClientModel(clientModel);
sendCoinsPage->setClientModel(clientModel);
overviewPage->setClientModel(_clientModel);
sendCoinsPage->setClientModel(_clientModel);
}
void WalletView::setWalletModel(WalletModel *walletModel)
void WalletView::setWalletModel(WalletModel *_walletModel)
{
this->walletModel = walletModel;
this->walletModel = _walletModel;
// Put transaction list in tabs
transactionView->setModel(walletModel);
overviewPage->setWalletModel(walletModel);
receiveCoinsPage->setModel(walletModel);
sendCoinsPage->setModel(walletModel);
usedReceivingAddressesPage->setModel(walletModel->getAddressTableModel());
usedSendingAddressesPage->setModel(walletModel->getAddressTableModel());
transactionView->setModel(_walletModel);
overviewPage->setWalletModel(_walletModel);
receiveCoinsPage->setModel(_walletModel);
sendCoinsPage->setModel(_walletModel);
usedReceivingAddressesPage->setModel(_walletModel->getAddressTableModel());
usedSendingAddressesPage->setModel(_walletModel->getAddressTableModel());
if (walletModel)
if (_walletModel)
{
// Receive and pass through messages from wallet model
connect(walletModel, SIGNAL(message(QString,QString,unsigned int)), this, SIGNAL(message(QString,QString,unsigned int)));
connect(_walletModel, SIGNAL(message(QString,QString,unsigned int)), this, SIGNAL(message(QString,QString,unsigned int)));
// Handle changes in encryption status
connect(walletModel, SIGNAL(encryptionStatusChanged(int)), this, SIGNAL(encryptionStatusChanged(int)));
connect(_walletModel, SIGNAL(encryptionStatusChanged(int)), this, SIGNAL(encryptionStatusChanged(int)));
updateEncryptionStatus();
// update HD status
Q_EMIT hdEnabledStatusChanged(walletModel->hdEnabled());
Q_EMIT hdEnabledStatusChanged(_walletModel->hdEnabled());
// Balloon pop-up for new transaction
connect(walletModel->getTransactionTableModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
connect(_walletModel->getTransactionTableModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
this, SLOT(processNewTransaction(QModelIndex,int,int)));
// Ask for passphrase if needed
connect(walletModel, SIGNAL(requireUnlock()), this, SLOT(unlockWallet()));
connect(_walletModel, SIGNAL(requireUnlock()), this, SLOT(unlockWallet()));
// Show progress dialog
connect(walletModel, SIGNAL(showProgress(QString,int)), this, SLOT(showProgress(QString,int)));
connect(_walletModel, SIGNAL(showProgress(QString,int)), this, SLOT(showProgress(QString,int)));
}
}