diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-23 12:44:09 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-23 12:44:35 +0200 |
| commit | 5d0219d983b6cb8de5b4faf3f78a6781c99e442b (patch) | |
| tree | a6f613a511056681f0a294a129f876845bf7f777 /src/qt/rpcconsole.cpp | |
| parent | 2b514aa2eae61839ad162b2f6e5ba69ef96c5c97 (diff) | |
| parent | f8393504205089112cdec27ac1829282b76b94a3 (diff) | |
| download | bitcoin-5d0219d983b6cb8de5b4faf3f78a6781c99e442b.tar.xz | |
Merge #8793: Do not shadow in src/qt
f839350 Do not shadow in src/qt (Pavel JanÃk)
Diffstat (limited to 'src/qt/rpcconsole.cpp')
| -rw-r--r-- | src/qt/rpcconsole.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index a316b951c4..ace9f1ceaa 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -83,8 +83,8 @@ class QtRPCTimerBase: public QObject, public RPCTimerBase { Q_OBJECT public: - QtRPCTimerBase(boost::function<void(void)>& func, int64_t millis): - func(func) + QtRPCTimerBase(boost::function<void(void)>& _func, int64_t millis): + func(_func) { timer.setSingleShot(true); 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), ui(new Ui::RPCConsole), clientModel(0), historyPtr(0), cachedNodeid(-1), - platformStyle(platformStyle), + platformStyle(_platformStyle), peersTableContextMenu(0), banTableContextMenu(0), consoleFontSize(0) |