diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-08-26 16:25:00 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-09-28 13:59:08 +0200 |
| commit | 3bf3d3fe7bcfa7933ecc2ec2f1607f586b2b00d8 (patch) | |
| tree | 85efe06d6dd9a6afb997b016007376a86c4a2aaf /src/core/api/qwebenginescript.h | |
| parent | b598974f9cbde2688a75488d6920e474343c84d2 (diff) | |
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>
Diffstat (limited to 'src/core/api/qwebenginescript.h')
| -rw-r--r-- | src/core/api/qwebenginescript.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/api/qwebenginescript.h b/src/core/api/qwebenginescript.h index 42a98e3e2..0c1849dac 100644 --- a/src/core/api/qwebenginescript.h +++ b/src/core/api/qwebenginescript.h @@ -85,8 +85,6 @@ public: QWebEngineScript &operator=(const QWebEngineScript &other); - bool isNull() const; - QString name() const; void setName(const QString &); @@ -119,7 +117,7 @@ private: QSharedDataPointer<QtWebEngineCore::UserScript> d; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QWebEngineScript) +Q_DECLARE_TYPEINFO(QWebEngineScript, Q_MOVABLE_TYPE); #ifndef QT_NO_DEBUG_STREAM Q_WEBENGINECORE_EXPORT QDebug operator<<(QDebug, const QWebEngineScript &); |