if(!model)
return;
- std::vector<CKey> pubkeys;
+ std::vector<CPubKey> pubkeys;
pubkeys.resize(ui->pubkeyEntries->count());
unsigned int required = ui->requiredSignatures->text().toUInt();
CPubKey vchPubKey(ParseHex(str.toStdString().c_str()));
if(!vchPubKey.IsValid())
return;
- pubkeys[i].SetPubKey(vchPubKey);
+ pubkeys[i] = vchPubKey;
}
if(pubkeys.size() > 16)
LOCK(wallet->cs_wallet);
if(!wallet->HaveCScript(scriptID))
wallet->AddCScript(script);
- if(!wallet->mapAddressBook.count(CBitcoinAddress(address).Get()))
- wallet->SetAddressBookName(CBitcoinAddress(address).Get(), label);
+ if(!wallet->mapAddressBook.count(CBitcoinAddress(address)))
+ wallet->SetAddressBookName(CBitcoinAddress(address), label);
}
void MultisigDialog::clear()
{
ss >> tx;
}
- catch(std::exception &e)
+ catch(const std::exception&)
{
- (void)e;
return;
}
// Fill input list
int index = -1;
- BOOST_FOREACH(const CTxIn& txin, tx.vin)
+ for(const CTxIn& txin : tx.vin)
{
uint256 prevoutHash = txin.prevout.hash;
addInput();
// Fill output list
index = -1;
- BOOST_FOREACH(const CTxOut& txout, tx.vout)
+ for(const CTxOut& txout : tx.vout)
{
CScript scriptPubKey = txout.scriptPubKey;
CTxDestination addr;
{
ss >> tx;
}
- catch(std::exception &e)
+ catch(const std::exception&)
{
- (void)e;
return;
}
CTransaction mergedTx(tx);
tempTx.vin.push_back(mergedTx.vin[i]);
tempTx.FetchInputs(txdb, unused, false, false, mapPrevTx, fInvalid);
- BOOST_FOREACH(const CTxIn& txin, tempTx.vin)
+ for(const CTxIn& txin : tempTx.vin)
{
const uint256& prevHash = txin.prevout.hash;
if(mapPrevTx.count(prevHash) && mapPrevTx[prevHash].second.vout.size() > txin.prevout.n)
// Sign what we can
bool fComplete = true;
- for(unsigned int i = 0; i < mergedTx.vin.size(); i++)
+ for(uint32_t i = 0; i < mergedTx.vin.size(); i++)
{
CTxIn& txin = mergedTx.vin[i];
if(mapPrevOut.count(txin.prevout) == 0)
{
ssData >> tx;
}
- catch(std::exception &e)
+ catch(const std::exception&)
{
- (void)e;
return;
}
uint256 txHash = tx.GetHash();