diff options
Diffstat (limited to 'src/webenginewidgets')
-rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 6 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebenginepage_p.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index eedf76d1b..b082f219d 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -163,19 +163,19 @@ void QWebEnginePagePrivate::close() Q_EMIT q->windowCloseRequested(); } -void QWebEnginePagePrivate::didRunJavaScript(const QVariant& result, quint64 requestId) +void QWebEnginePagePrivate::didRunJavaScript(quint64 requestId, const QVariant& result) { if (QExplicitlySharedDataPointer<VariantCallback> callback = m_variantCallbacks.take(requestId)) (*callback)(result); } -void QWebEnginePagePrivate::didFetchDocumentMarkup(const QString& result, quint64 requestId) +void QWebEnginePagePrivate::didFetchDocumentMarkup(quint64 requestId, const QString& result) { if (QExplicitlySharedDataPointer<StringCallback> callback = m_stringCallbacks.take(requestId)) (*callback)(result); } -void QWebEnginePagePrivate::didFetchDocumentInnerText(const QString& result, quint64 requestId) +void QWebEnginePagePrivate::didFetchDocumentInnerText(quint64 requestId, const QString& result) { if (QExplicitlySharedDataPointer<StringCallback> callback = m_stringCallbacks.take(requestId)) (*callback)(result); diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h index 3c136ed6d..86605c78d 100644 --- a/src/webenginewidgets/api/qwebenginepage_p.h +++ b/src/webenginewidgets/api/qwebenginepage_p.h @@ -84,9 +84,9 @@ public: virtual bool isFullScreen() const Q_DECL_OVERRIDE { return false; }; virtual void javascriptDialog(QSharedPointer<JavaScriptDialogController>) Q_DECL_OVERRIDE; virtual void runFileChooser(FileChooserMode, const QString &defaultFileName, const QStringList &acceptedMimeTypes) Q_DECL_OVERRIDE; - virtual void didRunJavaScript(const QVariant& result, quint64 requestId) Q_DECL_OVERRIDE; - virtual void didFetchDocumentMarkup(const QString& result, quint64 requestId) Q_DECL_OVERRIDE; - virtual void didFetchDocumentInnerText(const QString& result, quint64 requestId) Q_DECL_OVERRIDE; + virtual void didRunJavaScript(quint64 requestId, const QVariant& result) Q_DECL_OVERRIDE; + virtual void didFetchDocumentMarkup(quint64 requestId, const QString& result) Q_DECL_OVERRIDE; + virtual void didFetchDocumentInnerText(quint64 requestId, const QString& result) Q_DECL_OVERRIDE; virtual void passOnFocus(bool reverse) Q_DECL_OVERRIDE { Q_UNUSED(reverse); }; virtual void javaScriptConsoleMessage(int level, const QString& message, int lineNumber, const QString& sourceID) Q_DECL_OVERRIDE; |