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>

3 files changed, 9 insertions, 9 deletions

diff --git a/examples/webengine/quicknanobrowser/BrowserWindow.qml b/examples/webengine/quicknanobrowser/BrowserWindow.qml
index 55a35d611..5e98997ee 100644
--- a/examples/webengine/quicknanobrowser/BrowserWindow.qml
+++ b/examples/webengine/quicknanobrowser/BrowserWindow.qml
@@ -438,15 +438,15 @@ ApplicationWindow {
                     request.accept();
                 }
 
-                onQuotaPermissionRequested: {
+                onQuotaRequested: {
                     if (request.requestedSize <= 5 * 1024 * 1024)
                         request.accept();
                     else
                         request.reject();
                 }
 
-                onRegisterProtocolHandlerPermissionRequested: {
-                    print("accepting registerProtocolHandler permission request for " + request.scheme + " from " + request.origin);
+                onRegisterProtocolHandlerRequested: {
+                    print("accepting registerProtocolHandler request for " + request.scheme + " from " + request.origin);
                     request.accept();
                 }
 
diff --git a/examples/webenginewidgets/simplebrowser/webpage.cpp b/examples/webenginewidgets/simplebrowser/webpage.cpp
index 48a9d86b9..512778b82 100644
--- a/examples/webenginewidgets/simplebrowser/webpage.cpp
+++ b/examples/webenginewidgets/simplebrowser/webpage.cpp
@@ -63,7 +63,7 @@ WebPage::WebPage(QWebEngineProfile *profile, QObject *parent)
 {
     connect(this, &QWebEnginePage::authenticationRequired, this, &WebPage::handleAuthenticationRequired);
     connect(this, &QWebEnginePage::proxyAuthenticationRequired, this, &WebPage::handleProxyAuthenticationRequired);
-    connect(this, &QWebEnginePage::registerProtocolHandlerPermissionRequested, this, &WebPage::handleRegisterProtocolHandlerPermissionRequested);
+    connect(this, &QWebEnginePage::registerProtocolHandlerRequested, this, &WebPage::handleRegisterProtocolHandlerRequested);
 }
 
 bool WebPage::certificateError(const QWebEngineCertificateError &error)
@@ -143,8 +143,8 @@ void WebPage::handleProxyAuthenticationRequired(const QUrl &, QAuthenticator *au
     }
 }
 
-//! [registerProtocolHandlerPermissionRequested]
-void WebPage::handleRegisterProtocolHandlerPermissionRequested(QWebEngineRegisterProtocolHandlerPermissionRequest request)
+//! [registerProtocolHandlerRequested]
+void WebPage::handleRegisterProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest request)
 {
     auto answer = QMessageBox::question(
         view()->window(),
@@ -157,4 +157,4 @@ void WebPage::handleRegisterProtocolHandlerPermissionRequested(QWebEngineRegiste
     else
         request.reject();
 }
-//! [registerProtocolHandlerPermissionRequested]
+//! [registerProtocolHandlerRequested]
diff --git a/examples/webenginewidgets/simplebrowser/webpage.h b/examples/webenginewidgets/simplebrowser/webpage.h
index d44c79358..c8b884077 100644
--- a/examples/webenginewidgets/simplebrowser/webpage.h
+++ b/examples/webenginewidgets/simplebrowser/webpage.h
@@ -52,7 +52,7 @@
 #define WEBPAGE_H
 
 #include <QWebEnginePage>
-#include <QWebEngineRegisterProtocolHandlerPermissionRequest>
+#include <QWebEngineRegisterProtocolHandlerRequest>
 
 class WebPage : public QWebEnginePage
 {
@@ -67,7 +67,7 @@ protected:
 private slots:
     void handleAuthenticationRequired(const QUrl &requestUrl, QAuthenticator *auth);
     void handleProxyAuthenticationRequired(const QUrl &requestUrl, QAuthenticator *auth, const QString &proxyHost);
-    void handleRegisterProtocolHandlerPermissionRequested(QWebEngineRegisterProtocolHandlerPermissionRequest request);
+    void handleRegisterProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest request);
 };
 
 #endif // WEBPAGE_H