diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-03 16:50:27 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-09 17:58:00 +0000 |
| commit | 70e04420eb8fbd61d7f4afd293d3ac135ca7ffd6 (patch) | |
| tree | d69e20264b727879f94cc2e40734c13fd33129ed /src/core/api/qwebenginepage.h | |
| parent | af91351b817e28e26c4b00c04de1017e6dcf2f67 (diff) | |
| download | qtwebengine-70e04420eb8fbd61d7f4afd293d3ac135ca7ffd6.tar.gz | |
Get rid of a few redundant method variants
Use default arguments to get rid of the old method version without
breaking API.
Change-Id: I2f71b04bff491567df564c66cd98d0d04bfa0517
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
(cherry picked from commit 41c6eabd3b0c652bb8681f0ff14294a698f76b2e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/core/api/qwebenginepage.h')
| -rw-r--r-- | src/core/api/qwebenginepage.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/api/qwebenginepage.h b/src/core/api/qwebenginepage.h index 2afc75dc9..801bcf84d 100644 --- a/src/core/api/qwebenginepage.h +++ b/src/core/api/qwebenginepage.h @@ -283,16 +283,14 @@ public: QPointF scrollPosition() const; QSizeF contentsSize() const; - void runJavaScript(const QString& scriptSource); - void runJavaScript(const QString& scriptSource, quint32 worldId); - void runJavaScript(const QString& scriptSource, const std::function<void(const QVariant &)> &resultCallback); - void runJavaScript(const QString& scriptSource, quint32 worldId, const std::function<void(const QVariant &)> &resultCallback); + void runJavaScript(const QString &scriptSource, quint32 worldId = 0); + void runJavaScript(const QString &scriptSource, const std::function<void(const QVariant &)> &resultCallback); + void runJavaScript(const QString &scriptSource, quint32 worldId, const std::function<void(const QVariant &)> &resultCallback); QWebEngineScriptCollection &scripts(); QWebEngineSettings *settings() const; QWebChannel *webChannel() const; - void setWebChannel(QWebChannel *); - void setWebChannel(QWebChannel *, uint worldId); + void setWebChannel(QWebChannel *, quint32 worldId = 0); QColor backgroundColor() const; void setBackgroundColor(const QColor &color); |