diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-03-20 17:51:28 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2018-04-13 08:14:09 +0000 |
| commit | b78e0c8a1e2df919f652da5e508306c8250c012e (patch) | |
| tree | 85049306f05f4f03bae3838ee693fd61781a6571 /examples/webenginewidgets | |
| parent | afab0b8e6fd7950d7048b2bda87b5a7775ce9e80 (diff) | |
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>
Diffstat (limited to 'examples/webenginewidgets')
| -rw-r--r-- | examples/webenginewidgets/simplebrowser/webpage.cpp | 8 | ||||
| -rw-r--r-- | examples/webenginewidgets/simplebrowser/webpage.h | 4 |
2 files changed, 6 insertions, 6 deletions
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 |