LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #8793: Do not shadow in src/qt

Browse source 
f839350 Do not shadow in src/qt (Pavel Janík)
This commit is contained in:
Wladimir J. van der Laan 2016-09-23 12:44:09 +02:00
commit 5d0219d983
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
33 changed files with 215 additions and 215 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/qt/addressbookpage.cpp
View file

@ -21,12 +21,12 @@
#include <QMessageBox> #include <QMessageBox>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode mode, Tabs tab, QWidget *parent) : AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode, Tabs _tab, QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::AddressBookPage), ui(new Ui::AddressBookPage),
model(0), model(0),
mode(mode), mode(_mode),
tab(tab) tab(_tab)
{ {
ui->setupUi(this); ui->setupUi(this);
@ -107,14 +107,14 @@ AddressBookPage::~AddressBookPage()
delete ui; delete ui;
} }
void AddressBookPage::setModel(AddressTableModel *model) void AddressBookPage::setModel(AddressTableModel *_model)
{ {
this->model = model; this->model = _model;
if(!model) if(!_model)
return; return;
proxyModel = new QSortFilterProxyModel(this); proxyModel = new QSortFilterProxyModel(this);
proxyModel->setSourceModel(model); proxyModel->setSourceModel(_model);
proxyModel->setDynamicSortFilter(true); proxyModel->setDynamicSortFilter(true);
proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive); proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive); proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
@ -147,7 +147,7 @@ void AddressBookPage::setModel(AddressTableModel *model)
this, SLOT(selectionChanged())); this, SLOT(selectionChanged()));
// Select row for newly created address // Select row for newly created address
connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(selectNewAddress(QModelIndex,int,int))); connect(_model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(selectNewAddress(QModelIndex,int,int)));
selectionChanged(); selectionChanged();
} }

12
src/qt/addresstablemodel.cpp
View file

