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>

15 files changed, 43 insertions, 43 deletions

diff --git a/examples/multimedia/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp
index 677c2fc77..b3c8dea44 100644
--- a/examples/multimedia/audiodevices/audiodevices.cpp
+++ b/examples/multimedia/audiodevices/audiodevices.cpp
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 #include "audiodevices.h"
-#include <qmediadevicemanager.h>
+#include <qmediadevices.h>
 
 // Utility functions for converting QAudioFormat fields into text
 
@@ -81,7 +81,7 @@ AudioDevicesBase::~AudioDevicesBase() = default;
 
 AudioTest::AudioTest(QWidget *parent)
     : AudioDevicesBase(parent),
-      m_manager(new QMediaDeviceManager(this))
+      m_devices(new QMediaDevices(this))
 {
     connect(testButton, &QPushButton::clicked, this, &AudioTest::test);
     connect(modeBox, QOverload<int>::of(&QComboBox::activated), this, &AudioTest::modeChanged);
@@ -90,8 +90,8 @@ AudioTest::AudioTest(QWidget *parent)
     connect(channelsSpinBox, &QSpinBox::valueChanged, this, &AudioTest::channelChanged);
     connect(sampleFormatBox, QOverload<int>::of(&QComboBox::activated), this, &AudioTest::sampleFormatChanged);
     connect(populateTableButton, &QPushButton::clicked, this, &AudioTest::populateTable);
-    connect(m_manager, &QMediaDeviceManager::audioInputsChanged, this, &AudioTest::updateAudioDevices);
-    connect(m_manager, &QMediaDeviceManager::audioOutputsChanged, this, &AudioTest::updateAudioDevices);
+    connect(m_devices, &QMediaDevices::audioInputsChanged, this, &AudioTest::updateAudioDevices);
+    connect(m_devices, &QMediaDevices::audioOutputsChanged, this, &AudioTest::updateAudioDevices);
 
     modeBox->setCurrentIndex(0);
     modeChanged(0);
@@ -125,7 +125,7 @@ void AudioTest::test()
 void AudioTest::updateAudioDevices()
 {
     deviceBox->clear();
-    const auto devices = m_mode == QAudio::AudioInput ? m_manager->audioInputs() : m_manager->audioOutputs();
+    const auto devices = m_mode == QAudio::AudioInput ? m_devices->audioInputs() : m_devices->audioOutputs();
     for (auto &deviceInfo: devices)
         deviceBox->addItem(deviceInfo.description(), QVariant::fromValue(deviceInfo));
 }
diff --git a/examples/multimedia/audiodevices/audiodevices.h b/examples/multimedia/audiodevices/audiodevices.h
index 17d8d4888..7b74cc65a 100644
--- a/examples/multimedia/audiodevices/audiodevices.h
+++ b/examples/multimedia/audiodevices/audiodevices.h
@@ -52,7 +52,7 @@
 #define AUDIODEVICES_H
 
 #include <QAudioDeviceInfo>
-#include <QMediaDeviceManager>
+#include <QMediaDevices>
 #include <QMainWindow>
 #include <QObject>
 
@@ -76,7 +76,7 @@ private:
     QAudioDeviceInfo m_deviceInfo;
     QAudioFormat m_settings;
     QAudio::Mode m_mode = QAudio::AudioInput;
-    QMediaDeviceManager *m_manager = nullptr;
+    QMediaDevices *m_devices = nullptr;
 
 private slots:
     void updateAudioDevices();
diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp
index 549574ba0..b1b8e4648 100644
--- a/examples/multimedia/audioinput/audioinput.cpp
+++ b/examples/multimedia/audioinput/audioinput.cpp
@@ -147,10 +147,10 @@ void RenderArea::setLevel(qreal value)
 
 
 InputTest::InputTest()
-    : m_deviceManager(new QMediaDeviceManager(this))
+    : m_devices(new QMediaDevices(this))
 {
     initializeWindow();
-    initializeAudio(m_deviceManager->defaultAudioInput());
+    initializeAudio(m_devices->defaultAudioInput());
 }
 
 
@@ -163,9 +163,9 @@ void InputTest::initializeWindow()
     layout->addWidget(m_canvas);
 
     m_deviceBox = new QComboBox(this);
-    const QAudioDeviceInfo &defaultDeviceInfo = m_deviceManager->defaultAudioInput();
+    const QAudioDeviceInfo &defaultDeviceInfo = m_devices->defaultAudioInput();
     m_deviceBox->addItem(defaultDeviceInfo.description(), QVariant::fromValue(defaultDeviceInfo));
-    for (auto &deviceInfo: m_deviceManager->audioInputs()) {
+    for (auto &deviceInfo: m_devices->audioInputs()) {
         if (deviceInfo != defaultDeviceInfo)
             m_deviceBox->addItem(deviceInfo.description(), QVariant::fromValue(deviceInfo));
     }
diff --git a/examples/multimedia/audioinput/audioinput.h b/examples/multimedia/audioinput/audioinput.h
index ea24069a0..3575d9c44 100644
--- a/examples/multimedia/audioinput/audioinput.h
+++ b/examples/multimedia/audioinput/audioinput.h
@@ -61,7 +61,7 @@
 #include <QSlider>
 #include <QWidget>
 #include <QScopedPointer>
-#include <QMediaDeviceManager>
+#include <QMediaDevices>
 
 class AudioInfo : public QIODevice
 {
@@ -130,7 +130,7 @@ private:
     QComboBox *m_deviceBox = nullptr;
     QSlider *m_volumeSlider = nullptr;
 
-    QMediaDeviceManager *m_deviceManager = nullptr;
+    QMediaDevices *m_devices = nullptr;
     QScopedPointer<AudioInfo> m_audioInfo;
     QScopedPointer<QAudioInput> m_audioInput;
     bool m_pullMode = true;
diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp
index 42b4c1bf2..ba421f3fa 100644
--- a/examples/multimedia/audiooutput/audiooutput.cpp
+++ b/examples/multimedia/audiooutput/audiooutput.cpp
@@ -141,11 +141,11 @@ qint64 Generator::bytesAvailable() const
 }
 
 AudioTest::AudioTest()
-    : m_deviceManager(new QMediaDeviceManager(this)),
+    : m_devices(new QMediaDevices(this)),
       m_pushTimer(new QTimer(this))
 {
     initializeWindow();
-    initializeAudio(m_deviceManager->defaultAudioOutput());
+    initializeAudio(m_devices->defaultAudioOutput());
 }
 
 AudioTest::~AudioTest()
@@ -159,9 +159,9 @@ void AudioTest::initializeWindow()
     QVBoxLayout *layout = new QVBoxLayout;
 
     m_deviceBox = new QComboBox(this);
-    const QAudioDeviceInfo &defaultDeviceInfo = m_deviceManager->defaultAudioOutput();
+    const QAudioDeviceInfo &defaultDeviceInfo = m_devices->defaultAudioOutput();
     m_deviceBox->addItem(defaultDeviceInfo.description(), QVariant::fromValue(defaultDeviceInfo));
-    for (auto &deviceInfo: m_deviceManager->audioOutputs()) {
+    for (auto &deviceInfo: m_devices->audioOutputs()) {
         if (deviceInfo != defaultDeviceInfo)
             m_deviceBox->addItem(deviceInfo.description(), QVariant::fromValue(deviceInfo));
     }
diff --git a/examples/multimedia/audiooutput/audiooutput.h b/examples/multimedia/audiooutput/audiooutput.h
index becd5ebfd..3f5f7db0c 100644
--- a/examples/multimedia/audiooutput/audiooutput.h
+++ b/examples/multimedia/audiooutput/audiooutput.h
@@ -64,7 +64,7 @@
 #include <QSlider>
 #include <QTimer>
 #include <QScopedPointer>
-#include <QMediaDeviceManager>
+#include <QMediaDevices>
 
 class Generator : public QIODevice
 {
@@ -102,7 +102,7 @@ private:
     void initializeAudio(const QAudioDeviceInfo &deviceInfo);
 
 private:
-    QMediaDeviceManager *m_deviceManager = nullptr;
+    QMediaDevices *m_devices = nullptr;
     QTimer *m_pushTimer = nullptr;
 
     // Owned by layout
diff --git a/examples/multimedia/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp
index a19c22be4..8dc271ee0 100644
--- a/examples/multimedia/audiorecorder/audiorecorder.cpp
+++ b/examples/multimedia/audiorecorder/audiorecorder.cpp
@@ -58,7 +58,7 @@
 #include <QFileDialog>
 #include <QMediaEncoder>
 #include <QStandardPaths>
-#include <qmediadevicemanager.h>
+#include <qmediadevices.h>
 #include <qaudiodeviceinfo.h>
 #include <qaudiobuffer.h>
 
@@ -79,7 +79,7 @@ AudioRecorder::AudioRecorder()
 
     //audio devices
     ui->audioDeviceBox->addItem(tr("Default"), QVariant(QString()));
-    for (auto device: QMediaDeviceManager::audioInputs()) {
+    for (auto device: QMediaDevices::audioInputs()) {
         auto name = device.description();
         ui->audioDeviceBox->addItem(name, QVariant::fromValue(device));
     }
diff --git a/examples/multimedia/declarative-camera/PhotoCaptureControls.qml b/examples/multimedia/declarative-camera/PhotoCaptureControls.qml
index 41c91a374..2a456e8b3 100644
--- a/examples/multimedia/declarative-camera/PhotoCaptureControls.qml
+++ b/examples/multimedia/declarative-camera/PhotoCaptureControls.qml
@@ -136,7 +136,7 @@ FocusScope {
             spacing: 8
 
             CameraListButton {
-                model: MediaDeviceManager.videoInputs
+                model: MediaDevices.videoInputs
                 onValueChanged: captureSession.camera.cameraInfo = value
             }
 
diff --git a/examples/multimedia/declarative-camera/VideoCaptureControls.qml b/examples/multimedia/declarative-camera/VideoCaptureControls.qml
index 1f13dec00..4084b38b6 100644
--- a/examples/multimedia/declarative-camera/VideoCaptureControls.qml
+++ b/examples/multimedia/declarative-camera/VideoCaptureControls.qml
@@ -111,7 +111,7 @@ FocusScope {
             spacing: 8
 
             CameraListButton {
-                model: MediaDeviceManager.videoInputs
+                model: MediaDevices.videoInputs
                 onValueChanged: captureSession.camera.cameraInfo = value
             }
 
diff --git a/examples/multimedia/devices/main.cpp b/examples/multimedia/devices/main.cpp
index 250d8c9a8..cfdd28116 100644
--- a/examples/multimedia/devices/main.cpp
+++ b/examples/multimedia/devices/main.cpp
@@ -54,7 +54,7 @@
 
 #include <QAudioDeviceInfo>
 #include <QCameraInfo>
-#include <qmediadevicemanager.h>
+#include <qmediadevices.h>
 
 #include <stdio.h>
 
@@ -161,9 +161,9 @@ int main()
 {
     QTextStream out(stdout);
 
-    const auto audioInputDevices = QMediaDeviceManager::audioInputs();
-    const auto audioOutputDevices = QMediaDeviceManager::audioOutputs();
-    const auto videoInputDevices = QMediaDeviceManager::videoInputs();
+    const auto audioInputDevices = QMediaDevices::audioInputs();
+    const auto audioOutputDevices = QMediaDevices::audioOutputs();
+    const auto videoInputDevices = QMediaDevices::videoInputs();
 
     out << "Audio devices detected: " << Qt::endl;
     out << Qt::endl << "Input" << Qt::endl;
diff --git a/examples/multimedia/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp
index 83f95820e..8d688ca0d 100644
--- a/examples/multimedia/spectrum/app/engine.cpp
+++ b/examples/multimedia/spectrum/app/engine.cpp
@@ -81,17 +81,17 @@ Engine::Engine(QObject *parent)
     :   QObject(parent)
     ,   m_mode(QAudio::AudioInput)
     ,   m_state(QAudio::StoppedState)
-    ,   m_deviceManager(new QMediaDeviceManager(this))
+    ,   m_devices(new QMediaDevices(this))
     ,   m_generateTone(false)
     ,   m_file(nullptr)
     ,   m_analysisFile(nullptr)
-    ,   m_availableAudioInputDevices(m_deviceManager->audioInputs())
-    ,   m_audioInputDevice(m_deviceManager->defaultAudioInput())
+    ,   m_availableAudioInputDevices(m_devices->audioInputs())
+    ,   m_audioInputDevice(m_devices->defaultAudioInput())
     ,   m_audioInput(nullptr)
     ,   m_audioInputIODevice(nullptr)
     ,   m_recordPosition(0)
-    ,   m_availableAudioOutputDevices(m_deviceManager->audioOutputs())
-    ,   m_audioOutputDevice(m_deviceManager->defaultAudioOutput())
+    ,   m_availableAudioOutputDevices(m_devices->audioOutputs())
+    ,   m_audioOutputDevice(m_devices->defaultAudioOutput())
     ,   m_audioOutput(nullptr)
     ,   m_playPosition(0)
     ,   m_bufferPosition(0)
diff --git a/examples/multimedia/spectrum/app/engine.h b/examples/multimedia/spectrum/app/engine.h
index f403afb80..a6aada174 100644
--- a/examples/multimedia/spectrum/app/engine.h
+++ b/examples/multimedia/spectrum/app/engine.h
@@ -61,7 +61,7 @@
 #include <QDir>
 #include <QList>
 #include <QObject>
-#include <QMediaDeviceManager>
+#include <QMediaDevices>
 #include <QWaveDecoder>
 #include <QTimer>
 
@@ -279,7 +279,7 @@ private:
 private:
     QAudio::Mode        m_mode;
     QAudio::State       m_state;
-    QMediaDeviceManager *m_deviceManager;
+    QMediaDevices      *m_devices;
 
     bool                m_generateTone;
     SweptTone           m_tone;
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);