diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-01 11:28:51 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-01 11:28:55 +0200 |
| commit | 3fd192f8b4d6db386354dfe635a8a6a105b55de8 (patch) | |
| tree | 39f8a9caf006a6fe38d89b98a57fb94c56f3cd28 /src/qt/paymentrequestplus.cpp | |
| parent | b25551101c7ceff8af862131c30c08527ff60160 (diff) | |
| parent | c122f5528c882efc8aebe31fd4d84612175f66aa (diff) | |
| download | bitcoin-3fd192f8b4d6db386354dfe635a8a6a105b55de8.tar.xz | |
Merge pull request #4234
c122f55 qt: Register CAmount metatype (Wladimir J. van der Laan)
a372168 Use a typedef for monetary values (Mark Friedenbach)
Diffstat (limited to 'src/qt/paymentrequestplus.cpp')
| -rw-r--r-- | src/qt/paymentrequestplus.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp index 7b7de49831..7aefffe24a 100644 --- a/src/qt/paymentrequestplus.cpp +++ b/src/qt/paymentrequestplus.cpp @@ -196,9 +196,9 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c return fResult; } -QList<std::pair<CScript,qint64> > PaymentRequestPlus::getPayTo() const +QList<std::pair<CScript,CAmount> > PaymentRequestPlus::getPayTo() const { - QList<std::pair<CScript,qint64> > result; + QList<std::pair<CScript,CAmount> > result; for (int i = 0; i < details.outputs_size(); i++) { const unsigned char* scriptStr = (const unsigned char*)details.outputs(i).script().data(); |