From 3bf3d3fe7bcfa7933ecc2ec2f1607f586b2b00d8 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 26 Aug 2020 16:25:00 +0200 Subject: 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 --- src/core/api/qwebenginescriptcollection.cpp | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) (limited to 'src/core/api/qwebenginescriptcollection.cpp') diff --git a/src/core/api/qwebenginescriptcollection.cpp b/src/core/api/qwebenginescriptcollection.cpp index 087aad4cb..6dfa12c46 100644 --- a/src/core/api/qwebenginescriptcollection.cpp +++ b/src/core/api/qwebenginescriptcollection.cpp @@ -102,25 +102,12 @@ bool QWebEngineScriptCollection::contains(const QWebEngineScript &value) const return d->contains(value); } -/*! - * Returns the first script found in the collection with the name \a name, or a null - * QWebEngineScript if none was found. - * \note The order in which the script collection is traversed is undefined, which means this should - * be used when the unicity is guaranteed at the application level. - * \sa findScripts() - */ - -QWebEngineScript QWebEngineScriptCollection::findScript(const QString &name) const -{ - return d->find(name); -} - /*! Returns the list of scripts in the collection with the name \a name, or an empty list if none was found. */ -QList QWebEngineScriptCollection::findScripts(const QString &name) const +QList QWebEngineScriptCollection::find(const QString &name) const { return d->toList(name); } @@ -187,8 +174,6 @@ bool QWebEngineScriptCollectionPrivate::contains(const QWebEngineScript &s) cons void QWebEngineScriptCollectionPrivate::insert(const QWebEngineScript &script) { - if (!script.d || script.d->isNull()) - return; m_scripts.append(script); if (!m_contents || m_contents->isInitialized()) m_scriptController->addUserScript(*script.d, m_contents.data()); @@ -196,8 +181,6 @@ void QWebEngineScriptCollectionPrivate::insert(const QWebEngineScript &script) bool QWebEngineScriptCollectionPrivate::remove(const QWebEngineScript &script) { - if (!script.d || script.d->isNull()) - return false; if (!m_contents || m_contents->isInitialized()) m_scriptController->removeUserScript(*script.d, m_contents.data()); return m_scripts.removeAll(script); @@ -215,14 +198,6 @@ QList QWebEngineScriptCollectionPrivate::toList(const QString return ret; } -QWebEngineScript QWebEngineScriptCollectionPrivate::find(const QString &name) const -{ - for (const QWebEngineScript &script : qAsConst(m_scripts)) - if (name == script.name()) - return script; - return QWebEngineScript(); -} - void QWebEngineScriptCollectionPrivate::clear() { m_scripts.clear(); -- cgit v1.2.1