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, 4 insertions, 19 deletions

diff --git a/src/webengine/api/qquickwebenginescriptcollection.cpp b/src/webengine/api/qquickwebenginescriptcollection.cpp
index 4e4fb6579..c0939d72f 100644
--- a/src/webengine/api/qquickwebenginescriptcollection.cpp
+++ b/src/webengine/api/qquickwebenginescriptcollection.cpp
@@ -87,24 +87,14 @@ QQuickWebEngineScriptCollection::QQuickWebEngineScriptCollection(
 
 QQuickWebEngineScriptCollection::~QQuickWebEngineScriptCollection() { }
 
-int QQuickWebEngineScriptCollection::count() const
-{
-    return d->count();
-}
-
 bool QQuickWebEngineScriptCollection::contains(const QWebEngineScript &value) const
 {
     return d->contains(value);
 }
 
-QWebEngineScript QQuickWebEngineScriptCollection::findScript(const QString &name) const
+QList<QWebEngineScript> QQuickWebEngineScriptCollection::find(const QString &name) const
 {
-    return d->findScript(name);
-}
-
-QList<QWebEngineScript> QQuickWebEngineScriptCollection::findScripts(const QString &name) const
-{
-    return d->findScripts(name);
+    return d->find(name);
 }
 
 void QQuickWebEngineScriptCollection::insert(const QWebEngineScript &s)
@@ -127,14 +117,9 @@ void QQuickWebEngineScriptCollection::clear()
     d->clear();
 }
 
-QList<QWebEngineScript> QQuickWebEngineScriptCollection::toList() const
-{
-    return d->toList();
-}
-
 QJSValue QQuickWebEngineScriptCollection::collection() const
 {
-    const QList<QWebEngineScript> &list = toList();
+    const QList<QWebEngineScript> &list = d->toList();
     QQmlContext *context = QQmlEngine::contextForObject(this);
     QQmlEngine *engine = context->engine();
     QV4::ExecutionEngine *v4 = QQmlEnginePrivate::getV4Engine(engine);
@@ -164,7 +149,7 @@ void QQuickWebEngineScriptCollection::setCollection(const QJSValue &scripts)
         }
         scriptList.append(s);
     }
-    if (scriptList != toList()) {
+    if (scriptList != d->toList()) {
         clear();
         insert(scriptList);
         Q_EMIT collectionChanged();