From 9d2fee17e08fce89e46f4502fd28e974e81c19a1 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Fri, 30 Aug 2013 14:32:00 +0200 Subject: [PATCH] qt: Use GUIUtil::HtmlEscape to escape HTML This is why we created this function. Avoids some #ifdef. --- src/qt/sendcoinsdialog.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index e3fec6104..df3ff5c9a 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -98,20 +98,12 @@ void SendCoinsDialog::on_sendButton_clicked() if (rcp.authenticatedMerchant.isEmpty()) { QString address = rcp.address; -#if QT_VERSION < 0x050000 - QString to = Qt::escape(rcp.label); -#else - QString to = rcp.label.toHtmlEscaped(); -#endif + QString to = GUIUtil::HtmlEscape(rcp.label); formatted.append(tr("%1 to %2 (%3)").arg(amount, to, address)); } else { -#if QT_VERSION < 0x050000 - QString merchant = Qt::escape(rcp.authenticatedMerchant); -#else - QString merchant = rcp.authenticatedMerchant.toHtmlEscaped(); -#endif + QString merchant = GUIUtil::HtmlEscape(rcp.authenticatedMerchant); formatted.append(tr("%1 to %2").arg(amount, merchant)); } }