Rename QCameraInfo/QAudioDeviceInfo to QCamera/AudioDevice

Those classes represent the physical device and it's properties, thus
that name fits best.

Change-Id: I0f45fc875ae6110452c1f2fb17f32adbe5155d01
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

1 files changed, 4 insertions, 4 deletions

diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp
index faf5c0555..3e3460251 100644
--- a/examples/multimedia/audiooutput/audiooutput.cpp
+++ b/examples/multimedia/audiooutput/audiooutput.cpp
@@ -50,7 +50,7 @@
 
 #include "audiooutput.h"
 
-#include <QAudioDeviceInfo>
+#include <QAudioDevice>
 #include <QAudioSink>
 #include <QDebug>
 #include <QVBoxLayout>
@@ -159,7 +159,7 @@ void AudioTest::initializeWindow()
     QVBoxLayout *layout = new QVBoxLayout;
 
     m_deviceBox = new QComboBox(this);
-    const QAudioDeviceInfo &defaultDeviceInfo = m_devices->defaultAudioOutput();
+    const QAudioDevice &defaultDeviceInfo = m_devices->defaultAudioOutput();
     m_deviceBox->addItem(defaultDeviceInfo.description(), QVariant::fromValue(defaultDeviceInfo));
     for (auto &deviceInfo: m_devices->audioOutputs()) {
         if (deviceInfo != defaultDeviceInfo)
@@ -194,7 +194,7 @@ void AudioTest::initializeWindow()
     window->show();
 }
 
-void AudioTest::initializeAudio(const QAudioDeviceInfo &deviceInfo)
+void AudioTest::initializeAudio(const QAudioDevice &deviceInfo)
 {
     QAudioFormat format = deviceInfo.preferredFormat();
 
@@ -216,7 +216,7 @@ void AudioTest::deviceChanged(int index)
     m_generator->stop();
     m_audioOutput->stop();
     m_audioOutput->disconnect(this);
-    initializeAudio(m_deviceBox->itemData(index).value<QAudioDeviceInfo>());
+    initializeAudio(m_deviceBox->itemData(index).value<QAudioDevice>());
 }
 
 void AudioTest::volumeChanged(int value)