Merge pull request #2955 from laanwj/2013_08_htmlescape

qt: Use GUIUtil::HtmlEscape to escape HTML

1 files changed, 2 insertions, 10 deletions

diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index e3fec61046..df3ff5c9a9 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("<b>%1</b> 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("<b>%1</b> to %2").arg(amount, merchant));
         }
     }