1 files changed, 14 insertions, 15 deletions

diff --git a/examples/webenginewidgets/simplebrowser/downloadwidget.cpp b/examples/webenginewidgets/simplebrowser/downloadwidget.cpp
index d4998853e..2fb65e1a8 100644
--- a/examples/webenginewidgets/simplebrowser/downloadwidget.cpp
+++ b/examples/webenginewidgets/simplebrowser/downloadwidget.cpp
@@ -7,6 +7,8 @@
 #include <QUrl>
 #include <QWebEngineDownloadRequest>
 
+using namespace Qt::StringLiterals;
+
 DownloadWidget::DownloadWidget(QWebEngineDownloadRequest *download, QWidget *parent)
     : QFrame(parent)
     , m_download(download)
@@ -38,12 +40,11 @@ inline QString DownloadWidget::withUnit(qreal bytes)
 {
     if (bytes < (1 << 10))
         return tr("%L1 B").arg(bytes);
-    else if (bytes < (1 << 20))
+    if (bytes < (1 << 20))
         return tr("%L1 KiB").arg(bytes / (1 << 10), 0, 'f', 2);
-    else if (bytes < (1 << 30))
+    if (bytes < (1 << 30))
         return tr("%L1 MiB").arg(bytes / (1 << 20), 0, 'f', 2);
-    else
-        return tr("%L1 GiB").arg(bytes / (1 << 30), 0, 'f', 2);
+    return tr("%L1 GiB").arg(bytes / (1 << 30), 0, 'f', 2);
 }
 
 void DownloadWidget::updateWidget()
@@ -63,16 +64,14 @@ void DownloadWidget::updateWidget()
             m_progressBar->setDisabled(false);
             m_progressBar->setFormat(
                 tr("%p% - %1 of %2 downloaded - %3/s")
-                .arg(withUnit(receivedBytes))
-                .arg(withUnit(totalBytes))
-                .arg(withUnit(bytesPerSecond)));
+                .arg(withUnit(receivedBytes), withUnit(totalBytes),
+                     withUnit(bytesPerSecond)));
         } else {
             m_progressBar->setValue(0);
             m_progressBar->setDisabled(false);
             m_progressBar->setFormat(
                 tr("unknown size - %1 downloaded - %2/s")
-                .arg(withUnit(receivedBytes))
-                .arg(withUnit(bytesPerSecond)));
+                .arg(withUnit(receivedBytes), withUnit(bytesPerSecond)));
         }
         break;
     case QWebEngineDownloadRequest::DownloadCompleted:
@@ -80,16 +79,14 @@ void DownloadWidget::updateWidget()
         m_progressBar->setDisabled(true);
         m_progressBar->setFormat(
             tr("completed - %1 downloaded - %2/s")
-            .arg(withUnit(receivedBytes))
-            .arg(withUnit(bytesPerSecond)));
+            .arg(withUnit(receivedBytes), withUnit(bytesPerSecond)));
         break;
     case QWebEngineDownloadRequest::DownloadCancelled:
         m_progressBar->setValue(0);
         m_progressBar->setDisabled(true);
         m_progressBar->setFormat(
             tr("cancelled - %1 downloaded - %2/s")
-            .arg(withUnit(receivedBytes))
-            .arg(withUnit(bytesPerSecond)));
+            .arg(withUnit(receivedBytes), withUnit(bytesPerSecond)));
         break;
     case QWebEngineDownloadRequest::DownloadInterrupted:
         m_progressBar->setValue(0);
@@ -101,11 +98,13 @@ void DownloadWidget::updateWidget()
     }
 
     if (state == QWebEngineDownloadRequest::DownloadInProgress) {
-        static QIcon cancelIcon(QStringLiteral(":process-stop.png"));
+        static QIcon cancelIcon(QIcon::fromTheme(QIcon::ThemeIcon::ProcessStop,
+                                                 QIcon(":process-stop.png"_L1)));
         m_cancelButton->setIcon(cancelIcon);
         m_cancelButton->setToolTip(tr("Stop downloading"));
     } else {
-        static QIcon removeIcon(QStringLiteral(":edit-clear.png"));
+        static QIcon removeIcon(QIcon::fromTheme(QIcon::ThemeIcon::EditClear,
+                                                 QIcon(":edit-clear.png"_L1)));
         m_cancelButton->setIcon(removeIcon);
         m_cancelButton->setToolTip(tr("Remove from list"));
     }