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 <kai.koehne@qt.io>

5 files changed, 65 insertions, 69 deletions

diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro
index 637a2ffa0..632034a9d 100644
--- a/src/core/api/core_api.pro
+++ b/src/core/api/core_api.pro
@@ -37,8 +37,8 @@ HEADERS = \
     qwebenginecookiestore.h \
     qwebenginecookiestore_p.h \
     qwebenginehttprequest.h \
-    qwebenginequotapermissionrequest.h \
-    qwebengineregisterprotocolhandlerpermissionrequest.h \
+    qwebenginequotarequest.h \
+    qwebengineregisterprotocolhandlerrequest.h \
     qwebengineurlrequestinterceptor.h \
     qwebengineurlrequestinfo.h \
     qwebengineurlrequestinfo_p.h \
@@ -50,8 +50,8 @@ SOURCES = \
     qwebenginebrowsercontext.cpp \
     qwebenginecookiestore.cpp \
     qwebenginehttprequest.cpp \
-    qwebenginequotapermissionrequest.cpp \
-    qwebengineregisterprotocolhandlerpermissionrequest.cpp \
+    qwebenginequotarequest.cpp \
+    qwebengineregisterprotocolhandlerrequest.cpp \
     qwebengineurlrequestinfo.cpp \
     qwebengineurlrequestjob.cpp \
     qwebengineurlschemehandler.cpp
diff --git a/src/core/api/qwebenginequotapermissionrequest.cpp b/src/core/api/qwebenginequotarequest.cpp
index 86ed65326..49c9f041f 100644
--- a/src/core/api/qwebenginequotapermissionrequest.cpp
+++ b/src/core/api/qwebenginequotarequest.cpp
@@ -37,32 +37,32 @@
 **
 ****************************************************************************/
 
-#include "qwebenginequotapermissionrequest.h"
+#include "qwebenginequotarequest.h"
 
-#include "quota_permission_controller.h"
+#include "quota_request_controller.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
-    \class QWebEngineQuotaPermissionRequest
-    \brief The QWebEngineQuotaPermissionRequest class enables accepting or rejecting
-    requests for larger persistent storage than the application's current allocation
-    in File System API.
+    \class QWebEngineQuotaRequest
+    \brief The QWebEngineQuotaRequest class enables accepting or rejecting
+    requests for larger persistent storage than the application's current
+    allocation in File System API.
 
     \since 5.11
     \inmodule QtWebEngineCore
 
-    This class is used by the QWebEnginePage::quotaPermissionRequested() signal
-    to \l accept() or \l reject() a request for an increase in the persistent
-    storage allocated to the application. The default quota is 0 bytes.
+    This class is used by the QWebEnginePage::quotaRequested() signal to \l
+    accept() or \l reject() a request for an increase in the persistent storage
+    allocated to the application. The default quota is 0 bytes.
 */
 
-/*! \fn QWebEngineQuotaPermissionRequest::QWebEngineQuotaPermissionRequest()
+/*! \fn QWebEngineQuotaRequest::QWebEngineQuotaRequest()
     \internal
 */
 
 /*! \internal */
-QWebEngineQuotaPermissionRequest::QWebEngineQuotaPermissionRequest(QSharedPointer<QtWebEngineCore::QuotaPermissionController> controller)
+QWebEngineQuotaRequest::QWebEngineQuotaRequest(QSharedPointer<QtWebEngineCore::QuotaRequestController> controller)
     : d_ptr(controller)
 {
 }
