diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-04 11:07:25 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-18 00:59:32 +0000 |
commit | 75522d57a8a8d4d038dc5c0954ce823f290ca7e7 (patch) | |
tree | 08f24915b696402fc45dc095e288f509750b3081 /src/webenginewidgets/api/qwebengineview.cpp | |
parent | 267ea323460766b146cf68d8446b8ea7c45f754f (diff) |
Switch QWebEngineCallbacks in QWebEnginePage to std::function
Change-Id: I5b0c1c7ef0966c3cff79184aa0733b59208d6890
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 566a4df270911e1656efef5dbb16e4f95bf6ca8d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/webenginewidgets/api/qwebengineview.cpp')
-rw-r--r-- | src/webenginewidgets/api/qwebengineview.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index 65b53103a..b2eb17ec7 100644 --- a/src/webenginewidgets/api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp @@ -517,7 +517,7 @@ void QWebEngineViewPrivate::didPrintPage(quint64 requestId, QSharedPointer<QByte if (!currentPrinter) { if (!result.data()) return; - page->d_ptr->m_callbacks.invoke(requestId, *(result.data())); + m_callbacks.invoke(requestId, *(result.data())); return; } @@ -545,7 +545,7 @@ void QWebEngineViewPrivate::didPrintPage(quint64 requestId, QSharedPointer<QByte #else // we should never enter this branch, but just for safe-keeping... Q_UNUSED(result); - page->d_ptr->m_callbacks.invoke(requestId, QByteArray()); + m_callbacks.invoke(requestId, QByteArray()); #endif } @@ -1006,19 +1006,19 @@ void QWebEngineView::printToPdf(const QString &filePath, const QPageLayout &layo */ void QWebEngineView::printToPdf(const QWebEngineCallback<const QByteArray&> &resultCallback, const QPageLayout &layout) { -#if QT_CONFIG(webengine_printing_and_pdf) Q_D(QWebEngineView); +#if QT_CONFIG(webengine_printing_and_pdf) if (d->currentPrinter) { qWarning("Cannot print to PDF while printing at the same time."); - page()->d_ptr->m_callbacks.invokeEmpty(resultCallback); + d->m_callbacks.invokeEmpty(resultCallback); return; } page()->d_ptr->ensureInitialized(); quint64 requestId = page()->d_ptr->adapter->printToPDFCallbackResult(layout); - page()->d_ptr->m_callbacks.registerCallback(requestId, resultCallback); + d->m_callbacks.registerCallback(requestId, resultCallback); #else Q_UNUSED(layout); - page()->d_ptr->m_callbacks.invokeEmpty(resultCallback); + d->m_callbacks.invokeEmpty(resultCallback); #endif } |