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/clientmodel.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/clientmodel.cpp')
| -rw-r--r-- | src/qt/clientmodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index 83c78850e..62a70bacd 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -27,9 +27,9 @@ static const int64_t nClientStartupTime = GetTime(); static int64_t nLastHeaderTipUpdateNotification = 0; static int64_t nLastBlockTipUpdateNotification = 0; -ClientModel::ClientModel(OptionsModel *optionsModel, QObject *parent) : +ClientModel::ClientModel(OptionsModel *_optionsModel, QObject *parent) : QObject(parent), - optionsModel(optionsModel), + optionsModel(_optionsModel), peerTableModel(0), banTableModel(0), pollTimer(0) |