Cleanup qwebenginescript and qwebenginescriptcollection api

This patch cleans up script and collection apis:

 * do not allocate user_script on heap, there is no need
   for that.
 * remove isNull(), which was used by collection.findScript(name)
 * remove collection.size(), there is already collection.count()
 * remove collection.findScript(name), user can use findScripts(name)
   which returns list of scripts or empty list if not found
 * collection.findScripts(name) is simply collection.find(name)

[ChangeLog] Removed QWebEngineScriptCollection::findScript(name),
use QWebEngineScriptCollection::find(name) instead.

Change-Id: Iecf8f1d7c26275b9ce3a1ea97cf4bd74b17f681e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 5 insertions, 4 deletions

diff --git a/examples/webenginewidgets/stylesheetbrowser/mainwindow.cpp b/examples/webenginewidgets/stylesheetbrowser/mainwindow.cpp
index c93205b18..bdf3c56bf 100644
--- a/examples/webenginewidgets/stylesheetbrowser/mainwindow.cpp
+++ b/examples/webenginewidgets/stylesheetbrowser/mainwindow.cpp
@@ -121,14 +121,15 @@ void MainWindow::removeStyleSheet(const QString &name, bool immediately)
     if (immediately)
         ui->webEngineView->page()->runJavaScript(s, QWebEngineScript::ApplicationWorld);
 
-    QWebEngineScript script = ui->webEngineView->page()->scripts().findScript(name);
-    ui->webEngineView->page()->scripts().remove(script);
+    const QList<QWebEngineScript> scripts = ui->webEngineView->page()->scripts().find(name);
+    if (!scripts.isEmpty())
+        ui->webEngineView->page()->scripts().remove(scripts.first());
 }
 
 bool MainWindow::hasStyleSheet(const QString &name)
 {
-    QWebEngineScript script = ui->webEngineView->page()->scripts().findScript(name);
-    return !script.isNull();
+    const QList<QWebEngineScript> scripts = ui->webEngineView->page()->scripts().find(name);
+    return !scripts.isEmpty();
 }
 
 void MainWindow::loadDefaultStyleSheets()