@ -31,8 +31,8 @@ struct AddressTableEntry
QString address; QString address;
AddressTableEntry() {} AddressTableEntry() {}
AddressTableEntry(Type type, const QString &label, const QString &address): AddressTableEntry(Type _type, const QString &_label, const QString &_address):
type(type), label(label), address(address) {} type(_type), label(_label), address(_address) {}
}; };
struct AddressTableEntryLessThan struct AddressTableEntryLessThan
@ -73,8 +73,8 @@ public:
QList<AddressTableEntry> cachedAddressTable; QList<AddressTableEntry> cachedAddressTable;
AddressTableModel *parent; AddressTableModel *parent;
AddressTablePriv(CWallet *wallet, AddressTableModel *parent): AddressTablePriv(CWallet *_wallet, AddressTableModel *_parent):
wallet(wallet), parent(parent) {} wallet(_wallet), parent(_parent) {}
void refreshAddressTable() void refreshAddressTable()
{ {
@ -164,8 +164,8 @@ public:
} }
}; };
AddressTableModel::AddressTableModel(CWallet *wallet, WalletModel *parent) : AddressTableModel::AddressTableModel(CWallet *_wallet, WalletModel *parent) :
QAbstractTableModel(parent),walletModel(parent),wallet(wallet),priv(0) QAbstractTableModel(parent),walletModel(parent),wallet(_wallet),priv(0)
{ {
columns << tr("Label") << tr("Address"); columns << tr("Label") << tr("Address");
priv = new AddressTablePriv(wallet, this); priv = new AddressTablePriv(wallet, this);

8
src/qt/askpassphrasedialog.cpp
View file

@ -18,10 +18,10 @@
#include <QMessageBox> #include <QMessageBox>
#include <QPushButton> #include <QPushButton>
AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget *parent) : AskPassphraseDialog::AskPassphraseDialog(Mode _mode, QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::AskPassphraseDialog), ui(new Ui::AskPassphraseDialog),
mode(mode), mode(_mode),
model(0), model(0),
fCapsLock(false) fCapsLock(false)
{ {
@ -81,9 +81,9 @@ AskPassphraseDialog::~AskPassphraseDialog()
delete ui; delete ui;
} }
void AskPassphraseDialog::setModel(WalletModel *model) void AskPassphraseDialog::setModel(WalletModel *_model)
{ {
this->model = model; this->model = _model;
} }
void AskPassphraseDialog::accept() void AskPassphraseDialog::accept()

44
src/qt/bitcoingui.cpp
View file

@ -75,7 +75,7 @@ const std::string BitcoinGUI::DEFAULT_UIPLATFORM =
const QString BitcoinGUI::DEFAULT_WALLET = "~Default"; const QString BitcoinGUI::DEFAULT_WALLET = "~Default";
BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *networkStyle, QWidget *parent) : BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *networkStyle, QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
enableWallet(false), enableWallet(false),
clientModel(0), clientModel(0),
@ -117,7 +117,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
helpMessageDialog(0), helpMessageDialog(0),
prevBlocks(0), prevBlocks(0),
spinnerFrame(0), spinnerFrame(0),
platformStyle(platformStyle) platformStyle(_platformStyle)
{ {
GUIUtil::restoreWindowGeometry("nWindow", QSize(850, 550), this); GUIUtil::restoreWindowGeometry("nWindow", QSize(850, 550), this);
@ -146,13 +146,13 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
setUnifiedTitleAndToolBarOnMac(true); setUnifiedTitleAndToolBarOnMac(true);
#endif #endif
rpcConsole = new RPCConsole(platformStyle, 0); rpcConsole = new RPCConsole(_platformStyle, 0);
helpMessageDialog = new HelpMessageDialog(this, false); helpMessageDialog = new HelpMessageDialog(this, false);
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
if(enableWallet) if(enableWallet)
{ {
/** Create wallet frame and make it the central widget */ /** Create wallet frame and make it the central widget */
walletFrame = new WalletFrame(platformStyle, this); walletFrame = new WalletFrame(_platformStyle, this);
setCentralWidget(walletFrame); setCentralWidget(walletFrame);
} else } else
#endif // ENABLE_WALLET #endif // ENABLE_WALLET
@ -449,38 +449,38 @@ void BitcoinGUI::createToolBars()
} }
} }
void BitcoinGUI::setClientModel(ClientModel *clientModel) void BitcoinGUI::setClientModel(ClientModel *_clientModel)
{ {
this->clientModel = clientModel; this->clientModel = _clientModel;
if(clientModel) if(_clientModel)
{ {
// Create system tray menu (or setup the dock menu) that late to prevent users from calling actions, // Create system tray menu (or setup the dock menu) that late to prevent users from calling actions,
// while the client has not yet fully loaded // while the client has not yet fully loaded
createTrayIconMenu(); createTrayIconMenu();
// Keep up to date with client // Keep up to date with client
setNumConnections(clientModel->getNumConnections()); setNumConnections(_clientModel->getNumConnections());
connect(clientModel, SIGNAL(numConnectionsChanged(int)), this, SLOT(setNumConnections(int))); connect(_clientModel, SIGNAL(numConnectionsChanged(int)), this, SLOT(setNumConnections(int)));
setNumBlocks(clientModel->getNumBlocks(), clientModel->getLastBlockDate(), clientModel->getVerificationProgress(NULL), false); setNumBlocks(_clientModel->getNumBlocks(), _clientModel->getLastBlockDate(), _clientModel->getVerificationProgress(NULL), false);
connect(clientModel, SIGNAL(numBlocksChanged(int,QDateTime,double,bool)), this, SLOT(setNumBlocks(int,QDateTime,double,bool))); connect(_clientModel, SIGNAL(numBlocksChanged(int,QDateTime,double,bool)), this, SLOT(setNumBlocks(int,QDateTime,double,bool)));
// Receive and report messages from client model // Receive and report messages from client model
connect(clientModel, SIGNAL(message(QString,QString,unsigned int)), this, SLOT(message(QString,QString,unsigned int))); connect(_clientModel, SIGNAL(message(QString,QString,unsigned int)), this, SLOT(message(QString,QString,unsigned int)));
// Show progress dialog // Show progress dialog
connect(clientModel, SIGNAL(showProgress(QString,int)), this, SLOT(showProgress(QString,int))); connect(_clientModel, SIGNAL(showProgress(QString,int)), this, SLOT(showProgress(QString,int)));
rpcConsole->setClientModel(clientModel); rpcConsole->setClientModel(_clientModel);
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
if(walletFrame) if(walletFrame)
{ {
walletFrame->setClientModel(clientModel); walletFrame->setClientModel(_clientModel);
} }
#endif // ENABLE_WALLET #endif // ENABLE_WALLET
unitDisplayControl->setOptionsModel(clientModel->getOptionsModel()); unitDisplayControl->setOptionsModel(_clientModel->getOptionsModel());
OptionsModel* optionsModel = clientModel->getOptionsModel(); OptionsModel* optionsModel = _clientModel->getOptionsModel();
if(optionsModel) if(optionsModel)
{ {
// be aware of the tray icon disable state change reported by the OptionsModel object. // be aware of the tray icon disable state change reported by the OptionsModel object.
@ -1168,17 +1168,17 @@ void UnitDisplayStatusBarControl::createContextMenu()
} }
/** Lets the control know about the Options Model (and its signals) */ /** Lets the control know about the Options Model (and its signals) */
void UnitDisplayStatusBarControl::setOptionsModel(OptionsModel *optionsModel) void UnitDisplayStatusBarControl::setOptionsModel(OptionsModel *_optionsModel)
{ {
if (optionsModel) if (_optionsModel)
{ {
this->optionsModel = optionsModel; this->optionsModel = _optionsModel;
// be aware of a display unit change reported by the OptionsModel object. // be aware of a display unit change reported by the OptionsModel object.
connect(optionsModel,SIGNAL(displayUnitChanged(int)),this,SLOT(updateDisplayUnit(int))); connect(_optionsModel,SIGNAL(displayUnitChanged(int)),this,SLOT(updateDisplayUnit(int)));
// initialize the display units label with the current value in the model. // initialize the display units label with the current value in the model.
updateDisplayUnit(optionsModel->getDisplayUnit()); updateDisplayUnit(_optionsModel->getDisplayUnit());
} }
} }

4
src/qt/clientmodel.cpp
View file

@ -27,9 +27,9 @@ static const int64_t nClientStartupTime = GetTime();
static int64_t nLastHeaderTipUpdateNotification = 0; static int64_t nLastHeaderTipUpdateNotification = 0;
static int64_t nLastBlockTipUpdateNotification = 0; static int64_t nLastBlockTipUpdateNotification = 0;
ClientModel::ClientModel(OptionsModel *optionsModel, QObject *parent) : ClientModel::ClientModel(OptionsModel *_optionsModel, QObject *parent) :
QObject(parent), QObject(parent),
optionsModel(optionsModel), optionsModel(_optionsModel),
peerTableModel(0), peerTableModel(0),
banTableModel(0), banTableModel(0),
pollTimer(0) pollTimer(0)

12
src/qt/coincontroldialog.cpp
View file

@ -35,11 +35,11 @@ QList<CAmount> CoinControlDialog::payAmounts;
CCoinControl* CoinControlDialog::coinControl = new CCoinControl(); CCoinControl* CoinControlDialog::coinControl = new CCoinControl();
bool CoinControlDialog::fSubtractFeeFromAmount = false; bool CoinControlDialog::fSubtractFeeFromAmount = false;
CoinControlDialog::CoinControlDialog(const PlatformStyle *platformStyle, QWidget *parent) : CoinControlDialog::CoinControlDialog(const PlatformStyle *_platformStyle, QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::CoinControlDialog), ui(new Ui::CoinControlDialog),
model(0), model(0),
platformStyle(platformStyle) platformStyle(_platformStyle)
{ {
ui->setupUi(this); ui->setupUi(this);
@ -152,15 +152,15 @@ CoinControlDialog::~CoinControlDialog()
delete ui; delete ui;
} }
void CoinControlDialog::setModel(WalletModel *model) void CoinControlDialog::setModel(WalletModel *_model)
{ {
this->model = model; this->model = _model;
if(model && model->getOptionsModel() && model->getAddressTableModel()) if(_model && _model->getOptionsModel() && _model->getAddressTableModel())
{ {
updateView(); updateView();
updateLabelLocked(); updateLabelLocked();
CoinControlDialog::updateLabels(model, this); CoinControlDialog::updateLabels(_model, this);
} }
} }

8
src/qt/csvmodelwriter.cpp
View file

@ -8,15 +8,15 @@
#include <QFile> #include <QFile>
#include <QTextStream> #include <QTextStream>
CSVModelWriter::CSVModelWriter(const QString &filename, QObject *parent) : CSVModelWriter::CSVModelWriter(const QString &_filename, QObject *parent) :
QObject(parent), QObject(parent),
filename(filename), model(0) filename(_filename), model(0)
{ {
} }
void CSVModelWriter::setModel(const QAbstractItemModel *model) void CSVModelWriter::setModel(const QAbstractItemModel *_model)
{ {
this->model = model; this->model = _model;
} }
void CSVModelWriter::addColumn(const QString &title, int column, int role) void CSVModelWriter::addColumn(const QString &title, int column, int role)

18
src/qt/editaddressdialog.cpp
View file

@ -11,11 +11,11 @@
#include <QDataWidgetMapper> #include <QDataWidgetMapper>
#include <QMessageBox> #include <QMessageBox>
EditAddressDialog::EditAddressDialog(Mode mode, QWidget *parent) : EditAddressDialog::EditAddressDialog(Mode _mode, QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::EditAddressDialog), ui(new Ui::EditAddressDialog),
mapper(0), mapper(0),
mode(mode), mode(_mode),
model(0) model(0)
{ {
ui->setupUi(this); ui->setupUi(this);
@ -49,13 +49,13 @@ EditAddressDialog::~EditAddressDialog()
delete ui; delete ui;
} }
void EditAddressDialog::setModel(AddressTableModel *model) void EditAddressDialog::setModel(AddressTableModel *_model)
{ {
this->model = model; this->model = _model;
if(!model) if(!_model)
return; return;
mapper->setModel(model); mapper->setModel(_model);
mapper->addMapping(ui->labelEdit, AddressTableModel::Label); mapper->addMapping(ui->labelEdit, AddressTableModel::Label);
mapper->addMapping(ui->addressEdit, AddressTableModel::Address); mapper->addMapping(ui->addressEdit, AddressTableModel::Address);
} }
@ -137,8 +137,8 @@ QString EditAddressDialog::getAddress() const
return address; return address;
} }
void EditAddressDialog::setAddress(const QString &address) void EditAddressDialog::setAddress(const QString &_address)
{ {
this->address = address; this->address = _address;
ui->addressEdit->setText(address); ui->addressEdit->setText(_address);
} }

4
src/qt/guiutil.cpp
View file

@ -462,9 +462,9 @@ void SubstituteFonts(const QString& language)
#endif #endif
} }
ToolTipToRichTextFilter::ToolTipToRichTextFilter(int size_threshold, QObject *parent) : ToolTipToRichTextFilter::ToolTipToRichTextFilter(int _size_threshold, QObject *parent) :
QObject(parent), QObject(parent),
size_threshold(size_threshold) size_threshold(_size_threshold)
{ {
} }

