diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-09 16:39:35 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-09 16:43:06 +0200 |
| commit | 1575c5171fac4f3e4f3d0794ed0312a17be6d7f1 (patch) | |
| tree | a7f34e8c2c5aba8fbb00ab3da26376f609acec22 /src/qt | |
| parent | 8bc0a0173e885a5b60e12d3769604236967c262e (diff) | |
| parent | 2c2cc5dac1102c1eb86c7dd825a893ab388abba1 (diff) | |
| download | bitcoin-1575c5171fac4f3e4f3d0794ed0312a17be6d7f1.tar.xz | |
Merge pull request #4868
2c2cc5d Remove some unnecessary c_strs() in logging and the GUI (Philip Kaufmann)
f7d0a86 netbase: Use .data() instead of .c_str() on binary string (Wladimir J. van der Laan)
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/coincontroldialog.cpp | 4 | ||||
| -rw-r--r-- | src/qt/walletmodel.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 7b30f8de09..d10463fd8f 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -705,7 +705,7 @@ void CoinControlDialog::updateView() QString sAddress = ""; if(ExtractDestination(out.tx->vout[out.i].scriptPubKey, outputAddress)) { - sAddress = CBitcoinAddress(outputAddress).ToString().c_str(); + sAddress = QString::fromStdString(CBitcoinAddress(outputAddress).ToString()); // if listMode or change => show bitcoin address. In tree mode, address is not shown again for direct wallet address outputs if (!treeMode || (!(sAddress == sWalletAddress))) @@ -752,7 +752,7 @@ void CoinControlDialog::updateView() // transaction hash uint256 txhash = out.tx->GetHash(); - itemOutput->setText(COLUMN_TXHASH, txhash.GetHex().c_str()); + itemOutput->setText(COLUMN_TXHASH, QString::fromStdString(txhash.GetHex())); // vout index itemOutput->setText(COLUMN_VOUT_INDEX, QString::number(out.i)); diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 530c46cdb4..8d2c2e96d8 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -622,7 +622,7 @@ void WalletModel::listCoins(std::map<QString, std::vector<COutput> >& mapCoins) CTxDestination address; if(!out.fSpendable || !ExtractDestination(cout.tx->vout[cout.i].scriptPubKey, address)) continue; - mapCoins[CBitcoinAddress(address).ToString().c_str()].push_back(out); + mapCoins[QString::fromStdString(CBitcoinAddress(address).ToString())].push_back(out); } } |