Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
- index e6dac51..cd921dd 100644
- --- a/src/qt/transactiontablemodel.cpp
- +++ b/src/qt/transactiontablemodel.cpp
- @@ -522,13 +522,13 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
- case Status:
- return QString::fromStdString(rec->status.sortKey);
- case Date:
- - return rec->time;
- + return (qlonglong)rec->time;
- case Type:
- return formatTxType(rec);
- case ToAddress:
- return formatTxToAddress(rec, true);
- case Amount:
- - return rec->credit + rec->debit;
- + return (qlonglong)rec->credit + rec->debit;
- }
- break;
- case Qt::ToolTipRole:
- @@ -561,7 +561,7 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
- case LabelRole:
- return walletModel->getAddressTableModel()->labelForAddress(QString::fromStdString(rec->address));
- case AmountRole:
- - return rec->credit + rec->debit;
- + return (qlonglong)rec->credit + rec->debit;
- case TxIDRole:
- return QString::fromStdString(rec->getTxID());
- case ConfirmedRole:
- diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
- index 864720b..709461a 100644
- --- a/src/qt/walletmodel.cpp
- +++ b/src/qt/walletmodel.cpp
- @@ -218,7 +218,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(const QList<SendCoinsRecipie
- LOCK2(cs_main, wallet->cs_wallet);
- // Sendmany
- - std::vector<std::pair<CScript, qint64> > vecSend;
- + std::vector<std::pair<CScript, int64_t> > vecSend;
- foreach(const SendCoinsRecipient &rcp, recipients)
- {
- CScript scriptPubKey;
- @@ -228,7 +228,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(const QList<SendCoinsRecipie
- CWalletTx wtx;
- CReserveKey keyChange(wallet);
- - qint64 nFeeRequired = 0;
- + int64_t nFeeRequired = 0;
- bool fCreated = wallet->CreateTransaction(vecSend, wtx, keyChange, nFeeRequired, false, coinControl);
- if(!fCreated)
- @@ -453,7 +453,13 @@ void WalletModel::getStakeWeight(quint64& nMinWeight, quint64& nMaxWeight, quint
- if (!lockWallet)
- return;
- - wallet->GetStakeWeight(*wallet, nMinWeight, nMaxWeight, nWeight);
- + uint64_t nMinWeight_t = nMinWeight;
- + uint64_t nMaxWeight_t = nMaxWeight;
- + uint64_t nWeight_t = nWeight;
- + wallet->GetStakeWeight(*wallet, nMinWeight_t, nMaxWeight_t, nWeight_t);
- + nWeight = nWeight_t;
- + nMaxWeight = nMaxWeight_t;
- + nMinWeight = nMinWeight_t;
- }
- quint64 WalletModel::getReserveBalance()
- @@ -468,7 +474,7 @@ quint64 WalletModel::getTotStakeWeight()
- BOOST_FOREACH(const wallet_map::value_type& item, pWalletManager->GetWalletMap())
- {
- CWallet* pwallet = pWalletManager->GetWallet(item.first.c_str()).get();
- - quint64 nMinWeight = 0 ,nMaxWeight = 0, nWeight = 0;
- + uint64_t nMinWeight = 0 ,nMaxWeight = 0, nWeight = 0;
- pwallet->GetStakeWeight(*pwallet, nMinWeight,nMaxWeight,nWeight);
- nTotWeight+=nWeight;
- @@ -478,17 +484,23 @@ quint64 WalletModel::getTotStakeWeight()
- void WalletModel::getStakeWeightFromValue(const qint64& nTime, const qint64& nValue, quint64& nWeight)
- {
- - wallet->GetStakeWeightFromValue(nTime, nValue, nWeight);
- + int64_t nTime_t = nTime, nValue_t = nValue;
- + uint64_t nWeight_t = nWeight;
- + wallet->GetStakeWeightFromValue(nTime_t, nValue_t, nWeight_t);
- }
- void WalletModel::checkWallet(int& nMismatchSpent, qint64& nBalanceInQuestion, int& nOrphansFound)
- {
- - wallet->FixSpentCoins(nMismatchSpent, nBalanceInQuestion, nOrphansFound, true);
- + int64_t nBalanceInQuestion_t = nBalanceInQuestion;
- + wallet->FixSpentCoins(nMismatchSpent, nBalanceInQuestion_t, nOrphansFound, true);
- + nBalanceInQuestion = nBalanceInQuestion_t;
- }
- void WalletModel::repairWallet(int& nMismatchSpent, qint64& nBalanceInQuestion, int& nOrphansFound)
- {
- - wallet->FixSpentCoins(nMismatchSpent, nBalanceInQuestion, nOrphansFound);
- + int64_t nBalanceInQuestion_t = nBalanceInQuestion;
- + wallet->FixSpentCoins(nMismatchSpent, nBalanceInQuestion_t, nOrphansFound);
- + nBalanceInQuestion = nBalanceInQuestion_t;
- }
- // Handlers for core signals
- diff --git a/src/wallet.cpp b/src/wallet.cpp
- index 2f92a53..dcce14c 100644
- --- a/src/wallet.cpp
- +++ b/src/wallet.cpp
- @@ -2148,7 +2148,7 @@ bool CWallet::TopUpKeyPool(unsigned int nSize)
- if (nSize > 0)
- nTargetSize = nSize;
- else
- - nTargetSize = max(GetArg("-keypool", 100), 0LL);
- + nTargetSize = max(GetArg("-keypool", 100), 0L);
- while (setKeyPool.size() < (nTargetSize + 1))
- {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement