QtQuick: rename the media feature permission enum values

In the same way it was done for widgets.

Change-Id: I03ff6ed587346b00c76cf7314483263fd4f90a2d
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

3 files changed, 13 insertions, 13 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index ac172fa9d..dccbb5b9f 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -395,11 +395,11 @@ void QQuickWebEngineViewPrivate::runMediaAccessPermissionRequest(const QUrl &sec
        return;
    QQuickWebEngineViewExperimental::Feature feature;
    if (requestFlags.testFlag(WebContentsAdapterClient::MediaAudioCapture) && requestFlags.testFlag(WebContentsAdapterClient::MediaVideoCapture))
-       feature = QQuickWebEngineViewExperimental::MediaAudioVideoDevices;
+       feature = QQuickWebEngineViewExperimental::MediaAudioVideoCapture;
    else if (requestFlags.testFlag(WebContentsAdapterClient::MediaAudioCapture))
-       feature = QQuickWebEngineViewExperimental::MediaAudioDevices;
+       feature = QQuickWebEngineViewExperimental::MediaAudioCapture;
    else // WebContentsAdapterClient::MediaVideoCapture
-       feature = QQuickWebEngineViewExperimental::MediaVideoDevices;
+       feature = QQuickWebEngineViewExperimental::MediaVideoCapture;
    Q_EMIT e->featurePermissionRequested(securityOrigin, feature);
 }
 
@@ -715,19 +715,19 @@ QQuickWebEngineHistory *QQuickWebEngineViewExperimental::navigationHistory() con
 
 void QQuickWebEngineViewExperimental::grantFeaturePermission(const QUrl &securityOrigin, QQuickWebEngineViewExperimental::Feature feature, bool granted)
 {
-    if (!granted && feature >= MediaAudioDevices && feature <= MediaAudioVideoDevices) {
+    if (!granted && feature >= MediaAudioCapture && feature <= MediaAudioVideoCapture) {
          d_ptr->adapter->grantMediaAccessPermission(securityOrigin, WebContentsAdapterClient::MediaNone);
          return;
     }
 
     switch (feature) {
-    case MediaAudioDevices:
+    case MediaAudioCapture:
         d_ptr->adapter->grantMediaAccessPermission(securityOrigin, WebContentsAdapterClient::MediaAudioCapture);
         break;
-    case MediaVideoDevices:
+    case MediaVideoCapture:
         d_ptr->adapter->grantMediaAccessPermission(securityOrigin, WebContentsAdapterClient::MediaVideoCapture);
         break;
-    case MediaAudioVideoDevices:
+    case MediaAudioVideoCapture:
         d_ptr->adapter->grantMediaAccessPermission(securityOrigin, WebContentsAdapterClient::MediaRequestFlags(WebContentsAdapterClient::MediaAudioCapture                                                                                                               | WebContentsAdapterClient::MediaVideoCapture));
         break;
     case Geolocation:
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
index 7d2b75b22..46388bfbb 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
+++ b/src/webengine/api/qquickwebengineview_p_p.h
@@ -88,9 +88,9 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineViewExperimental : public QObjec
 
 public:
     enum Feature {
-        MediaAudioDevices,
-        MediaVideoDevices,
-        MediaAudioVideoDevices,
+        MediaAudioCapture,
+        MediaVideoCapture,
+        MediaAudioVideoCapture,
         Geolocation
     };
 
diff --git a/tests/quicktestbrowser/FeaturePermissionBar.qml b/tests/quicktestbrowser/FeaturePermissionBar.qml
index d25ca5021..68ad43195 100644
--- a/tests/quicktestbrowser/FeaturePermissionBar.qml
+++ b/tests/quicktestbrowser/FeaturePermissionBar.qml
@@ -69,11 +69,11 @@ Rectangle {
             Layout.fillWidth: true
 
             function textForFeature(feature) {
-                if (feature === WebEngineViewExperimental.MediaAudioDevices)
+                if (feature === WebEngineViewExperimental.MediaAudioCapture)
                     return "your microphone"
-                if (feature === WebEngineViewExperimental.MediaVideoDevices)
+                if (feature === WebEngineViewExperimental.MediaVideoCapture)
                     return "your camera"
-                if (feature === WebEngineViewExperimental.MediaAudioVideoDevices)
+                if (feature === WebEngineViewExperimental.MediaAudioVideoCapture)
                     return "your camera and microphone"
                 if (feature === WebEngineViewExperimental.Geolocation)
                     return "your position"