From 8944d70cb4241fc06b3006971ff21ff74b0f010c Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Thu, 6 Oct 2016 15:45:08 +0200 Subject: Remove RequestType prefix Removes RequestType prefix from FormValidationMessageRequest's RequestType enumeration members. Change-Id: I51b7eb77b0bae2a8d3109e3ee3b7ea42349b211c Reviewed-by: Kai Koehne --- src/webengine/api/qquickwebenginedialogrequests.cpp | 12 ++++++------ src/webengine/api/qquickwebenginedialogrequests_p.h | 6 +++--- src/webengine/api/qquickwebengineview.cpp | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/webengine/api/qquickwebenginedialogrequests.cpp b/src/webengine/api/qquickwebenginedialogrequests.cpp index 7cb4953fc..641793e12 100644 --- a/src/webengine/api/qquickwebenginedialogrequests.cpp +++ b/src/webengine/api/qquickwebenginedialogrequests.cpp @@ -735,15 +735,15 @@ void QQuickWebEngineFileDialogRequest::dialogReject() onFormValidationMessageRequested: function(request) { request.accepted = true; switch (request.type) { - case FormValidationMessageRequest.RequestTypeShow: + case FormValidationMessageRequest.Show: validationMessage.text = request.text; validationMessage.x = request.x; validationMessage.y = request.y validationMessage.visible = true; break; - case FormValidationMessageRequest.RequestTypeMove: + case FormValidationMessageRequest.Move: break; - case FormValidationMessageRequest.RequestTypeHide: + case FormValidationMessageRequest.Hide: validationMessage.visible = false; break; } @@ -816,11 +816,11 @@ QString QQuickWebEngineFormValidationMessageRequest::subText() const The type of the form validation message request. - \value ValidationMessageRequest.RequestTypeShow + \value ValidationMessageRequest.Show The form validation message should be shown. - \value ValidationMessageRequest.RequestTypeHide + \value ValidationMessageRequest.Hide The form validation message should be hidden. - \value ValidationMessageRequest.RequestTypeMove + \value ValidationMessageRequest.Move The form validation message should be moved. */ diff --git a/src/webengine/api/qquickwebenginedialogrequests_p.h b/src/webengine/api/qquickwebenginedialogrequests_p.h index d1ddc6607..d8a0e004c 100644 --- a/src/webengine/api/qquickwebenginedialogrequests_p.h +++ b/src/webengine/api/qquickwebenginedialogrequests_p.h @@ -228,9 +228,9 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineFormValidationMessageRequest : p Q_OBJECT public: enum RequestType { - RequestTypeShow, - RequestTypeHide, - RequestTypeMove, + Show, + Hide, + Move, }; Q_ENUM(RequestType) Q_PROPERTY(QRect anchor READ anchor CONSTANT FINAL) diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 61f940f15..6ca9954cf 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -1109,7 +1109,7 @@ void QQuickWebEngineViewPrivate::showValidationMessage(const QRect &anchor, cons #endif Q_Q(QQuickWebEngineView); QQuickWebEngineFormValidationMessageRequest *request; - request = new QQuickWebEngineFormValidationMessageRequest(QQuickWebEngineFormValidationMessageRequest::RequestTypeShow, + request = new QQuickWebEngineFormValidationMessageRequest(QQuickWebEngineFormValidationMessageRequest::Show, anchor,mainText,subText); // mark the object for gc by creating temporary jsvalue qmlEngine(q)->newQObject(request); @@ -1122,7 +1122,7 @@ void QQuickWebEngineViewPrivate::hideValidationMessage() { Q_Q(QQuickWebEngineView); QQuickWebEngineFormValidationMessageRequest *request; - request = new QQuickWebEngineFormValidationMessageRequest(QQuickWebEngineFormValidationMessageRequest::RequestTypeHide); + request = new QQuickWebEngineFormValidationMessageRequest(QQuickWebEngineFormValidationMessageRequest::Hide); // mark the object for gc by creating temporary jsvalue qmlEngine(q)->newQObject(request); Q_EMIT q->formValidationMessageRequested(request); @@ -1134,7 +1134,7 @@ void QQuickWebEngineViewPrivate::moveValidationMessage(const QRect &anchor) { Q_Q(QQuickWebEngineView); QQuickWebEngineFormValidationMessageRequest *request; - request = new QQuickWebEngineFormValidationMessageRequest(QQuickWebEngineFormValidationMessageRequest::RequestTypeMove, + request = new QQuickWebEngineFormValidationMessageRequest(QQuickWebEngineFormValidationMessageRequest::Move, anchor); // mark the object for gc by creating temporary jsvalue qmlEngine(q)->newQObject(request); -- cgit v1.2.3