diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-12-21 22:33:19 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-12-21 22:33:19 +0100 |
| commit | bde280b9a4da2652716c8ffdeed9ebfa4461cc70 (patch) | |
| tree | f2d96b0c74da35b701513a629817c7e944798827 /src/qt/transactiondesc.cpp | |
| parent | 21d9f36781604e4ca9fc35dc65265593423b73e9 (diff) | |
Revert "Use standard C99 (and Qt) types for 64-bit integers"
This reverts commit 21d9f36781604e4ca9fc35dc65265593423b73e9.
Diffstat (limited to 'src/qt/transactiondesc.cpp')
| -rw-r--r-- | src/qt/transactiondesc.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index a19ec875d9..6ca3ac8c4b 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -6,7 +6,6 @@ #include "headers.h" #include "qtui.h" -#include <QtGlobal> #include <QString> #include <QTextDocument> // For Qt::escape @@ -56,10 +55,10 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx) strHTML.reserve(4000); strHTML += "<html><font face='verdana, arial, helvetica, sans-serif'>"; - qint64 nTime = wtx.GetTxTime(); - qint64 nCredit = wtx.GetCredit(); - qint64 nDebit = wtx.GetDebit(); - qint64 nNet = nCredit - nDebit; + int64 nTime = wtx.GetTxTime(); + int64 nCredit = wtx.GetCredit(); + int64 nDebit = wtx.GetDebit(); + int64 nNet = nCredit - nDebit; strHTML += tr("<b>Status:</b> ") + FormatTxStatus(wtx); int nRequests = wtx.GetRequestCount(); @@ -142,7 +141,7 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx) // // Coinbase // - qint64 nUnmatured = 0; + int64 nUnmatured = 0; BOOST_FOREACH(const CTxOut& txout, wtx.vout) nUnmatured += wallet->GetCredit(txout); strHTML += tr("<b>Credit:</b> "); @@ -201,13 +200,13 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx) if (fAllToMe) { // Payment to self - qint64 nChange = wtx.GetChange(); - qint64 nValue = nCredit - nChange; + int64 nChange = wtx.GetChange(); + int64 nValue = nCredit - nChange; strHTML += tr("<b>Debit:</b> ") + BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, -nValue) + "<br>"; strHTML += tr("<b>Credit:</b> ") + BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, nValue) + "<br>"; } - qint64 nTxFee = nDebit - wtx.GetValueOut(); + int64 nTxFee = nDebit - wtx.GetValueOut(); if (nTxFee > 0) strHTML += tr("<b>Transaction fee:</b> ") + BitcoinUnits::formatWithUnit(BitcoinUnits::BTC,-nTxFee) + "<br>"; } |