diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-03 15:18:27 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-10 10:39:34 +0200 |
commit | f820e8f1993ca2a3e6808467cabca82e464f36e7 (patch) | |
tree | 7641849f913aad7a0442aa7b74f7a58e98e5d96c /src/webenginewidgets/api | |
parent | c3108a1a7ab64a3fff2c2b7284ac22020571e2b7 (diff) |
Switch QWebEnginePage::findText() to std::function
Leaving further API modification for later
Pick-to: 6.2
Task-number: QTBUG-63235
Change-Id: I75367ee5d4ce071abaeed361d2dc27c64fb6dd8a
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/webenginewidgets/api')
-rw-r--r-- | src/webenginewidgets/api/qwebengineview.cpp | 2 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebengineview.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index a34c841e3..8ea0beba1 100644 --- a/src/webenginewidgets/api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp @@ -731,7 +731,7 @@ void QWebEngineView::triggerPageAction(QWebEnginePage::WebAction action, bool ch page()->triggerAction(action, checked); } -void QWebEngineView::findText(const QString &subString, QWebEnginePage::FindFlags options, const QWebEngineCallback<bool> &resultCallback) +void QWebEngineView::findText(const QString &subString, QWebEnginePage::FindFlags options, const std::function<void(bool)> &resultCallback) { page()->findText(subString, options, resultCallback); } diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h index 136df0b93..20ab9d6c0 100644 --- a/src/webenginewidgets/api/qwebengineview.h +++ b/src/webenginewidgets/api/qwebengineview.h @@ -98,7 +98,7 @@ public: qreal zoomFactor() const; void setZoomFactor(qreal factor); - void findText(const QString &subString, QWebEnginePage::FindFlags options = QWebEnginePage::FindFlags(), const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>()); + void findText(const QString &subString, QWebEnginePage::FindFlags options = {}, const std::function<void(bool)> &resultCallback = std::function<void(bool)>()); QSize sizeHint() const override; QWebEngineSettings *settings() const; |