Skip to content

Commit 5d0219d

Browse files
laanwjlaanwj
committed
Merge #8793: Do not shadow in src/qt
f839350 Do not shadow in src/qt (Pavel Janík)
2 parents 2b514aa + f839350 commit 5d0219d

33 files changed

+216
-216
lines changed

‎src/qt/addressbookpage.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
#include <QMessageBox>
2222
#include <QSortFilterProxyModel>
2323

24-
AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode mode, Tabs tab, QWidget *parent) :
24+
AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode, Tabs _tab, QWidget *parent) :
2525
QDialog(parent),
2626
ui(new Ui::AddressBookPage),
2727
model(0),
28-
mode(mode),
29-
tab(tab)
28+
mode(_mode),
29+
tab(_tab)
3030
{
3131
ui->setupUi(this);
3232

@@ -107,14 +107,14 @@ AddressBookPage::~AddressBookPage()
107107
delete ui;
108108
}
109109

110-
void AddressBookPage::setModel(AddressTableModel *model)
110+
void AddressBookPage::setModel(AddressTableModel *_model)
111111
{
112-
this->model = model;
113-
if(!model)
112+
this->model = _model;
113+
if(!_model)
114114
return;
115115

116116
proxyModel = new QSortFilterProxyModel(this);
117-
proxyModel->setSourceModel(model);
117+
proxyModel->setSourceModel(_model);
118118
proxyModel->setDynamicSortFilter(true);
119119
proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
120120
proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
@@ -147,7 +147,7 @@ void AddressBookPage::setModel(AddressTableModel *model)
147147
this, SLOT(selectionChanged()));
148148

149149
// Select row for newly created address
150-
connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(selectNewAddress(QModelIndex,int,int)));
150+
connect(_model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(selectNewAddress(QModelIndex,int,int)));
151151

152152
selectionChanged();
153153
}

‎src/qt/addresstablemodel.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ struct AddressTableEntry
3131
QString address;
3232

3333
AddressTableEntry() {}
34-
AddressTableEntry(Type type, const QString &label, const QString &address):
35-
type(type), label(label), address(address) {}
34+
AddressTableEntry(Type _type, const QString &_label, const QString &_address):
35+
type(_type), label(_label), address(_address) {}
3636
};
3737

3838
struct AddressTableEntryLessThan
@@ -73,8 +73,8 @@ class AddressTablePriv
7373
QList<AddressTableEntry> cachedAddressTable;
7474
AddressTableModel *parent;
7575

76-
AddressTablePriv(CWallet *wallet, AddressTableModel *parent):
77-
wallet(wallet), parent(parent) {}
76+
AddressTablePriv(CWallet *_wallet, AddressTableModel *_parent):
77+
wallet(_wallet), parent(_parent) {}
7878

7979
void refreshAddressTable()
8080
{
@@ -164,8 +164,8 @@ class AddressTablePriv
164164
}
165165
};
166166

167-
AddressTableModel::AddressTableModel(CWallet *wallet, WalletModel *parent) :
168-
QAbstractTableModel(parent),walletModel(parent),wallet(wallet),priv(0)
167+
AddressTableModel::AddressTableModel(CWallet *_wallet, WalletModel *parent) :
168+
QAbstractTableModel(parent),walletModel(parent),wallet(_wallet),priv(0)
169169
{
170170
columns << tr("Label") << tr("Address");
171171
priv = new AddressTablePriv(wallet, this);

‎src/qt/askpassphrasedialog.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
#include <QMessageBox>
1919
#include <QPushButton>
2020

21-
AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget *parent) :
21+
AskPassphraseDialog::AskPassphraseDialog(Mode _mode, QWidget *parent) :
2222
QDialog(parent),
2323
ui(new Ui::AskPassphraseDialog),
24-
mode(mode),
24+
mode(_mode),
2525
model(0),
2626
fCapsLock(false)
2727
{
@@ -81,9 +81,9 @@ AskPassphraseDialog::~AskPassphraseDialog()
8181
delete ui;
8282
}
8383