@@ -70,7 +70,7 @@ QWebEngineQuotaPermissionRequest::QWebEngineQuotaPermissionRequest(QSharedPointe
 /*!
     Rejects a request for larger persistent storage.
 */
-void QWebEngineQuotaPermissionRequest::reject()
+void QWebEngineQuotaRequest::reject()
 {
     d_ptr->reject();
 }
@@ -78,39 +78,37 @@ void QWebEngineQuotaPermissionRequest::reject()
 /*!
     Accepts a request for larger persistent storage.
 */
-void QWebEngineQuotaPermissionRequest::accept()
+void QWebEngineQuotaRequest::accept()
 {
     d_ptr->accept();
 }
 
 /*!
-    \property QWebEngineQuotaPermissionRequest::origin
-    \brief The URL of the web page that issued the quota permission request.
+    \property QWebEngineQuotaRequest::origin
+    \brief The URL of the web page that issued the quota request.
 */
 
-QUrl QWebEngineQuotaPermissionRequest::origin() const
+QUrl QWebEngineQuotaRequest::origin() const
 {
     return d_ptr->origin();
 }
 
 /*!
-    \property QWebEngineQuotaPermissionRequest::requestedSize
+    \property QWebEngineQuotaRequest::requestedSize
     \brief Contains the size of the requested disk space in bytes.
 */
 
-qint64 QWebEngineQuotaPermissionRequest::requestedSize() const
+qint64 QWebEngineQuotaRequest::requestedSize() const
 {
     return d_ptr->requestedSize();
 }
 
-/*! \fn bool QWebEngineQuotaPermissionRequest::operator==(const QWebEngineQuotaPermissionRequest &that) const
-    Returns \c true if \a that points to the same object as this quota
-    permission request.
+/*! \fn bool QWebEngineQuotaRequest::operator==(const QWebEngineQuotaRequest &that) const
+    Returns \c true if \a that points to the same object as this quota request.
 */
 
-/*! \fn bool QWebEngineQuotaPermissionRequest::operator!=(const QWebEngineQuotaPermissionRequest &that) const
-    Returns \c true if \a that points to a different object than this quota
-    permission request.
+/*! \fn bool QWebEngineQuotaRequest::operator!=(const QWebEngineQuotaRequest &that) const
+    Returns \c true if \a that points to a different object than this request.
 */
 
 QT_END_NAMESPACE
diff --git a/src/core/api/qwebenginequotapermissionrequest.h b/src/core/api/qwebenginequotarequest.h
index 5c6e6c007..dbba6ad82 100644
--- a/src/core/api/qwebenginequotapermissionrequest.h
+++ b/src/core/api/qwebenginequotarequest.h
@@ -37,36 +37,36 @@
 **
 ****************************************************************************/
 
-#ifndef QWEBENGINEQUOTAPERMISSIONREQUEST_H
-#define QWEBENGINEQUOTAPERMISSIONREQUEST_H
+#ifndef QWEBENGINEQUOTAREQUEST_H
+#define QWEBENGINEQUOTAREQUEST_H
 
 #include <QtCore/qsharedpointer.h>
 #include <QtCore/qurl.h>
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
 
 namespace QtWebEngineCore {
-    class QuotaPermissionController;
+    class QuotaRequestController;
 }
 
 QT_BEGIN_NAMESPACE
 
-class QWEBENGINE_EXPORT QWebEngineQuotaPermissionRequest {
+class QWEBENGINE_EXPORT QWebEngineQuotaRequest {
     Q_GADGET
     Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL)
     Q_PROPERTY(qint64 requestedSize READ requestedSize CONSTANT FINAL)
 public:
-    QWebEngineQuotaPermissionRequest() {}
-    QWebEngineQuotaPermissionRequest(QSharedPointer<QtWebEngineCore::QuotaPermissionController>);
+    QWebEngineQuotaRequest() {}
+    QWebEngineQuotaRequest(QSharedPointer<QtWebEngineCore::QuotaRequestController>);
     Q_INVOKABLE void accept();
     Q_INVOKABLE void reject();
     QUrl origin() const;
     qint64 requestedSize() const;
-    bool operator==(const QWebEngineQuotaPermissionRequest &that) const { return d_ptr == that.d_ptr; }
-    bool operator!=(const QWebEngineQuotaPermissionRequest &that) const { return d_ptr != that.d_ptr; }
+    bool operator==(const QWebEngineQuotaRequest &that) const { return d_ptr == that.d_ptr; }
+    bool operator!=(const QWebEngineQuotaRequest &that) const { return d_ptr != that.d_ptr; }
 private:
-    QSharedPointer<QtWebEngineCore::QuotaPermissionController> d_ptr;
+    QSharedPointer<QtWebEngineCore::QuotaRequestController> d_ptr;
 };
 
 QT_END_NAMESPACE
 
-#endif // QWEBENGINEQUOTAPERMISSIONREQUEST_H
+#endif // QWEBENGINEQUOTAREQUEST_H
diff --git a/src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.cpp b/src/core/api/qwebengineregisterprotocolhandlerrequest.cpp
index b045a2823..1921f78f4 100644
--- a/src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.cpp
+++ b/src/core/api/qwebengineregisterprotocolhandlerrequest.cpp
@@ -37,29 +37,29 @@
 **
 ****************************************************************************/
 
-#include "qwebengineregisterprotocolhandlerpermissionrequest.h"
+#include "qwebengineregisterprotocolhandlerrequest.h"
 
-#include "register_protocol_handler_permission_controller.h"
+#include "register_protocol_handler_request_controller.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
-    \class QWebEngineRegisterProtocolHandlerPermissionRequest
+    \class QWebEngineRegisterProtocolHandlerRequest
     \inmodule QtWebEngineCore
     \since 5.11
-    \brief The QWebEngineRegisterProtocolHandlerPermissionRequest class enables
+    \brief The QWebEngineRegisterProtocolHandlerRequest class enables
     accepting or rejecting requests from the \l registerProtocolHandler API.
 
-    \sa QWebEnginePage::registerProtocolHandlerPermissionRequested
+    \sa QWebEnginePage::registerProtocolHandlerRequested
 */
 
-/*! \fn QWebEngineRegisterProtocolHandlerPermissionRequest::QWebEngineRegisterProtocolHandlerPermissionRequest()
+/*! \fn QWebEngineRegisterProtocolHandlerRequest::QWebEngineRegisterProtocolHandlerRequest()
     \internal
 */
 
 /*! \internal */
-QWebEngineRegisterProtocolHandlerPermissionRequest::QWebEngineRegisterProtocolHandlerPermissionRequest(
-    QSharedPointer<QtWebEngineCore::RegisterProtocolHandlerPermissionController> d_ptr)
+QWebEngineRegisterProtocolHandlerRequest::QWebEngineRegisterProtocolHandlerRequest(
+    QSharedPointer<QtWebEngineCore::RegisterProtocolHandlerRequestController> d_ptr)
     : d_ptr(std::move(d_ptr))
 {}
 
@@ -68,7 +68,7 @@ QWebEngineRegisterProtocolHandlerPermissionRequest::QWebEngineRegisterProtocolHa
 
     Subsequent calls to accept() and reject() are ignored.
 */
-void QWebEngineRegisterProtocolHandlerPermissionRequest::reject()
+void QWebEngineRegisterProtocolHandlerRequest::reject()
 {
     d_ptr->reject();
 }
@@ -78,41 +78,39 @@ void QWebEngineRegisterProtocolHandlerPermissionRequest::reject()
 
     Subsequent calls to accept() and reject() are ignored.
 */
-void QWebEngineRegisterProtocolHandlerPermissionRequest::accept()
+void QWebEngineRegisterProtocolHandlerRequest::accept()
 {
     d_ptr->accept();
 }
 
 /*!
-    \property QWebEngineRegisterProtocolHandlerPermissionRequest::origin
+    \property QWebEngineRegisterProtocolHandlerRequest::origin
     \brief The URL template for the protocol handler.
 
     This is the second parameter from the \l registerProtocolHandler call.
 */
-QUrl QWebEngineRegisterProtocolHandlerPermissionRequest::origin() const
+QUrl QWebEngineRegisterProtocolHandlerRequest::origin() const
 {
     return d_ptr->origin();
 }
 
 /*!
-    \property QWebEngineRegisterProtocolHandlerPermissionRequest::scheme
+    \property QWebEngineRegisterProtocolHandlerRequest::scheme
     \brief The URL scheme for the protocol handler.
 
     This is the first parameter from the \l registerProtocolHandler call.
 */
-QString QWebEngineRegisterProtocolHandlerPermissionRequest::scheme() const
+QString QWebEngineRegisterProtocolHandlerRequest::scheme() const
 {
     return d_ptr->scheme();
 }
 
-/*! \fn bool QWebEngineRegisterProtocolHandlerPermissionRequest::operator==(const QWebEngineRegisterProtocolHandlerPermissionRequest &that) const
-    Returns \c true if \a that points to the same object as this protocol
-    handler permission request.
+/*! \fn bool QWebEngineRegisterProtocolHandlerRequest::operator==(const QWebEngineRegisterProtocolHandlerRequest &that) const
+    Returns \c true if \a that points to the same object as this request.
 */
 
-/*! \fn bool QWebEngineRegisterProtocolHandlerPermissionRequest::operator!=(const QWebEngineRegisterProtocolHandlerPermissionRequest &that) const
-    Returns \c true if \a that points to a different object than this protocol
-    handler permission request.
+/*! \fn bool QWebEngineRegisterProtocolHandlerRequest::operator!=(const QWebEngineRegisterProtocolHandlerRequest &that) const
+    Returns \c true if \a that points to a different object than this request.
 */
 
 QT_END_NAMESPACE
diff --git a/src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.h b/src/core/api/qwebengineregisterprotocolhandlerrequest.h
index 254f26508..936043b4d 100644
--- a/src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.h
+++ b/src/core/api/qwebengineregisterprotocolhandlerrequest.h
@@ -37,37 +37,37 @@
 **
 ****************************************************************************/
 
-#ifndef QWEBENGINEREGISTERPROTOCOLHANDLERPERMISSIONREQUEST_H
-#define QWEBENGINEREGISTERPROTOCOLHANDLERPERMISSIONREQUEST_H
+#ifndef QWEBENGINEREGISTERPROTOCOLHANDLERREQUEST_H
+#define QWEBENGINEREGISTERPROTOCOLHANDLERREQUEST_H
 
 #include <QtCore/qsharedpointer.h>
 #include <QtCore/qurl.h>
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
 
 namespace QtWebEngineCore {
-    class RegisterProtocolHandlerPermissionController;
+    class RegisterProtocolHandlerRequestController;
 }
 
 QT_BEGIN_NAMESPACE
 
-class QWEBENGINE_EXPORT QWebEngineRegisterProtocolHandlerPermissionRequest {
+class QWEBENGINE_EXPORT QWebEngineRegisterProtocolHandlerRequest {
     Q_GADGET
     Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL)
     Q_PROPERTY(QString scheme READ scheme CONSTANT FINAL)
 public:
-    QWebEngineRegisterProtocolHandlerPermissionRequest() {}
-    QWebEngineRegisterProtocolHandlerPermissionRequest(
-        QSharedPointer<QtWebEngineCore::RegisterProtocolHandlerPermissionController>);
+    QWebEngineRegisterProtocolHandlerRequest() {}
+    QWebEngineRegisterProtocolHandlerRequest(
+        QSharedPointer<QtWebEngineCore::RegisterProtocolHandlerRequestController>);
     Q_INVOKABLE void accept();
     Q_INVOKABLE void reject();
     QUrl origin() 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; }
+    bool operator==(const QWebEngineRegisterProtocolHandlerRequest &that) const { return d_ptr == that.d_ptr; }
+    bool operator!=(const QWebEngineRegisterProtocolHandlerRequest &that) const { return d_ptr != that.d_ptr; }
 private:
-    QSharedPointer<QtWebEngineCore::RegisterProtocolHandlerPermissionController> d_ptr;
+    QSharedPointer<QtWebEngineCore::RegisterProtocolHandlerRequestController> d_ptr;
 };
 
 QT_END_NAMESPACE
 
-#endif // QWEBENGINEREGISTERPROTOCOLHANDLERPERMISSIONREQUEST_H
+#endif // QWEBENGINEREGISTERPROTOCOLHANDLERREQUEST_H