X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fqt%2Fmultisiginputentry.cpp;h=fc3f27009802b8a8fbb28cecffb8c01e2ce01b79;hb=fd3e29de89dadb40606f9b5c258b673ba9f24798;hp=eb652f944d991ed3237b7cb934ed677d0582f3db;hpb=43fa9dabffa5d022cc80c85219cbdd438f8e7ab6;p=novacoin.git diff --git a/src/qt/multisiginputentry.cpp b/src/qt/multisiginputentry.cpp index eb652f9..fc3f270 100644 --- a/src/qt/multisiginputentry.cpp +++ b/src/qt/multisiginputentry.cpp @@ -43,16 +43,16 @@ bool MultisigInputEntry::validate() CTxIn MultisigInputEntry::getInput() { - int nOutput = ui->transactionOutput->currentIndex(); + unsigned int nOutput = ui->transactionOutput->currentIndex(); CTxIn input(COutPoint(txHash, nOutput)); return input; } -int64 MultisigInputEntry::getAmount() +int64_t MultisigInputEntry::getAmount() { - int64 amount = 0; - int nOutput = ui->transactionOutput->currentIndex(); + int64_t amount = 0; + unsigned int nOutput = ui->transactionOutput->currentIndex(); CTransaction tx; uint256 blockHash = 0; @@ -115,12 +115,12 @@ void MultisigInputEntry::on_transactionId_textChanged(const QString &transaction uint256 blockHash = 0; if(!GetTransaction(txHash, tx, blockHash)) return; - for(int i = 0; i < tx.vout.size(); i++) + for(unsigned int i = 0; i < tx.vout.size(); i++) { QString idStr; idStr.setNum(i); const CTxOut& txOut = tx.vout[i]; - int64 amount = txOut.nValue; + int64_t amount = txOut.nValue; QString amountStr; amountStr.sprintf("%.6f", (double) amount / COIN); CScript script = txOut.scriptPubKey; @@ -158,7 +158,7 @@ void MultisigInputEntry::on_transactionOutput_currentIndexChanged(int index) CTxDestination dest; if(ExtractDestination(script, dest)) { - CScriptID scriptID = boost::get(dest); + CScriptID scriptID = std::get(dest); CScript redeemScript; if(model->getWallet()->GetCScript(scriptID, redeemScript)) ui->redeemScript->setText(HexStr(redeemScript.begin(), redeemScript.end()).c_str()); @@ -171,4 +171,4 @@ void MultisigInputEntry::on_transactionOutput_currentIndexChanged(int index) } emit updateAmount(); -} \ No newline at end of file +}