diff options
| author | Pavel JanÃk <[email protected]> | 2016-09-09 13:43:29 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-09-23 12:42:00 +0200 |
| commit | f8393504205089112cdec27ac1829282b76b94a3 (patch) | |
| tree | c38c196ef0873e372b63066f5e8b31e0f6e82b97 /src/qt/walletframe.cpp | |
| parent | Merge #8636: Implement NULLDUMMY softfork (BIP147) (diff) | |
| download | discoin-f8393504205089112cdec27ac1829282b76b94a3.tar.xz discoin-f8393504205089112cdec27ac1829282b76b94a3.zip | |
Do not shadow in src/qt
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) |