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/paymentserver.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/paymentserver.cpp')
| -rw-r--r-- | src/qt/paymentserver.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index c80aebb00..9f23e77a1 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -749,9 +749,9 @@ void PaymentServer::reportSslErrors(QNetworkReply* reply, const QList<QSslError> Q_EMIT message(tr("Network request error"), errString, CClientUIInterface::MSG_ERROR); } -void PaymentServer::setOptionsModel(OptionsModel *optionsModel) +void PaymentServer::setOptionsModel(OptionsModel *_optionsModel) { - this->optionsModel = optionsModel; + this->optionsModel = _optionsModel; } void PaymentServer::handlePaymentACK(const QString& paymentACKMsg) |