Simple browser example: Fix clazy warnings

- else after return
- Use multiarg version of QString::arg(QString)

Pick-to: 6.5
Change-Id: Iceff3ee8877b866b5b9187cd85da54864ab17834
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

2 files changed, 13 insertions, 17 deletions

diff --git a/examples/webenginewidgets/simplebrowser/downloadwidget.cpp b/examples/webenginewidgets/simplebrowser/downloadwidget.cpp
index 8f73f9f37..83784b628 100644
--- a/examples/webenginewidgets/simplebrowser/downloadwidget.cpp
+++ b/examples/webenginewidgets/simplebrowser/downloadwidget.cpp
@@ -40,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()
@@ -65,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:
@@ -82,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);
diff --git a/examples/webenginewidgets/simplebrowser/webview.cpp b/examples/webenginewidgets/simplebrowser/webview.cpp
index 4e4f8aa3c..dd6dbb149 100644
--- a/examples/webenginewidgets/simplebrowser/webview.cpp
+++ b/examples/webenginewidgets/simplebrowser/webview.cpp
@@ -150,13 +150,14 @@ QIcon WebView::favIcon() const
     if (m_loadProgress < 0) {
         static QIcon errorIcon(u":dialog-error.png"_s);
         return errorIcon;
-    } else if (m_loadProgress < 100) {
+    }
+    if (m_loadProgress < 100) {
         static QIcon loadingIcon(u":view-refresh.png"_s);
         return loadingIcon;
-    } else {
-        static QIcon defaultIcon(u":text-html.png"_s);
-        return defaultIcon;
     }
+
+    static QIcon defaultIcon(u":text-html.png"_s);
+    return defaultIcon;
 }
 
 QWebEngineView *WebView::createWindow(QWebEnginePage::WebWindowType type)