From bde280b9a4da2652716c8ffdeed9ebfa4461cc70 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Wed, 21 Dec 2011 22:33:19 +0100 Subject: Revert "Use standard C99 (and Qt) types for 64-bit integers" This reverts commit 21d9f36781604e4ca9fc35dc65265593423b73e9. --- src/qt/transactiondesc.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/qt/transactiondesc.cpp') 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 #include #include // For Qt::escape @@ -56,10 +55,10 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx) strHTML.reserve(4000); strHTML += ""; - 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("Status: ") + 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("Credit: "); @@ -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("Debit: ") + BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, -nValue) + "
"; strHTML += tr("Credit: ") + BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, nValue) + "
"; } - qint64 nTxFee = nDebit - wtx.GetValueOut(); + int64 nTxFee = nDebit - wtx.GetValueOut(); if (nTxFee > 0) strHTML += tr("Transaction fee: ") + BitcoinUnits::formatWithUnit(BitcoinUnits::BTC,-nTxFee) + "
"; } -- cgit v1.2.3