84-
void AskPassphraseDialog::setModel(WalletModel *model)
84+
void AskPassphraseDialog::setModel(WalletModel *_model)
8585
{
86-
this->model = model;
86+
this->model = _model;
8787
}
8888

8989
void AskPassphraseDialog::accept()

‎src/qt/bitcoingui.cpp

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ const std::string BitcoinGUI::DEFAULT_UIPLATFORM =
7575

7676
const QString BitcoinGUI::DEFAULT_WALLET = "~Default";
7777

78-
BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *networkStyle, QWidget *parent) :
78+
BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *networkStyle, QWidget *parent) :
7979
QMainWindow(parent),
8080
enableWallet(false),
8181
clientModel(0),
@@ -117,7 +117,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
117117
helpMessageDialog(0),
118118
prevBlocks(0),
119119
spinnerFrame(0),
120-
platformStyle(platformStyle)
120+
platformStyle(_platformStyle)
121121
{
122122
GUIUtil::restoreWindowGeometry("nWindow", QSize(850, 550), this);
123123

@@ -146,13 +146,13 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
146146
setUnifiedTitleAndToolBarOnMac(true);
147147
#endif
148148

149-
rpcConsole = new RPCConsole(platformStyle, 0);
149+
rpcConsole = new RPCConsole(_platformStyle, 0);
150150
helpMessageDialog = new HelpMessageDialog(this, false);
151151
#ifdef ENABLE_WALLET
152152
if(enableWallet)
153153
{
154154
/** Create wallet frame and make it the central widget */
155-
walletFrame = new WalletFrame(platformStyle, this);
155+
walletFrame = new WalletFrame(_platformStyle, this);
156156
setCentralWidget(walletFrame);
157157
} else
158158
#endif // ENABLE_WALLET
@@ -449,38 +449,38 @@ void BitcoinGUI::createToolBars()
449449
}
450450
}
451451

