From 6ef0a365124d435314113837dc77fa07b02ff86b Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 4 Sep 2015 10:18:44 +0200 Subject: Make request job and request info methods consistent Changes the method names so the two request representation uses the same method name and the same style of naming of actions on the requests. Change-Id: I409ed1a5f6ac0835878f65ee978b6f224e42aa20 Reviewed-by: Kai Koehne Reviewed-by: Joerg Bornemann --- src/core/api/qwebengineurlrequestinfo.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/core/api/qwebengineurlrequestinfo.cpp') diff --git a/src/core/api/qwebengineurlrequestinfo.cpp b/src/core/api/qwebengineurlrequestinfo.cpp index 282361584..b769081f8 100644 --- a/src/core/api/qwebengineurlrequestinfo.cpp +++ b/src/core/api/qwebengineurlrequestinfo.cpp @@ -209,10 +209,10 @@ QWebEngineUrlRequestInfo::NavigationType QWebEngineUrlRequestInfo::navigationTyp } /*! - Returns the request URL. + Returns the requested URL. */ -const QUrl &QWebEngineUrlRequestInfo::url() const +QUrl QWebEngineUrlRequestInfo::requestUrl() const { Q_D(const QWebEngineUrlRequestInfo); return d->url; @@ -223,7 +223,7 @@ const QUrl &QWebEngineUrlRequestInfo::url() const Returns the HTTP method of the request (for example, GET or POST). */ -const QByteArray &QWebEngineUrlRequestInfo::method() const +QByteArray QWebEngineUrlRequestInfo::requestMethod() const { Q_D(const QWebEngineUrlRequestInfo); return d->method; @@ -234,7 +234,7 @@ const QByteArray &QWebEngineUrlRequestInfo::method() const It is only possible to redirect requests that do not have payload data, such as GET requests. */ -void QWebEngineUrlRequestInfo::redirectTo(const QUrl &url) +void QWebEngineUrlRequestInfo::redirect(const QUrl &url) { Q_D(QWebEngineUrlRequestInfo); d->url = url; @@ -246,7 +246,7 @@ void QWebEngineUrlRequestInfo::redirectTo(const QUrl &url) This function can be used to prevent navigating away from a given domain, for example. */ -void QWebEngineUrlRequestInfo::blockRequest(bool shouldBlock) +void QWebEngineUrlRequestInfo::block(bool shouldBlock) { Q_D(QWebEngineUrlRequestInfo); d->shouldBlockRequest = shouldBlock; -- cgit v1.2.3