Rename QMediaDeviceManager to QMediaDevices

Reflect that also in the plugins, where classes are renamed from
e.g. QXXXDeviceManager to QXXXMediaDevices. This is for consistency
with QPlatformMediaDevices, and because QDarwinDevices would be too
generic.

Change-Id: I78f63f0b8c2aa68aa3f8fb4936e0838281b3222a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

3 files changed, 9 insertions, 9 deletions

diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp
index b7cbd936a..acc2a32e5 100644
--- a/examples/multimediawidgets/camera/camera.cpp
+++ b/examples/multimediawidgets/camera/camera.cpp
@@ -64,7 +64,7 @@
 #include <QImage>
 
 #include <QtWidgets>
-#include <QMediaDeviceManager>
+#include <QMediaDevices>
 #include <QMediaFormat>
 
 Camera::Camera()
@@ -77,14 +77,14 @@ Camera::Camera()
     videoDevicesGroup = new QActionGroup(this);
     videoDevicesGroup->setExclusive(true);
     updateCameras();
-    connect(&m_manager, &QMediaDeviceManager::videoInputsChanged, this, &Camera::updateCameras);
+    connect(&m_devices, &QMediaDevices::videoInputsChanged, this, &Camera::updateCameras);
 
     connect(videoDevicesGroup, &QActionGroup::triggered, this, &Camera::updateCameraDevice);
     connect(ui->captureWidget, &QTabWidget::currentChanged, this, &Camera::updateCaptureMode);
 
     connect(ui->metaDataButton, &QPushButton::clicked, this, &Camera::showMetaDataDialog);
 
-    setCamera(QMediaDeviceManager::defaultVideoInput());
+    setCamera(QMediaDevices::defaultVideoInput());
 
     qDebug() << "Supported Containers:";
     auto containers = QMediaFormat().supportedFileFormats(QMediaFormat::Encode);
@@ -395,12 +395,12 @@ void Camera::closeEvent(QCloseEvent *event)
 void Camera::updateCameras()
 {
     ui->menuDevices->clear();
-    const QList<QCameraInfo> availableCameras = QMediaDeviceManager::videoInputs();
+    const QList<QCameraInfo> availableCameras = QMediaDevices::videoInputs();
     for (const QCameraInfo &cameraInfo : availableCameras) {
         QAction *videoDeviceAction = new QAction(cameraInfo.description(), videoDevicesGroup);
         videoDeviceAction->setCheckable(true);
         videoDeviceAction->setData(QVariant::fromValue(cameraInfo));
-        if (cameraInfo == QMediaDeviceManager::defaultVideoInput())
+        if (cameraInfo == QMediaDevices::defaultVideoInput())
             videoDeviceAction->setChecked(true);
 
         ui->menuDevices->addAction(videoDeviceAction);
diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimediawidgets/camera/camera.h
index 3a17233b2..2424b57d0 100644
--- a/examples/multimediawidgets/camera/camera.h
+++ b/examples/multimediawidgets/camera/camera.h
@@ -57,7 +57,7 @@
 #include <QScopedPointer>
 #include <QMediaMetaData>
 #include <QMediaCaptureSession>
-#include <QMediaDeviceManager>
+#include <QMediaDevices>
 
 #include <QMainWindow>
 
@@ -130,7 +130,7 @@ private:
 
     QActionGroup *videoDevicesGroup  = nullptr;
 
-    QMediaDeviceManager m_manager;
+    QMediaDevices m_devices;
     QMediaCaptureSession m_captureSession;
     QScopedPointer<QCamera> m_camera;
     QCameraImageCapture *m_imageCapture;
diff --git a/examples/multimediawidgets/player/player.cpp b/examples/multimediawidgets/player/player.cpp
index 367211b2c..6fe7f55e2 100644
--- a/examples/multimediawidgets/player/player.cpp
+++ b/examples/multimediawidgets/player/player.cpp
@@ -57,7 +57,7 @@
 
 #include <QMediaPlaylist>
 #include <QMediaMetaData>
-#include <QMediaDeviceManager>
+#include <QMediaDevices>
 #include <QAudioDeviceInfo>
 #include <QMediaFormat>
 #include <QtWidgets>
@@ -191,7 +191,7 @@ Player::Player(QWidget *parent)
 
     m_audioOutput = new QComboBox(this);
     m_audioOutput->addItem(QString::fromUtf8("Default"), QVariant::fromValue(QAudioDeviceInfo()));
-    for (auto &deviceInfo: QMediaDeviceManager::audioOutputs())
+    for (auto &deviceInfo: QMediaDevices::audioOutputs())
         m_audioOutput->addItem(deviceInfo.description(), QVariant::fromValue(deviceInfo));
     connect(m_audioOutput, QOverload<int>::of(&QComboBox::activated), this, &Player::audioOutputChanged);