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 /src/webengine/plugin/plugin.cpp | |
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 'src/webengine/plugin/plugin.cpp')
-rw-r--r-- | src/webengine/plugin/plugin.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/webengine/plugin/plugin.cpp b/src/webengine/plugin/plugin.cpp index c9c9555e9..d81b797fc 100644 --- a/src/webengine/plugin/plugin.cpp +++ b/src/webengine/plugin/plugin.cpp @@ -52,8 +52,8 @@ #include "qquickwebenginesettings_p.h" #include "qquickwebenginesingleton_p.h" #include "qquickwebengineview_p.h" -#include "qwebenginequotapermissionrequest.h" -#include "qwebengineregisterprotocolhandlerpermissionrequest.h" +#include "qwebenginequotarequest.h" +#include "qwebengineregisterprotocolhandlerrequest.h" #include "qtwebengineversion.h" QT_BEGIN_NAMESPACE @@ -141,12 +141,12 @@ public: msgUncreatableType("FileDialogRequest")); qmlRegisterUncreatableType<QQuickWebEngineFormValidationMessageRequest>(uri, 1, 4, "FormValidationMessageRequest", msgUncreatableType("FormValidationMessageRequest")); - qRegisterMetaType<QWebEngineQuotaPermissionRequest>(); - qmlRegisterUncreatableType<QWebEngineQuotaPermissionRequest>(uri, 1, 7, "QuotaPermissionRequest", - msgUncreatableType("QuotaPermissionRequest")); - qRegisterMetaType<QWebEngineRegisterProtocolHandlerPermissionRequest>(); - qmlRegisterUncreatableType<QWebEngineRegisterProtocolHandlerPermissionRequest>(uri, 1, 7, "RegisterProtocolHandlerPermissionRequest", - msgUncreatableType("RegisterProtocolHandlerPermissionRequest")); + qRegisterMetaType<QWebEngineQuotaRequest>(); + qmlRegisterUncreatableType<QWebEngineQuotaRequest>(uri, 1, 7, "QuotaRequest", + msgUncreatableType("QuotaRequest")); + qRegisterMetaType<QWebEngineRegisterProtocolHandlerRequest>(); + qmlRegisterUncreatableType<QWebEngineRegisterProtocolHandlerRequest>(uri, 1, 7, "RegisterProtocolHandlerRequest", + msgUncreatableType("RegisterProtocolHandlerRequest")); } |