Rename QAudioOutput to QAudioSink

Change-Id: If852737b85d3ca95d55a852a3c50f80a5a09c61e
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

4 files changed, 6 insertions, 6 deletions

diff --git a/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp b/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp
index 78c58769d..54be5b57f 100644
--- a/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp
@@ -139,7 +139,7 @@ public Q_SLOTS:
 private:
     //! [Audio output class members]
     QFile sourceFile;   // class member.
-    QAudioOutput* audio; // class member.
+    QAudioSink* audio; // class member.
     //! [Audio output class members]
 };
 
@@ -162,7 +162,7 @@ void AudioOutputExample::setup()
         return;
     }
 
-    audio = new QAudioOutput(format, this);
+    audio = new QAudioSink(format, this);
     connect(audio, SIGNAL(stateChanged(QAudio::State)), this, SLOT(handleStateChanged(QAudio::State)));
     audio->start(&sourceFile);
 }
diff --git a/src/multimedia/doc/src/audiooverview.qdoc b/src/multimedia/doc/src/audiooverview.qdoc
index 41be6614d..ce49e1e98 100644
--- a/src/multimedia/doc/src/audiooverview.qdoc
+++ b/src/multimedia/doc/src/audiooverview.qdoc
@@ -77,14 +77,14 @@ microphones, and to write raw data to speakers or other devices.  Generally
 these classes do not do any audio decoding, or other processing, but they
 can support different types of raw audio data.
 
-The QAudioOutput class offers raw audio data output, while QAudioSource
+The QAudioSink class offers raw audio data output, while QAudioSource
 offers raw audio data input. The available hardware
 determines what audio outputs and inputs are available.
 
 \section3 Push and Pull
 The low level audio classes can operate in two modes - \c push and \c pull.
 In \c pull mode, the audio device is started by giving it a QIODevice.  For
-an output device, the QAudioOutput class will pull data from the QIODevice
+an output device, the QAudioSink class will pull data from the QIODevice
 (using \l QIODevice::read()) when more audio data is required.  Conversely,
 for \c pull mode with QAudioSource, when audio data is available then the
 data will be written directly to the QIODevice.
diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc
index daf20329a..a6a8d85b0 100644
--- a/src/multimedia/doc/src/multimedia.qdoc
+++ b/src/multimedia/doc/src/multimedia.qdoc
@@ -82,7 +82,7 @@ For some quick recipes, look at the overviews above and consult this table:
         \li \l{Audio Input Example}{audioinput},
             \l{Spectrum Example}{spectrum}
         \li
-        \li QAudioOutput
+        \li QAudioSink
     \row
         \li Playing encoded audio (MP3, AAC etc)
         \li \l{Media Player Example}{player}
diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc
index 607215d3b..5e2f4d98f 100644
--- a/src/multimedia/doc/src/qtmultimedia-index.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc
@@ -108,7 +108,7 @@
      \li Class
      \li Description
     \row
-     \li QAudioOutput
+     \li QAudioSink
      \li Sends audio data to an audio output device
     \row
      \li QAudioRecorder