4
src/qt/intro.cpp
View file

@ -63,9 +63,9 @@ private:
#include "intro.moc" #include "intro.moc"
FreespaceChecker::FreespaceChecker(Intro *intro) FreespaceChecker::FreespaceChecker(Intro *_intro)
{ {
this->intro = intro; this->intro = _intro;
} }
void FreespaceChecker::check() void FreespaceChecker::check()

6
src/qt/networkstyle.cpp
View file

@ -22,9 +22,9 @@ static const struct {
static const unsigned network_styles_count = sizeof(network_styles)/sizeof(*network_styles); static const unsigned network_styles_count = sizeof(network_styles)/sizeof(*network_styles);
// titleAddText needs to be const char* for tr() // titleAddText needs to be const char* for tr()
NetworkStyle::NetworkStyle(const QString &appName, const int iconColorHueShift, const int iconColorSaturationReduction, const char *titleAddText): NetworkStyle::NetworkStyle(const QString &_appName, const int iconColorHueShift, const int iconColorSaturationReduction, const char *_titleAddText):
appName(appName), appName(_appName),
titleAddText(qApp->translate("SplashScreen", titleAddText)) titleAddText(qApp->translate("SplashScreen", _titleAddText))
{ {
// load pixmap // load pixmap
QPixmap pixmap(":/icons/bitcoin"); QPixmap pixmap(":/icons/bitcoin");

12
src/qt/notificator.cpp
View file

@ -33,17 +33,17 @@
const int FREEDESKTOP_NOTIFICATION_ICON_SIZE = 128; const int FREEDESKTOP_NOTIFICATION_ICON_SIZE = 128;
#endif #endif
Notificator::Notificator(const QString &programName, QSystemTrayIcon *trayicon, QWidget *parent) : Notificator::Notificator(const QString &_programName, QSystemTrayIcon *_trayIcon, QWidget *_parent) :
QObject(parent), QObject(_parent),
parent(parent), parent(_parent),
programName(programName), programName(_programName),
mode(None), mode(None),
trayIcon(trayicon) trayIcon(_trayIcon)
#ifdef USE_DBUS #ifdef USE_DBUS
,interface(0) ,interface(0)
#endif #endif
{ {
if(trayicon && trayicon->supportsMessages()) if(_trayIcon && _trayIcon->supportsMessages())
{ {
mode = QSystemTray; mode = QSystemTray;
} }

12
src/qt/optionsdialog.cpp
View file

@ -135,22 +135,22 @@ OptionsDialog::~OptionsDialog()
delete ui; delete ui;
} }
void OptionsDialog::setModel(OptionsModel *model) void OptionsDialog::setModel(OptionsModel *_model)
{ {
this->model = model; this->model = _model;
if(model) if(_model)
{ {
/* check if client restart is needed and show persistent message */ /* check if client restart is needed and show persistent message */
if (model->isRestartRequired()) if (_model->isRestartRequired())
showRestartWarning(true); showRestartWarning(true);
QString strLabel = model->getOverriddenByCommandLine(); QString strLabel = _model->getOverriddenByCommandLine();
if (strLabel.isEmpty()) if (strLabel.isEmpty())
strLabel = tr("none"); strLabel = tr("none");
ui->overriddenByCommandLineLabel->setText(strLabel); ui->overriddenByCommandLineLabel->setText(strLabel);
mapper->setModel(model); mapper->setModel(_model);
setMapper(); setMapper();
mapper->toFirst(); mapper->toFirst();

4
src/qt/overviewpage.cpp
View file

@ -25,9 +25,9 @@ class TxViewDelegate : public QAbstractItemDelegate
{ {
Q_OBJECT Q_OBJECT
public: public:
TxViewDelegate(const PlatformStyle *platformStyle): TxViewDelegate(const PlatformStyle *_platformStyle):
QAbstractItemDelegate(), unit(BitcoinUnits::BTC), QAbstractItemDelegate(), unit(BitcoinUnits::BTC),
platformStyle(platformStyle) platformStyle(_platformStyle)
{ {
} }

4
src/qt/paymentserver.cpp
View file

@ -749,9 +749,9 @@ void PaymentServer::reportSslErrors(QNetworkReply* reply, const QList<QSslError>
Q_EMIT message(tr("Network request error"), errString, CClientUIInterface::MSG_ERROR); Q_EMIT message(tr("Network request error"), errString, CClientUIInterface::MSG_ERROR);
} }
void PaymentServer::setOptionsModel(OptionsModel *optionsModel) void PaymentServer::setOptionsModel(OptionsModel *_optionsModel)
{ {
this->optionsModel = optionsModel; this->optionsModel = _optionsModel;
} }
void PaymentServer::handlePaymentACK(const QString& paymentACKMsg) void PaymentServer::handlePaymentACK(const QString& paymentACKMsg)

10
src/qt/platformstyle.cpp
View file

@ -73,11 +73,11 @@ QIcon ColorizeIcon(const QString& filename, const QColor& colorbase)
} }
PlatformStyle::PlatformStyle(const QString &name, bool imagesOnButtons, bool colorizeIcons, bool useExtraSpacing): PlatformStyle::PlatformStyle(const QString &_name, bool _imagesOnButtons, bool _colorizeIcons, bool _useExtraSpacing):
name(name), name(_name),
imagesOnButtons(imagesOnButtons), imagesOnButtons(_imagesOnButtons),
colorizeIcons(colorizeIcons), colorizeIcons(_colorizeIcons),
useExtraSpacing(useExtraSpacing), useExtraSpacing(_useExtraSpacing),
singleColor(0,0,0), singleColor(0,0,0),
textColor(0,0,0) textColor(0,0,0)
{ {

8
src/qt/qvalidatedlineedit.cpp
View file

@ -15,14 +15,14 @@ QValidatedLineEdit::QValidatedLineEdit(QWidget *parent) :
connect(this, SIGNAL(textChanged(QString)), this, SLOT(markValid())); connect(this, SIGNAL(textChanged(QString)), this, SLOT(markValid()));
} }
void QValidatedLineEdit::setValid(bool valid) void QValidatedLineEdit::setValid(bool _valid)
{ {
if(valid == this->valid) if(_valid == this->valid)
{ {
return; return;
} }
if(valid) if(_valid)
{ {
setStyleSheet(""); setStyleSheet("");
} }
@ -30,7 +30,7 @@ void QValidatedLineEdit::setValid(bool valid)
{ {
setStyleSheet(STYLE_INVALID); setStyleSheet(STYLE_INVALID);
} }
this->valid = valid; this->valid = _valid;
} }
void QValidatedLineEdit::focusInEvent(QFocusEvent *evt) void QValidatedLineEdit::focusInEvent(QFocusEvent *evt)

4
src/qt/qvaluecombobox.cpp
View file

@ -20,9 +20,9 @@ void QValueComboBox::setValue(const QVariant &value)
setCurrentIndex(findData(value, role)); setCurrentIndex(findData(value, role));
} }
void QValueComboBox::setRole(int role) void QValueComboBox::setRole(int _role)
{ {
this->role = role; this->role = _role;
} }
void QValueComboBox::handleSelectionChanged(int idx) void QValueComboBox::handleSelectionChanged(int idx)

26
src/qt/receivecoinsdialog.cpp
View file

@ -22,24 +22,24 @@
#include <QScrollBar> #include <QScrollBar>
#include <QTextDocument> #include <QTextDocument>
ReceiveCoinsDialog::ReceiveCoinsDialog(const PlatformStyle *platformStyle, QWidget *parent) : ReceiveCoinsDialog::ReceiveCoinsDialog(const PlatformStyle *_platformStyle, QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::ReceiveCoinsDialog), ui(new Ui::ReceiveCoinsDialog),
model(0), model(0),
platformStyle(platformStyle) platformStyle(_platformStyle)
{ {
ui->setupUi(this); ui->setupUi(this);
if (!platformStyle->getImagesOnButtons()) { if (!_platformStyle->getImagesOnButtons()) {
ui->clearButton->setIcon(QIcon()); ui->clearButton->setIcon(QIcon());
ui->receiveButton->setIcon(QIcon()); ui->receiveButton->setIcon(QIcon());
ui->showRequestButton->setIcon(QIcon()); ui->showRequestButton->setIcon(QIcon());
ui->removeRequestButton->setIcon(QIcon()); ui->removeRequestButton->setIcon(QIcon());
} else { } else {
ui->clearButton->setIcon(platformStyle->SingleColorIcon(":/icons/remove")); ui->clearButton->setIcon(_platformStyle->SingleColorIcon(":/icons/remove"));
ui->receiveButton->setIcon(platformStyle->SingleColorIcon(":/icons/receiving_addresses")); ui->receiveButton->setIcon(_platformStyle->SingleColorIcon(":/icons/receiving_addresses"));
ui->showRequestButton->setIcon(platformStyle->SingleColorIcon(":/icons/edit")); ui->showRequestButton->setIcon(_platformStyle->SingleColorIcon(":/icons/edit"));
ui->removeRequestButton->setIcon(platformStyle->SingleColorIcon(":/icons/remove")); ui->removeRequestButton->setIcon(_platformStyle->SingleColorIcon(":/icons/remove"));
} }
// context menu actions // context menu actions
@ -62,21 +62,21 @@ ReceiveCoinsDialog::ReceiveCoinsDialog(const PlatformStyle *platformStyle, QWidg
connect(ui->clearButton, SIGNAL(clicked()), this, SLOT(clear())); connect(ui->clearButton, SIGNAL(clicked()), this, SLOT(clear()));
} }
void ReceiveCoinsDialog::setModel(WalletModel *model) void ReceiveCoinsDialog::setModel(WalletModel *_model)
{ {
this->model = model; this->model = _model;
if(model && model->getOptionsModel()) if(_model && _model->getOptionsModel())
{ {
model->getRecentRequestsTableModel()->sort(RecentRequestsTableModel::Date, Qt::DescendingOrder); _model->getRecentRequestsTableModel()->sort(RecentRequestsTableModel::Date, Qt::DescendingOrder);
connect(model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit())); connect(_model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));
updateDisplayUnit(); updateDisplayUnit();
QTableView* tableView = ui->recentRequestsView; QTableView* tableView = ui->recentRequestsView;
tableView->verticalHeader()->hide(); tableView->verticalHeader()->hide();
tableView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); tableView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
tableView->setModel(model->getRecentRequestsTableModel()); tableView->setModel(_model->getRecentRequestsTableModel());
tableView->setAlternatingRowColors(true); tableView->setAlternatingRowColors(true);
tableView->setSelectionBehavior(QAbstractItemView::SelectRows); tableView->setSelectionBehavior(QAbstractItemView::SelectRows);
tableView->setSelectionMode(QAbstractItemView::ContiguousSelection); tableView->setSelectionMode(QAbstractItemView::ContiguousSelection);

12
src/qt/receiverequestdialog.cpp
View file

@ -109,20 +109,20 @@ ReceiveRequestDialog::~ReceiveRequestDialog()
delete ui; delete ui;
} }
void ReceiveRequestDialog::setModel(OptionsModel *model) void ReceiveRequestDialog::setModel(OptionsModel *_model)
{ {
this->model = model; this->model = _model;
if (model) if (_model)
connect(model, SIGNAL(displayUnitChanged(int)), this, SLOT(update())); connect(_model, SIGNAL(displayUnitChanged(int)), this, SLOT(update()));
// update the display unit if necessary // update the display unit if necessary
update(); update();
} }
void ReceiveRequestDialog::setInfo(const SendCoinsRecipient &info) void ReceiveRequestDialog::setInfo(const SendCoinsRecipient &_info)
{ {
this->info = info; this->info = _info;
update(); update();
} }

8
src/qt/rpcconsole.cpp
View file

@ -83,8 +83,8 @@ class QtRPCTimerBase: public QObject, public RPCTimerBase
{ {
Q_OBJECT Q_OBJECT
public: public:
QtRPCTimerBase(boost::function<void(void)>& func, int64_t millis): QtRPCTimerBase(boost::function<void(void)>& _func, int64_t millis):
func(func) func(_func)
{ {
timer.setSingleShot(true); timer.setSingleShot(true);
connect(&timer, SIGNAL(timeout()), this, SLOT(timeout())); connect(&timer, SIGNAL(timeout()), this, SLOT(timeout()));
@ -335,13 +335,13 @@ void RPCExecutor::request(const QString &command)
} }
} }
RPCConsole::RPCConsole(const PlatformStyle *platformStyle, QWidget *parent) : RPCConsole::RPCConsole(const PlatformStyle *_platformStyle, QWidget *parent) :
QWidget(parent), QWidget(parent),
ui(new Ui::RPCConsole), ui(new Ui::RPCConsole),
clientModel(0), clientModel(0),
historyPtr(0), historyPtr(0),
cachedNodeid(-1), cachedNodeid(-1),
platformStyle(platformStyle), platformStyle(_platformStyle),
peersTableContextMenu(0), peersTableContextMenu(0),
banTableContextMenu(0), banTableContextMenu(0),
consoleFontSize(0) consoleFontSize(0)

46
src/qt/sendcoinsdialog.cpp
View file

@ -30,25 +30,25 @@
#define SEND_CONFIRM_DELAY 3 #define SEND_CONFIRM_DELAY 3
SendCoinsDialog::SendCoinsDialog(const PlatformStyle *platformStyle, QWidget *parent) : SendCoinsDialog::SendCoinsDialog(const PlatformStyle *_platformStyle, QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::SendCoinsDialog), ui(new Ui::SendCoinsDialog),
clientModel(0), clientModel(0),
model(0), model(0),
fNewRecipientAllowed(true), fNewRecipientAllowed(true),
fFeeMinimized(true), fFeeMinimized(true),
platformStyle(platformStyle) platformStyle(_platformStyle)
{ {
ui->setupUi(this); ui->setupUi(this);
if (!platformStyle->getImagesOnButtons()) { if (!_platformStyle->getImagesOnButtons()) {
ui->addButton->setIcon(QIcon()); ui->addButton->setIcon(QIcon());
ui->clearButton->setIcon(QIcon()); ui->clearButton->setIcon(QIcon());
ui->sendButton->setIcon(QIcon()); ui->sendButton->setIcon(QIcon());
} else { } else {
ui->addButton->setIcon(platformStyle->SingleColorIcon(":/icons/add")); ui->addButton->setIcon(_platformStyle->SingleColorIcon(":/icons/add"));
ui->clearButton->setIcon(platformStyle->SingleColorIcon(":/icons/remove")); ui->clearButton->setIcon(_platformStyle->SingleColorIcon(":/icons/remove"));
ui->sendButton->setIcon(platformStyle->SingleColorIcon(":/icons/send")); ui->sendButton->setIcon(_platformStyle->SingleColorIcon(":/icons/send"));
} }
GUIUtil::setupAddressWidget(ui->lineEditCoinControlChange, this); GUIUtil::setupAddressWidget(ui->lineEditCoinControlChange, this);
@ -116,40 +116,40 @@ SendCoinsDialog::SendCoinsDialog(const PlatformStyle *platformStyle, QWidget *pa
minimizeFeeSection(settings.value("fFeeSectionMinimized").toBool()); minimizeFeeSection(settings.value("fFeeSectionMinimized").toBool());
} }
void SendCoinsDialog::setClientModel(ClientModel *clientModel) void SendCoinsDialog::setClientModel(ClientModel *_clientModel)
{ {
this->clientModel = clientModel; this->clientModel = _clientModel;
if (clientModel) { if (_clientModel) {
connect(clientModel, SIGNAL(numBlocksChanged(int,QDateTime,double,bool)), this, SLOT(updateSmartFeeLabel())); connect(_clientModel, SIGNAL(numBlocksChanged(int,QDateTime,double,bool)), this, SLOT(updateSmartFeeLabel()));
} }
} }
void SendCoinsDialog::setModel(WalletModel *model) void SendCoinsDialog::setModel(WalletModel *_model)
{ {
this->model = model; this->model = _model;
if(model && model->getOptionsModel()) if(_model && _model->getOptionsModel())
{ {
for(int i = 0; i < ui->entries->count(); ++i) for(int i = 0; i < ui->entries->count(); ++i)
{ {
SendCoinsEntry *entry = qobject_cast<SendCoinsEntry*>(ui->entries->itemAt(i)->widget()); SendCoinsEntry *entry = qobject_cast<SendCoinsEntry*>(ui->entries->itemAt(i)->widget());
if(entry) if(entry)
{ {
entry->setModel(model); entry->setModel(_model);
} }
} }
setBalance(model->getBalance(), model->getUnconfirmedBalance(), model->getImmatureBalance(), setBalance(_model->getBalance(), _model->getUnconfirmedBalance(), _model->getImmatureBalance(),
model->getWatchBalance(), model->getWatchUnconfirmedBalance(), model->getWatchImmatureBalance()); _model->getWatchBalance(), _model->getWatchUnconfirmedBalance(), _model->getWatchImmatureBalance());
connect(model, SIGNAL(balanceChanged(CAmount,CAmount,CAmount,CAmount,CAmount,CAmount)), this, SLOT(setBalance(CAmount,CAmount,CAmount,CAmount,CAmount,CAmount))); connect(_model, SIGNAL(balanceChanged(CAmount,CAmount,CAmount,CAmount,CAmount,CAmount)), this, SLOT(setBalance(CAmount,CAmount,CAmount,CAmount,CAmount,CAmount)));
connect(model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit())); connect(_model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));
updateDisplayUnit(); updateDisplayUnit();
// Coin Control // Coin Control
connect(model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(coinControlUpdateLabels())); connect(_model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(coinControlUpdateLabels()));
connect(model->getOptionsModel(), SIGNAL(coinControlFeaturesChanged(bool)), this, SLOT(coinControlFeatureChanged(bool))); connect(_model->getOptionsModel(), SIGNAL(coinControlFeaturesChanged(bool)), this, SLOT(coinControlFeatureChanged(bool)));
ui->frameCoinControl->setVisible(model->getOptionsModel()->getCoinControlFeatures()); ui->frameCoinControl->setVisible(_model->getOptionsModel()->getCoinControlFeatures());
coinControlUpdateLabels(); coinControlUpdateLabels();
// fee section // fee section
@ -826,9 +826,9 @@ void SendCoinsDialog::coinControlUpdateLabels()
} }
} }
SendConfirmationDialog::SendConfirmationDialog(const QString &title, const QString &text, int secDelay, SendConfirmationDialog::SendConfirmationDialog(const QString &title, const QString &text, int _secDelay,
QWidget *parent) : QWidget *parent) :
QMessageBox(QMessageBox::Question, title, text, QMessageBox::Yes | QMessageBox::Cancel, parent), secDelay(secDelay) QMessageBox(QMessageBox::Question, title, text, QMessageBox::Yes | QMessageBox::Cancel, parent), secDelay(_secDelay)
{ {
setDefaultButton(QMessageBox::Cancel); setDefaultButton(QMessageBox::Cancel);
yesButton = button(QMessageBox::Yes); yesButton = button(QMessageBox::Yes);

12
src/qt/sendcoinsentry.cpp
View file

@ -15,11 +15,11 @@
#include <QApplication> #include <QApplication>
#include <QClipboard> #include <QClipboard>
SendCoinsEntry::SendCoinsEntry(const PlatformStyle *platformStyle, QWidget *parent) : SendCoinsEntry::SendCoinsEntry(const PlatformStyle *_platformStyle, QWidget *parent) :
QStackedWidget(parent), QStackedWidget(parent),
ui(new Ui::SendCoinsEntry), ui(new Ui::SendCoinsEntry),
model(0), model(0),
platformStyle(platformStyle) platformStyle(_platformStyle)
{ {
ui->setupUi(this); ui->setupUi(this);
@ -79,12 +79,12 @@ void SendCoinsEntry::on_payTo_textChanged(const QString &address)
updateLabel(address); updateLabel(address);
} }
void SendCoinsEntry::setModel(WalletModel *model) void SendCoinsEntry::setModel(WalletModel *_model)
{ {
this->model = model; this->model = _model;
if (model && model->getOptionsModel()) if (_model && _model->getOptionsModel())
connect(model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit())); connect(_model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));
clear(); clear();
} }

8
src/qt/signverifymessagedialog.cpp
View file

@ -20,11 +20,11 @@
#include <QClipboard> #include <QClipboard>
SignVerifyMessageDialog::SignVerifyMessageDialog(const PlatformStyle *platformStyle, QWidget *parent) : SignVerifyMessageDialog::SignVerifyMessageDialog(const PlatformStyle *_platformStyle, QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::SignVerifyMessageDialog), ui(new Ui::SignVerifyMessageDialog),
model(0), model(0),
platformStyle(platformStyle) platformStyle(_platformStyle)
{ {
ui->setupUi(this); ui->setupUi(this);
@ -60,9 +60,9 @@ SignVerifyMessageDialog::~SignVerifyMessageDialog()
delete ui; delete ui;
} }
void SignVerifyMessageDialog::setModel(WalletModel *model) void SignVerifyMessageDialog::setModel(WalletModel *_model)
{ {
this->model = model; this->model = _model;
} }
void SignVerifyMessageDialog::setAddress_SM(const QString &address) void SignVerifyMessageDialog::setAddress_SM(const QString &address)

8
src/qt/transactionfilterproxy.cpp
View file

@ -66,9 +66,9 @@ void TransactionFilterProxy::setDateRange(const QDateTime &from, const QDateTime
invalidateFilter(); invalidateFilter();
} }
void TransactionFilterProxy::setAddressPrefix(const QString &addrPrefix) void TransactionFilterProxy::setAddressPrefix(const QString &_addrPrefix)
{ {
this->addrPrefix = addrPrefix; this->addrPrefix = _addrPrefix;
invalidateFilter(); invalidateFilter();
} }
@ -95,9 +95,9 @@ void TransactionFilterProxy::setLimit(int limit)
this->limitRows = limit; this->limitRows = limit;
} }
void TransactionFilterProxy::setShowInactive(bool showInactive) void TransactionFilterProxy::setShowInactive(bool _showInactive)
{ {
this->showInactive = showInactive; this->showInactive = _showInactive;
invalidateFilter(); invalidateFilter();
} }

