X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fqt%2Ftransactionrecord.cpp;h=8a1f1b677227f7226e8392de81ee6901f7297634;hb=21d9f36781604e4ca9fc35dc65265593423b73e9;hp=50767d30fe4b0612afd2996fccfc5b4d5ca85e45;hpb=491ad6db507776054c38230387f384991f42ad29;p=novacoin.git

diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index 50767d3..8a1f1b6 100644
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -1,3 +1,5 @@
+#include <QtGlobal>
+
 #include "transactionrecord.h"
 
 #include "headers.h"
@@ -33,10 +35,10 @@ bool TransactionRecord::showTransaction(const CWalletTx &wtx)
 QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *wallet, const CWalletTx &wtx)
 {
     QList<TransactionRecord> parts;
-    int64 nTime = wtx.nTimeDisplayed = wtx.GetTxTime();
-    int64 nCredit = wtx.GetCredit(true);
-    int64 nDebit = wtx.GetDebit();
-    int64 nNet = nCredit - nDebit;
+    qint64 nTime = wtx.nTimeDisplayed = wtx.GetTxTime();
+    qint64 nCredit = wtx.GetCredit(true);
+    qint64 nDebit = wtx.GetDebit();
+    qint64 nNet = nCredit - nDebit;
     uint256 hash = wtx.GetHash();
     std::map<std::string, std::string> mapValue = wtx.mapValue;
 
@@ -58,7 +60,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
 
                 if (nCredit == 0)
                 {
-                    int64 nUnmatured = 0;
+                    qint64 nUnmatured = 0;
                     BOOST_FOREACH(const CTxOut& txout, wtx.vout)
                         nUnmatured += wallet->GetCredit(txout);
                     sub.credit = nUnmatured;
@@ -103,7 +105,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
             if (fAllFromMe && fAllToMe)
             {
                 // Payment to self
-                int64 nChange = wtx.GetChange();
+                qint64 nChange = wtx.GetChange();
 
                 parts.append(TransactionRecord(hash, nTime, TransactionRecord::SendToSelf, "",
                                 -(nDebit - nChange), nCredit - nChange));
@@ -113,7 +115,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
                 //
                 // Debit
                 //
-                int64 nTxFee = nDebit - wtx.GetValueOut();
+                qint64 nTxFee = nDebit - wtx.GetValueOut();
 
                 for (int nOut = 0; nOut < wtx.vout.size(); nOut++)
                 {
@@ -138,13 +140,13 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
                         // Sent to Bitcoin Address
                         sub.type = TransactionRecord::SendToAddress;
                         CBitcoinAddress address;
-                        if (ExtractAddress(txout.scriptPubKey, wallet, address))
+                        if (ExtractAddress(txout.scriptPubKey, 0, address))
                         {
                             sub.address = address.ToString();
                         }
                     }
 
-                    int64 nValue = txout.nValue;
+                    qint64 nValue = txout.nValue;
                     /* Add fee to first output */
                     if (nTxFee > 0)
                     {
@@ -187,7 +189,7 @@ void TransactionRecord::updateStatus(const CWalletTx &wtx)
 
     // Sort order, unrecorded transactions sort to the top
     status.sortKey = strprintf("%010d-%01d-%010u-%03d",
-        (pindex ? pindex->nHeight : INT_MAX),
+        (pindex ? pindex->nHeight : std::numeric_limits<int>::max()),
         (wtx.IsCoinBase() ? 1 : 0),
         wtx.nTimeReceived,
         idx);
@@ -227,7 +229,7 @@ void TransactionRecord::updateStatus(const CWalletTx &wtx)
     // For generated transactions, determine maturity
     if(type == TransactionRecord::Generated)
     {
-        int64 nCredit = wtx.GetCredit(true);
+        qint64 nCredit = wtx.GetCredit(true);
         if (nCredit == 0)
         {
             status.maturity = TransactionStatus::Immature;