diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-03-01 14:55:01 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2018-03-08 14:41:10 +0000 |
| commit | a03fb5fc7ac03c35739324d63eb29da756e1e908 (patch) | |
| tree | 85fe63d86d1ffcb37cbb937c02579040b72e6a3a /src/core/api | |
| parent | 349d11dd83578b5baeec87e41c71f612e5bd21b3 (diff) | |
Rename protocol() to scheme() in QWERPHPermissionRequest
Scheme refers to a part of a URL. Protocol refers to a formal standard for
communication over a network. Therefore scheme is more accurate here, since
registerProtocolHandler only defines simple aliases.
Change-Id: I71a1511aa92e41c3e3aca4c0403f54af6d91c563
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/api')
| -rw-r--r-- | src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.cpp | 6 | ||||
| -rw-r--r-- | src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.cpp b/src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.cpp index 1d893bd1c..b7301af76 100644 --- a/src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.cpp +++ b/src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.cpp @@ -95,14 +95,14 @@ QUrl QWebEngineRegisterProtocolHandlerPermissionRequest::origin() const } /*! - \property QWebEngineRegisterProtocolHandlerPermissionRequest::protocol + \property QWebEngineRegisterProtocolHandlerPermissionRequest::scheme \brief The URL scheme for the protocol handler. This is the first parameter from the \l registerProtocolHandler call. */ -QString QWebEngineRegisterProtocolHandlerPermissionRequest::protocol() const +QString QWebEngineRegisterProtocolHandlerPermissionRequest::scheme() const { - return d_ptr->protocol(); + return d_ptr->scheme(); } /*! \fn bool QWebEngineRegisterProtocolHandlerPermissionRequest::operator==(const QWebEngineRegisterProtocolHandlerPermissionRequest &that) const diff --git a/src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.h b/src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.h index 43ddf35e4..254f26508 100644 --- a/src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.h +++ b/src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE class QWEBENGINE_EXPORT QWebEngineRegisterProtocolHandlerPermissionRequest { Q_GADGET Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL) - Q_PROPERTY(QString protocol READ protocol CONSTANT FINAL) + Q_PROPERTY(QString scheme READ scheme CONSTANT FINAL) public: QWebEngineRegisterProtocolHandlerPermissionRequest() {} QWebEngineRegisterProtocolHandlerPermissionRequest( @@ -61,7 +61,7 @@ public: Q_INVOKABLE void accept(); Q_INVOKABLE void reject(); QUrl origin() const; - QString protocol() const; + QString scheme() const; bool operator==(const QWebEngineRegisterProtocolHandlerPermissionRequest &that) const { return d_ptr == that.d_ptr; } bool operator!=(const QWebEngineRegisterProtocolHandlerPermissionRequest &that) const { return d_ptr != that.d_ptr; } private: |