12
src/qt/transactionrecord.h
View file

@ -88,16 +88,16 @@ public:
{ {
} }
TransactionRecord(uint256 hash, qint64 time): TransactionRecord(uint256 _hash, qint64 _time):
hash(hash), time(time), type(Other), address(""), debit(0), hash(_hash), time(_time), type(Other), address(""), debit(0),
credit(0), idx(0) credit(0), idx(0)
{ {
} }
TransactionRecord(uint256 hash, qint64 time, TransactionRecord(uint256 _hash, qint64 _time,
Type type, const std::string &address, Type _type, const std::string &_address,
const CAmount& debit, const CAmount& credit): const CAmount& _debit, const CAmount& _credit):
hash(hash), time(time), type(type), address(address), debit(debit), credit(credit), hash(_hash), time(_time), type(_type), address(_address), debit(_debit), credit(_credit),
idx(0) idx(0)
{ {
} }

18
src/qt/transactiontablemodel.cpp
View file

@ -59,9 +59,9 @@ struct TxLessThan
class TransactionTablePriv class TransactionTablePriv
{ {
public: public:
TransactionTablePriv(CWallet *wallet, TransactionTableModel *parent) : TransactionTablePriv(CWallet *_wallet, TransactionTableModel *_parent) :
wallet(wallet), wallet(_wallet),
parent(parent) 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), QAbstractTableModel(parent),
wallet(wallet), wallet(_wallet),
walletModel(parent), walletModel(parent),
priv(new TransactionTablePriv(wallet, this)), priv(new TransactionTablePriv(_wallet, this)),
fProcessingQueuedTransactions(false), fProcessingQueuedTransactions(false),
platformStyle(platformStyle) platformStyle(_platformStyle)
{ {
columns << QString() << QString() << tr("Date") << tr("Type") << tr("Label") << BitcoinUnits::getAmountColumnTitle(walletModel->getOptionsModel()->getDisplayUnit()); columns << QString() << QString() << tr("Date") << tr("Type") << tr("Label") << BitcoinUnits::getAmountColumnTitle(walletModel->getOptionsModel()->getDisplayUnit());
priv->refreshWallet(); priv->refreshWallet();
@ -714,8 +714,8 @@ struct TransactionNotification
{ {
public: public:
TransactionNotification() {} TransactionNotification() {}
TransactionNotification(uint256 hash, ChangeType status, bool showTransaction): TransactionNotification(uint256 _hash, ChangeType _status, bool _showTransaction):
hash(hash), status(status), showTransaction(showTransaction) {} hash(_hash), status(_status), showTransaction(_showTransaction) {}
void invoke(QObject *ttm) void invoke(QObject *ttm)
{ {

16
src/qt/transactionview.cpp
View file

@ -184,13 +184,13 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
connect(showDetailsAction, SIGNAL(triggered()), this, SLOT(showDetails())); connect(showDetailsAction, SIGNAL(triggered()), this, SLOT(showDetails()));
} }
void TransactionView::setModel(WalletModel *model) void TransactionView::setModel(WalletModel *_model)
{ {
this->model = model; this->model = _model;
if(model) if(_model)
{ {
transactionProxyModel = new TransactionFilterProxy(this); transactionProxyModel = new TransactionFilterProxy(this);
transactionProxyModel->setSourceModel(model->getTransactionTableModel()); transactionProxyModel->setSourceModel(_model->getTransactionTableModel());
transactionProxyModel->setDynamicSortFilter(true); transactionProxyModel->setDynamicSortFilter(true);
transactionProxyModel->setSortCaseSensitivity(Qt::CaseInsensitive); transactionProxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
transactionProxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive); transactionProxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
@ -214,10 +214,10 @@ void TransactionView::setModel(WalletModel *model)
columnResizingFixer = new GUIUtil::TableViewLastColumnResizingFixer(transactionView, AMOUNT_MINIMUM_COLUMN_WIDTH, MINIMUM_COLUMN_WIDTH); columnResizingFixer = new GUIUtil::TableViewLastColumnResizingFixer(transactionView, AMOUNT_MINIMUM_COLUMN_WIDTH, MINIMUM_COLUMN_WIDTH);
if (model->getOptionsModel()) if (_model->getOptionsModel())
{ {
// Add third party transaction URLs to context menu // Add third party transaction URLs to context menu
QStringList listUrls = model->getOptionsModel()->getThirdPartyTxUrls().split("|", QString::SkipEmptyParts); QStringList listUrls = _model->getOptionsModel()->getThirdPartyTxUrls().split("|", QString::SkipEmptyParts);
for (int i = 0; i < listUrls.size(); ++i) for (int i = 0; i < listUrls.size(); ++i)
{ {
QString host = QUrl(listUrls[i].trimmed(), QUrl::StrictMode).host(); QString host = QUrl(listUrls[i].trimmed(), QUrl::StrictMode).host();
@ -234,10 +234,10 @@ void TransactionView::setModel(WalletModel *model)
} }
// show/hide column Watch-only // show/hide column Watch-only
updateWatchOnlyColumn(model->haveWatchOnly()); updateWatchOnlyColumn(_model->haveWatchOnly());
// Watch-only signal // Watch-only signal
connect(model, SIGNAL(notifyWatchonlyChanged(bool)), this, SLOT(updateWatchOnlyColumn(bool))); connect(_model, SIGNAL(notifyWatchonlyChanged(bool)), this, SLOT(updateWatchOnlyColumn(bool)));
} }
} }

8
src/qt/walletframe.cpp
View file

@ -12,10 +12,10 @@
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QLabel> #include <QLabel>
WalletFrame::WalletFrame(const PlatformStyle *platformStyle, BitcoinGUI *_gui) : WalletFrame::WalletFrame(const PlatformStyle *_platformStyle, BitcoinGUI *_gui) :
QFrame(_gui), QFrame(_gui),
gui(_gui), gui(_gui),
platformStyle(platformStyle) platformStyle(_platformStyle)
{ {
// Leave HBox hook for adding a list view later // Leave HBox hook for adding a list view later
QHBoxLayout *walletFrameLayout = new QHBoxLayout(this); QHBoxLayout *walletFrameLayout = new QHBoxLayout(this);
@ -33,9 +33,9 @@ WalletFrame::~WalletFrame()
{ {
} }
void WalletFrame::setClientModel(ClientModel *clientModel) void WalletFrame::setClientModel(ClientModel *_clientModel)
{ {
this->clientModel = clientModel; this->clientModel = _clientModel;
} }
bool WalletFrame::addWallet(const QString& name, WalletModel *walletModel) bool WalletFrame::addWallet(const QString& name, WalletModel *walletModel)

12
src/qt/walletmodel.cpp
View file

@ -27,8 +27,8 @@
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
WalletModel::WalletModel(const PlatformStyle *platformStyle, CWallet *wallet, OptionsModel *optionsModel, QObject *parent) : WalletModel::WalletModel(const PlatformStyle *platformStyle, CWallet *_wallet, OptionsModel *_optionsModel, QObject *parent) :
QObject(parent), wallet(wallet), optionsModel(optionsModel), addressTableModel(0), QObject(parent), wallet(_wallet), optionsModel(_optionsModel), addressTableModel(0),
transactionTableModel(0), transactionTableModel(0),
recentRequestsTableModel(0), recentRequestsTableModel(0),
cachedBalance(0), cachedUnconfirmedBalance(0), cachedImmatureBalance(0), cachedBalance(0), cachedUnconfirmedBalance(0), cachedImmatureBalance(0),
@ -531,10 +531,10 @@ WalletModel::UnlockContext WalletModel::requestUnlock()
return UnlockContext(this, valid, was_locked); return UnlockContext(this, valid, was_locked);
} }
WalletModel::UnlockContext::UnlockContext(WalletModel *wallet, bool valid, bool relock): WalletModel::UnlockContext::UnlockContext(WalletModel *_wallet, bool _valid, bool _relock):
wallet(wallet), wallet(_wallet),
valid(valid), valid(_valid),
relock(relock) relock(_relock)
{ {
} }

8
src/qt/walletmodel.h
View file

@ -38,8 +38,8 @@ class SendCoinsRecipient
{ {
public: public:
explicit SendCoinsRecipient() : amount(0), fSubtractFeeFromAmount(false), nVersion(SendCoinsRecipient::CURRENT_VERSION) { } explicit SendCoinsRecipient() : amount(0), fSubtractFeeFromAmount(false), nVersion(SendCoinsRecipient::CURRENT_VERSION) { }
explicit SendCoinsRecipient(const QString &addr, const QString &label, const CAmount& amount, const QString &message): explicit SendCoinsRecipient(const QString &addr, const QString &_label, const CAmount& _amount, const QString &_message):
address(addr), label(label), amount(amount), message(message), fSubtractFeeFromAmount(false), nVersion(SendCoinsRecipient::CURRENT_VERSION) {} address(addr), label(_label), amount(_amount), message(_message), fSubtractFeeFromAmount(false), nVersion(SendCoinsRecipient::CURRENT_VERSION) {}
// If from an unauthenticated payment request, this is used for storing // If from an unauthenticated payment request, this is used for storing
// the addresses, e.g. address-A<br />address-B<br />address-C. // the addresses, e.g. address-A<br />address-B<br />address-C.
@ -145,8 +145,8 @@ public:
// Return status record for SendCoins, contains error id + information // Return status record for SendCoins, contains error id + information
struct SendCoinsReturn struct SendCoinsReturn
{ {
SendCoinsReturn(StatusCode status = OK): SendCoinsReturn(StatusCode _status = OK):
status(status) {} status(_status) {}
StatusCode status; StatusCode status;
}; };

4
src/qt/walletmodeltransaction.cpp
View file

@ -7,8 +7,8 @@
#include "policy/policy.h" #include "policy/policy.h"
#include "wallet/wallet.h" #include "wallet/wallet.h"
WalletModelTransaction::WalletModelTransaction(const QList<SendCoinsRecipient> &recipients) : WalletModelTransaction::WalletModelTransaction(const QList<SendCoinsRecipient> &_recipients) :
recipients(recipients), recipients(_recipients),
walletTransaction(0), walletTransaction(0),
keyChange(0), keyChange(0),
fee(0) fee(0)

42
src/qt/walletview.cpp
View file

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