From 722d0797f6f9f1c91c6083ed074bc5efc7c5399c Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sun, 8 Nov 2020 17:52:29 +0100
Subject: [PATCH] Use QString::toHtmlEscaped()

---
 src/osd/osddbus.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/osd/osddbus.cpp b/src/osd/osddbus.cpp
index 66d758d4e..3352aefd3 100644
--- a/src/osd/osddbus.cpp
+++ b/src/osd/osddbus.cpp
@@ -141,10 +141,8 @@ void OSDDBus::ShowMessageNative(const QString &summary, const QString &message,
   if (!interface_) return;
 
   QVariantMap hints;
-  QString summary_stripped = summary;
-  QString message_stripped = message;
-  summary_stripped = summary_stripped.replace('&', "&amp;").simplified();
-  message_stripped = message_stripped.replace('&', "&amp;").simplified();
+  QString summary_stripped = summary.toHtmlEscaped();
+  QString message_stripped = message.toHtmlEscaped();
 
   if (!image.isNull()) {
     if (version_ >= QVersionNumber(1, 2)) {