From b78e0c8a1e2df919f652da5e508306c8250c012e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCri=20Valdmann?= Date: Tue, 20 Mar 2018 17:51:28 +0100 Subject: Shorten names of permission classes Remove 'permission' from class and signal names, so e.g. QWebEngineQuotaPermissionRequest becomes QWebEngineQuotaRequest and quotaPermissionRequested becomes quotaRequested. Rename the internal controller classes to public name + "Controller". Change-Id: I247714ab0a2880adbf4ed8ee68f1b78838ae7a14 Reviewed-by: Kai Koehne --- src/webengine/api/qquickwebengineview.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/webengine/api/qquickwebengineview.cpp') diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 18c54c263..eeb3157a2 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -56,8 +56,8 @@ #include "qquickwebengineprofile_p.h" #include "qquickwebenginesettings_p.h" #include "qquickwebenginescript_p.h" -#include "qwebenginequotapermissionrequest.h" -#include "qwebengineregisterprotocolhandlerpermissionrequest.h" +#include "qwebenginequotarequest.h" +#include "qwebengineregisterprotocolhandlerrequest.h" #ifdef ENABLE_QML_TESTSUPPORT_API #include "qquickwebenginetestsupport_p.h" @@ -590,18 +590,18 @@ void QQuickWebEngineViewPrivate::runMouseLockPermissionRequest(const QUrl &secur adapter->grantMouseLockPermission(false); } -void QQuickWebEngineViewPrivate::runQuotaPermissionRequest(QSharedPointer controller) +void QQuickWebEngineViewPrivate::runQuotaRequest(QSharedPointer controller) { Q_Q(QQuickWebEngineView); - QWebEngineQuotaPermissionRequest request(std::move(controller)); - Q_EMIT q->quotaPermissionRequested(request); + QWebEngineQuotaRequest request(std::move(controller)); + Q_EMIT q->quotaRequested(request); } -void QQuickWebEngineViewPrivate::runRegisterProtocolHandlerPermissionRequest(QSharedPointer controller) +void QQuickWebEngineViewPrivate::runRegisterProtocolHandlerRequest(QSharedPointer controller) { Q_Q(QQuickWebEngineView); - QWebEngineRegisterProtocolHandlerPermissionRequest request(std::move(controller)); - Q_EMIT q->registerProtocolHandlerPermissionRequested(request); + QWebEngineRegisterProtocolHandlerRequest request(std::move(controller)); + Q_EMIT q->registerProtocolHandlerRequested(request); } QObject *QQuickWebEngineViewPrivate::accessibilityParentObject() -- cgit v1.2.3