diff options
author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-01-15 17:21:17 +0100 |
---|---|---|
committer | Jüri Valdmann <juri.valdmann@qt.io> | 2018-02-03 08:27:45 +0000 |
commit | dff5f546d13422dd3f6772baed42c4061be2732a (patch) | |
tree | 87a6b3defae6761a6ca7391cd9ef526ff6061b47 | |
parent | 0cc07329495a05fc5f8532c4420bd23db662fdb6 (diff) |
QuotaPermissionController: Rename cancel() to reject()
Better matches our public API and other classes.
Task-number: QTBUG-62783
Change-Id: I75f54802325b0ed029528d3ca5af0f0cd7ee01df
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r-- | src/core/quota_permission_controller.cpp | 2 | ||||
-rw-r--r-- | src/core/quota_permission_controller.h | 2 | ||||
-rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 2 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebenginequotapermissionrequest.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/core/quota_permission_controller.cpp b/src/core/quota_permission_controller.cpp index 59fc6198d..b874c0449 100644 --- a/src/core/quota_permission_controller.cpp +++ b/src/core/quota_permission_controller.cpp @@ -77,7 +77,7 @@ void QuotaPermissionController::accept() } } -void QuotaPermissionController::cancel() +void QuotaPermissionController::reject() { if (!m_answered) { d->m_context->dispatchCallbackOnIOThread(d->m_callback, QuotaPermissionContextQt::QUOTA_PERMISSION_RESPONSE_DISALLOW); diff --git a/src/core/quota_permission_controller.h b/src/core/quota_permission_controller.h index 36f751c2c..e584d7b52 100644 --- a/src/core/quota_permission_controller.h +++ b/src/core/quota_permission_controller.h @@ -55,7 +55,7 @@ public: ~QuotaPermissionController(); void accept(); - void cancel(); + void reject(); QUrl origin(); qint64 requestedSize(); diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 5bb9fa23a..3a63b8708 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -1809,7 +1809,7 @@ void QQuickWebEngineQuotaPermissionRequest::accept() void QQuickWebEngineQuotaPermissionRequest::reject() { - d_ptr->cancel(); + d_ptr->reject(); } QUrl QQuickWebEngineQuotaPermissionRequest::origin() const diff --git a/src/webenginewidgets/api/qwebenginequotapermissionrequest.cpp b/src/webenginewidgets/api/qwebenginequotapermissionrequest.cpp index 0841854ea..172c66995 100644 --- a/src/webenginewidgets/api/qwebenginequotapermissionrequest.cpp +++ b/src/webenginewidgets/api/qwebenginequotapermissionrequest.cpp @@ -64,7 +64,7 @@ QWebEngineQuotaPermissionRequest::QWebEngineQuotaPermissionRequest(QSharedPointe */ void QWebEngineQuotaPermissionRequest::reject() { - d_ptr->cancel(); + d_ptr->reject(); } /*! |