452-
void BitcoinGUI::setClientModel(ClientModel *clientModel)
452+
void BitcoinGUI::setClientModel(ClientModel *_clientModel)
453453
{
454-
this->clientModel = clientModel;
455-
if(clientModel)
454+
this->clientModel = _clientModel;
455+
if(_clientModel)
456456
{
457457
// Create system tray menu (or setup the dock menu) that late to prevent users from calling actions,
458458
// while the client has not yet fully loaded
459459
createTrayIconMenu();
460460

461461
// Keep up to date with client
462-
setNumConnections(clientModel->getNumConnections());
463-
connect(clientModel, SIGNAL(numConnectionsChanged(int)), this, SLOT(setNumConnections(int)));
462+
setNumConnections(_clientModel->getNumConnections());
463+
connect(_clientModel, SIGNAL(numConnectionsChanged(int)), this, SLOT(setNumConnections(int)));
464464

465-
setNumBlocks(clientModel->getNumBlocks(), clientModel->getLastBlockDate(), clientModel->getVerificationProgress(NULL), false);
466-
connect(clientModel, SIGNAL(numBlocksChanged(int,QDateTime,double,bool)), this, SLOT(setNumBlocks(int,QDateTime,double,bool)));
465+
setNumBlocks(_clientModel->getNumBlocks(), _clientModel->getLastBlockDate(), _clientModel->getVerificationProgress(NULL), false);
466+
connect(_clientModel, SIGNAL(numBlocksChanged(int,QDateTime,double,bool)), this, SLOT(setNumBlocks(int,QDateTime,double,bool)));
467467

468468
// Receive and report messages from client model
469-
connect(clientModel, SIGNAL(message(QString,QString,unsigned int)), this, SLOT(message(QString,QString,unsigned int)));
469+
connect(_clientModel, SIGNAL(message(QString,QString,unsigned int)), this, SLOT(message(QString,QString,unsigned int)));
470470

471471
// Show progress dialog
472-
connect(clientModel, SIGNAL(showProgress(QString,int)), this, SLOT(showProgress(QString,int)));
472+
connect(_clientModel, SIGNAL(showProgress(QString,int)), this, SLOT(showProgress(QString,int)));
473473

474-
rpcConsole->setClientModel(clientModel);
474+
rpcConsole->setClientModel(_clientModel);
475475
#ifdef ENABLE_WALLET
476476
if(walletFrame)
477477
{
478-
walletFrame->setClientModel(clientModel);
478+
walletFrame->setClientModel(_clientModel);
479479
}
480480
#endif // ENABLE_WALLET
481-
unitDisplayControl->setOptionsModel(clientModel->getOptionsModel());
481+
unitDisplayControl->setOptionsModel(_clientModel->getOptionsModel());
482482

483-
OptionsModel* optionsModel = clientModel->getOptionsModel();
483+
OptionsModel* optionsModel = _clientModel->getOptionsModel();
484484
if(optionsModel)
485485
{
486486
// be aware of the tray icon disable state change reported by the OptionsModel object.
@@ -1168,17 +1168,17 @@ void UnitDisplayStatusBarControl::createContextMenu()
11681168
}
11691169

11701170
/** Lets the control know about the Options Model (and its signals) */
1171-
void UnitDisplayStatusBarControl::setOptionsModel(OptionsModel *optionsModel)
1171+
void UnitDisplayStatusBarControl::setOptionsModel(OptionsModel *_optionsModel)
11721172
{
1173-
if (optionsModel)
1173+
if (_optionsModel)
11741174
{
1175-
this->optionsModel = optionsModel;
1175+
this->optionsModel = _optionsModel;
11761176

11771177
// be aware of a display unit change reported by the OptionsModel object.
1178-
connect(optionsModel,SIGNAL(displayUnitChanged(int)),this,SLOT(updateDisplayUnit(int)));
1178+
connect(_optionsModel,SIGNAL(displayUnitChanged(int)),this,SLOT(updateDisplayUnit(int)));
11791179

11801180
// initialize the display units label with the current value in the model.
1181-
updateDisplayUnit(optionsModel->getDisplayUnit());
1181+
updateDisplayUnit(_optionsModel->getDisplayUnit());
11821182
}
11831183
}
11841184

‎src/qt/clientmodel.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ static const int64_t nClientStartupTime = GetTime();
2727
static int64_t nLastHeaderTipUpdateNotification = 0;
2828
static int64_t nLastBlockTipUpdateNotification = 0;
2929

30-
ClientModel::ClientModel(OptionsModel *optionsModel, QObject *parent) :
30+
ClientModel::ClientModel(OptionsModel *_optionsModel, QObject *parent) :
3131
QObject(parent),
32-
optionsModel(optionsModel),
32+
optionsModel(_optionsModel),
3333
peerTableModel(0),
3434
banTableModel(0),
3535
pollTimer(0)

‎src/qt/coincontroldialog.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ QList<CAmount> CoinControlDialog::payAmounts;
3535
CCoinControl* CoinControlDialog::coinControl = new CCoinControl();
3636
bool CoinControlDialog::fSubtractFeeFromAmount = false;
3737

38-
CoinControlDialog::CoinControlDialog(const PlatformStyle *platformStyle, QWidget *parent) :
38+
CoinControlDialog::CoinControlDialog(const PlatformStyle *_platformStyle, QWidget *parent) :
3939
QDialog(parent),
4040
ui(new Ui::CoinControlDialog),
4141
model(0),
42-
platformStyle(platformStyle)
42+
platformStyle(_platformStyle)
4343
{
4444
ui->setupUi(this);
4545

@@ -152,15 +152,15 @@ CoinControlDialog::~CoinControlDialog()
152152
delete ui;
153153
}
154154

155-
void CoinControlDialog::setModel(WalletModel *model)
155+
void CoinControlDialog::setModel(WalletModel *_model)
156156
{
157-
this->model = model;
157+
this->model = _model;
158158

159-
if(model && model->getOptionsModel() && model->getAddressTableModel())
159+
if(_model && _model->getOptionsModel() && _model->getAddressTableModel())
160160
{
161161
updateView();
162162
updateLabelLocked();
163-
CoinControlDialog::updateLabels(model, this);
163+
CoinControlDialog::updateLabels(_model, this);
164164
}
165165
}
166166

‎src/qt/csvmodelwriter.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
#include <QFile>
99
#include <QTextStream>
1010

11-
CSVModelWriter::CSVModelWriter(const QString &filename, QObject *parent) :
11+
CSVModelWriter::CSVModelWriter(const QString &_filename, QObject *parent) :
1212
QObject(parent),
13-
filename(filename), model(0)
13+
filename(_filename), model(0)
1414
{
1515
}
1616

17-
void CSVModelWriter::setModel(const QAbstractItemModel *model)
17+
void CSVModelWriter::setModel(const QAbstractItemModel *_model)
1818
{
19-
this->model = model;
19+
this->model = _model;
2020
}
2121

2222
void CSVModelWriter::addColumn(const QString &title, int column, int role)

‎src/qt/editaddressdialog.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
#include <QDataWidgetMapper>
1212
#include <QMessageBox>
1313

14-
EditAddressDialog::EditAddressDialog(Mode mode, QWidget *parent) :
14+
EditAddressDialog::EditAddressDialog(Mode _mode, QWidget *parent) :
1515
QDialog(parent),
1616
ui(new Ui::EditAddressDialog),
1717
mapper(0),
18-
mode(mode),
18+
mode(_mode),
1919
model(0)
2020
{
2121
ui->setupUi(this);
@@ -49,13 +49,13 @@ EditAddressDialog::~EditAddressDialog()
4949
delete ui;
5050
}
5151

52-
void EditAddressDialog::setModel(AddressTableModel *model)
52+
void EditAddressDialog::setModel(AddressTableModel *_model)
5353
{
54-
this->model = model;
55-
if(!model)
54+
this->model = _model;
55+
if(!_model)
5656
return;
5757

58-
mapper->setModel(model);
58+
mapper->setModel(_model);
5959
mapper->addMapping(ui->labelEdit, AddressTableModel::Label);
6060
mapper->addMapping(ui->addressEdit, AddressTableModel::Address);
6161
}
@@ -137,8 +137,8 @@ QString EditAddressDialog::getAddress() const
137137
return address;
138138
}
139139

140-
void EditAddressDialog::setAddress(const QString &address)
140+
void EditAddressDialog::setAddress(const QString &_address)
141141
{
142-
this->address = address;
143-
ui->addressEdit->setText(address);
142+
this->address = _address;
143+
ui->addressEdit->setText(_address);
144144
}

‎src/qt/guiutil.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,9 +462,9 @@ void SubstituteFonts(const QString& language)
462462
#endif
463463
}
464464

465-
ToolTipToRichTextFilter::ToolTipToRichTextFilter(int size_threshold, QObject *parent) :
465+
ToolTipToRichTextFilter::ToolTipToRichTextFilter(int _size_threshold, QObject *parent) :
466466
QObject(parent),
467-
size_threshold(size_threshold)
467+
size_threshold(_size_threshold)
468468
{
469469

470470
}

‎src/qt/intro.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ public Q_SLOTS:
6363

6464
#include "intro.moc"
6565

66-
FreespaceChecker::FreespaceChecker(Intro *intro)
66+
FreespaceChecker::FreespaceChecker(Intro *_intro)
6767
{
68-
this->intro = intro;
68+
this->intro = _intro;
6969
}
7070

7171
void FreespaceChecker::check()

0 commit comments

Comments
 (0)