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 /tests/auto/quick/publicapi | |
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 'tests/auto/quick/publicapi')
-rw-r--r-- | tests/auto/quick/publicapi/tst_publicapi.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp index efd063512..27f1ec616 100644 --- a/tests/auto/quick/publicapi/tst_publicapi.cpp +++ b/tests/auto/quick/publicapi/tst_publicapi.cpp @@ -35,8 +35,8 @@ #include <QtTest/QtTest> #include <QtWebEngine/QQuickWebEngineProfile> #include <QtWebEngine/QQuickWebEngineScript> -#include <QtWebEngineCore/QWebEngineQuotaPermissionRequest> -#include <QtWebEngineCore/QWebEngineRegisterProtocolHandlerPermissionRequest> +#include <QtWebEngineCore/QWebEngineQuotaRequest> +#include <QtWebEngineCore/QWebEngineRegisterProtocolHandlerRequest> #include <private/qquickwebengineview_p.h> #include <private/qquickwebenginecertificateerror_p.h> #include <private/qquickwebenginedialogrequests_p.h> @@ -75,8 +75,8 @@ static QList<const QMetaObject *> typesToCheck = QList<const QMetaObject *>() << &QQuickWebEngineFileDialogRequest::staticMetaObject << &QQuickWebEngineFormValidationMessageRequest::staticMetaObject << &QQuickWebEngineContextMenuRequest::staticMetaObject - << &QWebEngineQuotaPermissionRequest::staticMetaObject - << &QWebEngineRegisterProtocolHandlerPermissionRequest::staticMetaObject + << &QWebEngineQuotaRequest::staticMetaObject + << &QWebEngineRegisterProtocolHandlerRequest::staticMetaObject ; static QList<const char *> knownEnumNames = QList<const char *>(); @@ -649,10 +649,10 @@ static QStringList expectedAPI = QStringList() << "QQuickWebEngineView.printToPdf(QString,PrintedPageSizeId,PrintedPageOrientation) --> void" << "QQuickWebEngineView.profile --> QQuickWebEngineProfile*" << "QQuickWebEngineView.profileChanged() --> void" - << "QQuickWebEngineView.quotaPermissionRequested(QWebEngineQuotaPermissionRequest) --> void" + << "QQuickWebEngineView.quotaRequested(QWebEngineQuotaRequest) --> void" << "QQuickWebEngineView.recentlyAudible --> bool" << "QQuickWebEngineView.recentlyAudibleChanged(bool) --> void" - << "QQuickWebEngineView.registerProtocolHandlerPermissionRequested(QWebEngineRegisterProtocolHandlerPermissionRequest) --> void" + << "QQuickWebEngineView.registerProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest) --> void" << "QQuickWebEngineView.reload() --> void" << "QQuickWebEngineView.reloadAndBypassCache() --> void" << "QQuickWebEngineView.renderProcessTerminated(RenderProcessTerminationStatus,int) --> void" @@ -681,14 +681,14 @@ static QStringList expectedAPI = QStringList() << "QQuickWebEngineView.windowCloseRequested() --> void" << "QQuickWebEngineView.zoomFactor --> double" << "QQuickWebEngineView.zoomFactorChanged(double) --> void" - << "QWebEngineQuotaPermissionRequest.accept() --> void" - << "QWebEngineQuotaPermissionRequest.origin --> QUrl" - << "QWebEngineQuotaPermissionRequest.reject() --> void" - << "QWebEngineQuotaPermissionRequest.requestedSize --> qlonglong" - << "QWebEngineRegisterProtocolHandlerPermissionRequest.accept() --> void" - << "QWebEngineRegisterProtocolHandlerPermissionRequest.origin --> QUrl" - << "QWebEngineRegisterProtocolHandlerPermissionRequest.reject() --> void" - << "QWebEngineRegisterProtocolHandlerPermissionRequest.scheme --> QString" + << "QWebEngineQuotaRequest.accept() --> void" + << "QWebEngineQuotaRequest.origin --> QUrl" + << "QWebEngineQuotaRequest.reject() --> void" + << "QWebEngineQuotaRequest.requestedSize --> qlonglong" + << "QWebEngineRegisterProtocolHandlerRequest.accept() --> void" + << "QWebEngineRegisterProtocolHandlerRequest.origin --> QUrl" + << "QWebEngineRegisterProtocolHandlerRequest.reject() --> void" + << "QWebEngineRegisterProtocolHandlerRequest.scheme --> QString" ; static bool isCheckedEnum(const QByteArray &typeName) |