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/walletframe.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/walletframe.cpp')
| -rw-r--r-- | src/qt/walletframe.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp index e4ca5e183..640be4d7a 100644 --- a/src/qt/walletframe.cpp +++ b/src/qt/walletframe.cpp @@ -12,10 +12,10 @@ #include <QHBoxLayout> #include <QLabel> -WalletFrame::WalletFrame(const PlatformStyle *platformStyle, BitcoinGUI *_gui) : +WalletFrame::WalletFrame(const PlatformStyle *_platformStyle, BitcoinGUI *_gui) : QFrame(_gui), gui(_gui), - platformStyle(platformStyle) + platformStyle(_platformStyle) { // Leave HBox hook for adding a list view later 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) |