From 71edccabd4c359eb1ac9d6f6c3220b0d308f3a7b Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Wed, 12 Feb 2014 12:59:00 +0100 Subject: Move the requestID argument before the result This tries to get the order of declaration to be consistent. It also follows the order used by Chromium in some places where the routing_id usually comes first, then the request_id and then the result of the asynchronous request. Change-Id: I88e164dee67e1631161a222f7dd7a4679c3d3acd Reviewed-by: Simon Hausmann --- src/webenginewidgets/api/qwebenginepage.cpp | 6 +++--- src/webenginewidgets/api/qwebenginepage_p.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/webenginewidgets') 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 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 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 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) 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; -- cgit v1.2.3