Simple browser example: Fix up the code

- Remove duplicated unused helper questionForFeature()
- Replace lambdas by slots where possible
- Fix clang warning about using multiple arguments to QString::arg()
- Remove dead code in WebView::contextMenuEvent() which checks on
  inspectElement == actions.cend(), but is within an "if" checking
  the same condition.

Change-Id: Ie85a3811f4f5a8c3fa9550d4eb2ca5bf79e39084
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 88ef502099d535823156c31e77251dd2a723ad1c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

1 files changed, 4 insertions, 8 deletions

diff --git a/examples/webenginewidgets/simplebrowser/webview.cpp b/examples/webenginewidgets/simplebrowser/webview.cpp
index dd6dbb149..e024f9126 100644
--- a/examples/webenginewidgets/simplebrowser/webview.cpp
+++ b/examples/webenginewidgets/simplebrowser/webview.cpp
@@ -58,7 +58,7 @@ WebView::WebView(QWidget *parent)
                                                    tr("Render process exited with code: %1\n"
                                                       "Do you want to reload the page ?").arg(statusCode));
         if (btn == QMessageBox::Yes)
-            QTimer::singleShot(0, [this] { reload(); });
+            QTimer::singleShot(0, this, &WebView::reload);
     });
 }
 
@@ -195,12 +195,8 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
         if (viewSource == actions.cend())
             menu->addSeparator();
 
-        QAction *action = new QAction(menu);
-        action->setText("Open inspector in new window");
+        QAction *action = menu->addAction("Open inspector in new window");
         connect(action, &QAction::triggered, [this]() { emit devToolsRequested(page()); });
-
-        QAction *before(inspectElement == actions.cend() ? nullptr : *inspectElement);
-        menu->insertAction(before, action);
     } else {
         (*inspectElement)->setText(tr("Inspect element"));
     }
@@ -241,8 +237,8 @@ void WebView::handleAuthenticationRequired(const QUrl &requestUrl, QAuthenticato
     passwordDialog.m_iconLabel->setPixmap(icon.pixmap(32, 32));
 
     QString introMessage(tr("Enter username and password for \"%1\" at %2")
-                                 .arg(auth->realm())
-                                 .arg(requestUrl.toString().toHtmlEscaped()));
+                                 .arg(auth->realm(),
+                                      requestUrl.toString().toHtmlEscaped()));
     passwordDialog.m_infoLabel->setText(introMessage);
     passwordDialog.m_infoLabel->setWordWrap(true);