Merge pull request #2955 from laanwj/2013_08_htmlescape

qt: Use GUIUtil::HtmlEscape to escape HTML
This commit is contained in:
Wladimir J. van der Laan 2013-08-30 05:44:52 -07:00
commit 329de9bb64

View File

@ -98,20 +98,12 @@ void SendCoinsDialog::on_sendButton_clicked()
if (rcp.authenticatedMerchant.isEmpty()) if (rcp.authenticatedMerchant.isEmpty())
{ {
QString address = rcp.address; QString address = rcp.address;
#if QT_VERSION < 0x050000 QString to = GUIUtil::HtmlEscape(rcp.label);
QString to = Qt::escape(rcp.label);
#else
QString to = rcp.label.toHtmlEscaped();
#endif
formatted.append(tr("<b>%1</b> to %2 (%3)").arg(amount, to, address)); formatted.append(tr("<b>%1</b> to %2 (%3)").arg(amount, to, address));
} }
else else
{ {
#if QT_VERSION < 0x050000 QString merchant = GUIUtil::HtmlEscape(rcp.authenticatedMerchant);
QString merchant = Qt::escape(rcp.authenticatedMerchant);
#else
QString merchant = rcp.authenticatedMerchant.toHtmlEscaped();
#endif
formatted.append(tr("<b>%1</b> to %2").arg(amount, merchant)); formatted.append(tr("<b>%1</b> to %2").arg(amount, merchant));
} }
} }