Modernize code base

Run clang-tidy over the code base with some code modernization
options.

Change-Id: I9e74d1225bce333e74224e3b92c02c7e9884d8f5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>

9 files changed, 93 insertions, 106 deletions

diff --git a/src/multimedia/audio/pulseaudio/qaudioengine_pulse.cpp b/src/multimedia/audio/pulseaudio/qaudioengine_pulse.cpp
index 86ee05a29..4eafeebd9 100644
--- a/src/multimedia/audio/pulseaudio/qaudioengine_pulse.cpp
+++ b/src/multimedia/audio/pulseaudio/qaudioengine_pulse.cpp
@@ -254,8 +254,8 @@ Q_GLOBAL_STATIC(QPulseAudioEngine, pulseEngine);
 
 QPulseAudioEngine::QPulseAudioEngine(QObject *parent)
     : QObject(parent)
-    , m_mainLoopApi(0)
-    , m_context(0)
+    , m_mainLoopApi(nullptr)
+    , m_context(nullptr)
     , m_prepared(false)
 {
     prepare();
@@ -273,7 +273,7 @@ void QPulseAudioEngine::prepare()
     bool ok = true;
 
     m_mainLoop = pa_threaded_mainloop_new();
-    if (m_mainLoop == 0) {
+    if (m_mainLoop == nullptr) {
         qWarning("PulseAudioService: unable to create pulseaudio mainloop");
         return;
     }
@@ -281,7 +281,7 @@ void QPulseAudioEngine::prepare()
     if (pa_threaded_mainloop_start(m_mainLoop) != 0) {
         qWarning("PulseAudioService: unable to start pulseaudio mainloop");
         pa_threaded_mainloop_free(m_mainLoop);
-        m_mainLoop = 0;
+        m_mainLoop = nullptr;
         return;
     }
 
@@ -291,24 +291,24 @@ void QPulseAudioEngine::prepare()
 
     m_context = pa_context_new(m_mainLoopApi, QString(QLatin1String("QtPulseAudio:%1")).arg(::getpid()).toLatin1().constData());
 
-    if (m_context == 0) {
+    if (m_context == nullptr) {
         qWarning("PulseAudioService: Unable to create new pulseaudio context");
         pa_threaded_mainloop_unlock(m_mainLoop);
         pa_threaded_mainloop_free(m_mainLoop);
-        m_mainLoop = 0;
+        m_mainLoop = nullptr;
         onContextFailed();
         return;
     }
 
     pa_context_set_state_callback(m_context, contextStateCallbackInit, this);
 
-    if (pa_context_connect(m_context, 0, (pa_context_flags_t)0, 0) < 0) {
+    if (pa_context_connect(m_context, nullptr, (pa_context_flags_t)0, nullptr) < 0) {
         qWarning("PulseAudioService: pa_context_connect() failed");
         pa_context_unref(m_context);
         pa_threaded_mainloop_unlock(m_mainLoop);
         pa_threaded_mainloop_free(m_mainLoop);
-        m_mainLoop = 0;
-        m_context = 0;
+        m_mainLoop = nullptr;
+        m_context = nullptr;
         return;
     }
 
@@ -354,14 +354,14 @@ void QPulseAudioEngine::prepare()
                                                 pa_subscription_mask_t(PA_SUBSCRIPTION_MASK_SINK |
                                                                        PA_SUBSCRIPTION_MASK_SOURCE |
                                                                        PA_SUBSCRIPTION_MASK_SERVER),
-                                                NULL, NULL);
+                                                nullptr, nullptr);
         if (op)
             pa_operation_unref(op);
         else
             qWarning("PulseAudioService: failed to subscribe to context notifications");
     } else {
         pa_context_unref(m_context);
-        m_context = 0;
+        m_context = nullptr;
     }
 
     unlock();
@@ -371,7 +371,7 @@ void QPulseAudioEngine::prepare()
         m_prepared = true;
     } else {
         pa_threaded_mainloop_free(m_mainLoop);
-        m_mainLoop = 0;
+        m_mainLoop = nullptr;
         onContextFailed();
     }
 }
@@ -384,13 +384,13 @@ void QPulseAudioEngine::release()
     if (m_context) {
         pa_context_disconnect(m_context);
         pa_context_unref(m_context);
-        m_context = 0;
+        m_context = nullptr;
     }
 
     if (m_mainLoop) {
         pa_threaded_mainloop_stop(m_mainLoop);
         pa_threaded_mainloop_free(m_mainLoop);
-        m_mainLoop = 0;
+        m_mainLoop = nullptr;
     }
 
     m_prepared = false;
diff --git a/src/multimedia/audio/pulseaudio/qaudioinput_pulse.cpp b/src/multimedia/audio/pulseaudio/qaudioinput_pulse.cpp
index fe6ca451b..5c602f9af 100644
--- a/src/multimedia/audio/pulseaudio/qaudioinput_pulse.cpp
+++ b/src/multimedia/audio/pulseaudio/qaudioinput_pulse.cpp
@@ -127,7 +127,7 @@ static void inputStreamSuccessCallback(pa_stream *stream, int success, void *use
 
 QPulseAudioInput::QPulseAudioInput(const QByteArray &device)
     : m_totalTimeValue(0)
-    , m_audioSource(0)
+    , m_audioSource(nullptr)
     , m_errorState(QAudio::NoError)
     , m_deviceState(QAudio::StoppedState)
     , m_volume(qreal(1.0f))
@@ -138,7 +138,7 @@ QPulseAudioInput::QPulseAudioInput(const QByteArray &device)
     , m_periodSize(0)
     , m_intervalTime(1000)
     , m_periodTime(PeriodTimeMs)
-    , m_stream(0)
+    , m_stream(nullptr)
     , m_device(device)
 {
     m_timer = new QTimer(this);
@@ -199,7 +199,7 @@ void QPulseAudioInput::start(QIODevice *device)
 
     if (!m_pullMode && m_audioSource) {
         delete m_audioSource;
-        m_audioSource = 0;
+        m_audioSource = nullptr;
     }
 
     close();
@@ -220,7 +220,7 @@ QIODevice *QPulseAudioInput::start()
 
     if (!m_pullMode && m_audioSource) {
         delete m_audioSource;
-        m_audioSource = 0;
+        m_audioSource = nullptr;
     }
 
     close();
@@ -320,7 +320,7 @@ bool QPulseAudioInput::open()
     if (pa_stream_connect_record(m_stream, m_device.data(), &buffer_attr, (pa_stream_flags_t)flags) < 0) {
         qWarning() << "pa_stream_connect_record() failed!";
         pa_stream_unref(m_stream);
-        m_stream = 0;
+        m_stream = nullptr;
         pulseEngine->unlock();
         setError(QAudio::OpenError);
         setState(QAudio::StoppedState);
@@ -363,14 +363,14 @@ void QPulseAudioInput::close()
     if (m_stream) {
         pulseEngine->lock();
 
-        pa_stream_set_state_callback(m_stream, 0, 0);
-        pa_stream_set_read_callback(m_stream, 0, 0);
-        pa_stream_set_underflow_callback(m_stream, 0, 0);
-        pa_stream_set_overflow_callback(m_stream, 0, 0);
+        pa_stream_set_state_callback(m_stream, nullptr, nullptr);
+        pa_stream_set_read_callback(m_stream, nullptr, nullptr);
+        pa_stream_set_underflow_callback(m_stream, nullptr, nullptr);
+        pa_stream_set_overflow_callback(m_stream, nullptr, nullptr);
 
         pa_stream_disconnect(m_stream);
         pa_stream_unref(m_stream);
-        m_stream = 0;
+        m_stream = nullptr;
 
         pulseEngine->unlock();
     }
@@ -379,7 +379,7 @@ void QPulseAudioInput::close()
 
     if (!m_pullMode && m_audioSource) {
         delete m_audioSource;
-        m_audioSource = 0;
+        m_audioSource = nullptr;
     }
     m_opened = false;
 }
@@ -517,7 +517,7 @@ void QPulseAudioInput::resume()
 
         pulseEngine->lock();
 
-        operation = pa_stream_cork(m_stream, 0, inputStreamSuccessCallback, 0);
+        operation = pa_stream_cork(m_stream, 0, inputStreamSuccessCallback, nullptr);
         pulseEngine->wait(operation);
         pa_operation_unref(operation);
 
@@ -589,7 +589,7 @@ void QPulseAudioInput::suspend()
 
         pulseEngine->lock();
 
-        operation = pa_stream_cork(m_stream, 1, inputStreamSuccessCallback, 0);
+        operation = pa_stream_cork(m_stream, 1, inputStreamSuccessCallback, nullptr);
         pulseEngine->wait(operation);
         pa_operation_unref(operation);
 
@@ -612,10 +612,10 @@ bool QPulseAudioInput::deviceReady()
 {
    if (m_pullMode) {
         // reads some audio data and writes it to QIODevice
-        read(0,0);
+        read(nullptr,0);
     } else {
         // emits readyRead() so user will call read() on QIODevice to get some audio data
-        if (m_audioSource != 0) {
+        if (m_audioSource != nullptr) {
             PulseInputPrivate *a = qobject_cast<PulseInputPrivate*>(m_audioSource);
             a->trigger();
         }
diff --git a/src/multimedia/audio/pulseaudio/qaudiointerface_pulse.cpp b/src/multimedia/audio/pulseaudio/qaudiointerface_pulse.cpp
index 5c4a804b7..43695e79a 100644
--- a/src/multimedia/audio/pulseaudio/qaudiointerface_pulse.cpp
+++ b/src/multimedia/audio/pulseaudio/qaudiointerface_pulse.cpp
@@ -48,8 +48,7 @@
 QT_BEGIN_NAMESPACE
 
 QPulseAudioInterface::QPulseAudioInterface()
-    : QAudioSystemInterface()
-    , m_pulseEngine(QPulseAudioEngine::instance())
+    : m_pulseEngine(QPulseAudioEngine::instance())
 {
 }
 
diff --git a/src/multimedia/audio/pulseaudio/qaudiooutput_pulse.cpp b/src/multimedia/audio/pulseaudio/qaudiooutput_pulse.cpp
index 44c6a4fdc..7466f5b46 100644
--- a/src/multimedia/audio/pulseaudio/qaudiooutput_pulse.cpp
+++ b/src/multimedia/audio/pulseaudio/qaudiooutput_pulse.cpp
@@ -157,16 +157,16 @@ QPulseAudioOutput::QPulseAudioOutput(const QByteArray &device)
     , m_deviceState(QAudio::StoppedState)
     , m_pullMode(true)
     , m_opened(false)
-    , m_audioSource(0)
+    , m_audioSource(nullptr)
     , m_periodTime(0)
-    , m_stream(0)
+    , m_stream(nullptr)
     , m_notifyInterval(1000)
     , m_periodSize(0)
     , m_bufferSize(0)
     , m_maxBufferSize(0)
     , m_totalTimeValue(0)
     , m_tickTimer(new QTimer(this))
-    , m_audioBuffer(0)
+    , m_audioBuffer(nullptr)
     , m_resuming(false)
     , m_volume(1.0)
 {
@@ -225,7 +225,7 @@ void QPulseAudioOutput::start(QIODevice *device)
     if (m_audioSource && !m_pullMode) {
         delete m_audioSource;
     }
-    m_audioSource = 0;
+    m_audioSource = nullptr;
 
     close();
 
@@ -233,7 +233,7 @@ void QPulseAudioOutput::start(QIODevice *device)
     m_audioSource = device;
 
     if (!open()) {
-        m_audioSource = 0;
+        m_audioSource = nullptr;
         return;
     }
 
@@ -249,7 +249,7 @@ QIODevice *QPulseAudioOutput::start()
     if (m_audioSource && !m_pullMode) {
         delete m_audioSource;
     }
-    m_audioSource = 0;
+    m_audioSource = nullptr;
 
     close();
 
@@ -358,10 +358,10 @@ bool QPulseAudioOutput::open()
     requestedBuffer.prebuf = (uint32_t)-1;
     requestedBuffer.tlength = m_bufferSize;
 
-    if (pa_stream_connect_playback(m_stream, m_device.data(), (m_bufferSize > 0) ? &requestedBuffer : NULL, (pa_stream_flags_t)0, NULL, NULL) < 0) {
+    if (pa_stream_connect_playback(m_stream, m_device.data(), (m_bufferSize > 0) ? &requestedBuffer : nullptr, (pa_stream_flags_t)0, nullptr, nullptr) < 0) {
         qWarning() << "pa_stream_connect_playback() failed!";
         pa_stream_unref(m_stream);
-        m_stream = 0;
+        m_stream = nullptr;
         pulseEngine->unlock();
         setError(QAudio::OpenError);
         setState(QAudio::StoppedState);
@@ -384,7 +384,7 @@ bool QPulseAudioOutput::open()
         pa_buffer_attr newBufferAttr;
         newBufferAttr = *buffer;
         newBufferAttr.prebuf = streamSize;
-        pa_operation *o = pa_stream_set_buffer_attr(m_stream, &newBufferAttr, streamAdjustPrebufferCallback, NULL);
+        pa_operation *o = pa_stream_set_buffer_attr(m_stream, &newBufferAttr, streamAdjustPrebufferCallback, nullptr);
         if (o)
             pa_operation_unref(o);
     }
@@ -425,19 +425,19 @@ void QPulseAudioOutput::close()
     if (m_stream) {
         pulseEngine->lock();
 
-        pa_stream_set_state_callback(m_stream, 0, 0);
-        pa_stream_set_write_callback(m_stream, 0, 0);
-        pa_stream_set_underflow_callback(m_stream, 0, 0);
-        pa_stream_set_overflow_callback(m_stream, 0, 0);
-        pa_stream_set_latency_update_callback(m_stream, 0, 0);
+        pa_stream_set_state_callback(m_stream, nullptr, nullptr);
+        pa_stream_set_write_callback(m_stream, nullptr, nullptr);
+        pa_stream_set_underflow_callback(m_stream, nullptr, nullptr);
+        pa_stream_set_overflow_callback(m_stream, nullptr, nullptr);
+        pa_stream_set_latency_update_callback(m_stream, nullptr, nullptr);
 
-        pa_operation *o = pa_stream_drain(m_stream, outputStreamDrainComplete, NULL);
+        pa_operation *o = pa_stream_drain(m_stream, outputStreamDrainComplete, nullptr);
         if (o)
             pa_operation_unref(o);
 
         pa_stream_disconnect(m_stream);
         pa_stream_unref(m_stream);
-        m_stream = NULL;
+        m_stream = nullptr;
 
         pulseEngine->unlock();
     }
@@ -446,12 +446,12 @@ void QPulseAudioOutput::close()
 
     if (!m_pullMode && m_audioSource) {
         delete m_audioSource;
-        m_audioSource = 0;
+        m_audioSource = nullptr;
     }
     m_opened = false;
     if (m_audioBuffer) {
         delete[] m_audioBuffer;
-        m_audioBuffer = 0;
+        m_audioBuffer = nullptr;
     }
 }
 
@@ -511,7 +511,7 @@ qint64 QPulseAudioOutput::write(const char *data, qint64 len)
     if (m_volume < 1.0f) {
         // Don't use PulseAudio volume, as it might affect all other streams of the same category
         // or even affect the system volume if flat volumes are enabled
-        void *dest = NULL;
+        void *dest = nullptr;
         size_t nbytes = len;
         if (pa_stream_begin_write(m_stream, &dest, &nbytes) < 0) {
             qWarning("QAudioOutput(pulseaudio): pa_stream_begin_write, error = %s",
@@ -525,7 +525,7 @@ qint64 QPulseAudioOutput::write(const char *data, qint64 len)
         data = reinterpret_cast<char *>(dest);
     }
 
-    if (pa_stream_write(m_stream, data, len, NULL, 0, PA_SEEK_RELATIVE) < 0) {
+    if (pa_stream_write(m_stream, data, len, nullptr, 0, PA_SEEK_RELATIVE) < 0) {
         qWarning("QAudioOutput(pulseaudio): pa_stream_write, error = %s",
                  pa_strerror(pa_context_errno(pulseEngine->context())));
         setError(QAudio::IOError);
@@ -607,11 +607,11 @@ void QPulseAudioOutput::resume()
 
         pulseEngine->lock();
 
-        pa_operation *operation = pa_stream_cork(m_stream, 0, outputStreamSuccessCallback, NULL);
+        pa_operation *operation = pa_stream_cork(m_stream, 0, outputStreamSuccessCallback, nullptr);
         pulseEngine->wait(operation);
         pa_operation_unref(operation);
 
-        operation = pa_stream_trigger(m_stream, outputStreamSuccessCallback, NULL);
+        operation = pa_stream_trigger(m_stream, outputStreamSuccessCallback, nullptr);
         pulseEngine->wait(operation);
         pa_operation_unref(operation);
 
@@ -647,7 +647,7 @@ void QPulseAudioOutput::suspend()
 
         pulseEngine->lock();
 
-        operation = pa_stream_cork(m_stream, 1, outputStreamSuccessCallback, NULL);
+        operation = pa_stream_cork(m_stream, 1, outputStreamSuccessCallback, nullptr);
         pulseEngine->wait(operation);
         pa_operation_unref(operation);
 
diff --git a/src/multimedia/audio/qaudiobuffer.cpp b/src/multimedia/audio/qaudiobuffer.cpp
index 999f280b3..10feed5d1 100644
--- a/src/multimedia/audio/qaudiobuffer.cpp
+++ b/src/multimedia/audio/qaudiobuffer.cpp
@@ -134,21 +134,21 @@ public:
             mBuffer = nullptr;
     }
 
-    ~QMemoryAudioBufferProvider()
+    ~QMemoryAudioBufferProvider() override
     {
         if (mBuffer)
             free(mBuffer);
     }
 
     void release() override {delete this;}
-    QAudioFormat format() const override {return mFormat;}
-    qint64 startTime() const override {return mStartTime;}
-    int frameCount() const override {return mFrameCount;}
+    [[nodiscard]] QAudioFormat format() const override {return mFormat;}
+    [[nodiscard]] qint64 startTime() const override {return mStartTime;}
+    [[nodiscard]] int frameCount() const override {return mFrameCount;}
 
-    void *constData() const override {return mBuffer;}
+    [[nodiscard]] void *constData() const override {return mBuffer;}
 
     void *writableData() override {return mBuffer;}
-    QAbstractAudioBuffer *clone() const override
+    [[nodiscard]] QAbstractAudioBuffer *clone() const override
     {
         return new QMemoryAudioBufferProvider(mBuffer, mFrameCount, mFormat, mStartTime);
     }
diff --git a/src/multimedia/audio/qaudiodecoder.cpp b/src/multimedia/audio/qaudiodecoder.cpp
index 0286e9a85..bac96d401 100644
--- a/src/multimedia/audio/qaudiodecoder.cpp
+++ b/src/multimedia/audio/qaudiodecoder.cpp
@@ -83,17 +83,10 @@ class QAudioDecoderPrivate : public QMediaObjectPrivate
     Q_DECLARE_NON_CONST_PUBLIC(QAudioDecoder)
 
 public:
-    QAudioDecoderPrivate()
-        : provider(nullptr)
-        , control(nullptr)
-        , state(QAudioDecoder::StoppedState)
-        , error(QAudioDecoder::NoError)
-    {}
-
-    QMediaServiceProvider *provider;
-    QAudioDecoderControl *control;
-    QAudioDecoder::State state;
-    QAudioDecoder::Error error;
+    QMediaServiceProvider *provider = nullptr;
+    QAudioDecoderControl *control = nullptr;
+    QAudioDecoder::State state = QAudioDecoder::StoppedState;
+    QAudioDecoder::Error error = QAudioDecoder::NoError;
     QString errorString;
 
     void _q_stateChanged(QAudioDecoder::State state);
diff --git a/src/multimedia/audio/qaudiodevicefactory.cpp b/src/multimedia/audio/qaudiodevicefactory.cpp
index f7fe82a36..f3ea7e533 100644
--- a/src/multimedia/audio/qaudiodevicefactory.cpp
+++ b/src/multimedia/audio/qaudiodevicefactory.cpp
@@ -48,10 +48,10 @@ QT_BEGIN_NAMESPACE
 class QNullDeviceInfo : public QAbstractAudioDeviceInfo
 {
 public:
-    QAudioFormat preferredFormat() const override { qWarning()<<"using null deviceinfo, none available"; return QAudioFormat(); }
-    bool isFormatSupported(const QAudioFormat& ) const override { return false; }
-    QAudioFormat nearestFormat(const QAudioFormat& ) const { return QAudioFormat(); }
-    QString deviceName() const override { return QString(); }
+    [[nodiscard]] QAudioFormat preferredFormat() const override { qWarning()<<"using null deviceinfo, none available"; return QAudioFormat(); }
+    [[nodiscard]] bool isFormatSupported(const QAudioFormat& ) const override { return false; }
+    [[nodiscard]] QAudioFormat nearestFormat(const QAudioFormat& ) const { return QAudioFormat(); }
+    [[nodiscard]] QString deviceName() const override { return QString(); }
     QStringList supportedCodecs() override { return QStringList(); }
     QList<int> supportedSampleRates() override  { return QList<int>(); }
     QList<int> supportedChannelCounts() override { return QList<int>(); }
@@ -69,20 +69,20 @@ public:
     void reset() override {}
     void suspend() override {}
     void resume() override {}
-    int bytesReady() const override { return 0; }
-    int periodSize() const override { return 0; }
+    [[nodiscard]] int bytesReady() const override { return 0; }
+    [[nodiscard]] int periodSize() const override { return 0; }
     void setBufferSize(int ) override {}
-    int bufferSize() const override  { return 0; }
+    [[nodiscard]] int bufferSize() const override  { return 0; }
     void setNotifyInterval(int ) override {}
-    int notifyInterval() const override { return 0; }
-    qint64 processedUSecs() const override { return 0; }
-    qint64 elapsedUSecs() const override { return 0; }
-    QAudio::Error error() const override { return QAudio::OpenError; }
-    QAudio::State state() const override { return QAudio::StoppedState; }
+    [[nodiscard]] int notifyInterval() const override { return 0; }
+    [[nodiscard]] qint64 processedUSecs() const override { return 0; }
+    [[nodiscard]] qint64 elapsedUSecs() const override { return 0; }
+    [[nodiscard]] QAudio::Error error() const override { return QAudio::OpenError; }
+    [[nodiscard]] QAudio::State state() const override { return QAudio::StoppedState; }
     void setFormat(const QAudioFormat&) override {}
-    QAudioFormat format() const override { return QAudioFormat(); }
+    [[nodiscard]] QAudioFormat format() const override { return QAudioFormat(); }
     void setVolume(qreal) override {}
-    qreal volume() const override {return 1.0f;}
+    [[nodiscard]] qreal volume() const override {return 1.0f;}
 };
 
 class QNullOutputDevice : public QAbstractAudioOutput
@@ -94,18 +94,18 @@ public:
     void reset() override {}
     void suspend() override {}
     void resume() override {}
-    int bytesFree() const override { return 0; }
-    int periodSize() const override { return 0; }
+    [[nodiscard]] int bytesFree() const override { return 0; }
+    [[nodiscard]] int periodSize() const override { return 0; }
     void setBufferSize(int ) override {}
-    int bufferSize() const override  { return 0; }
+    [[nodiscard]] int bufferSize() const override  { return 0; }
     void setNotifyInterval(int ) override {}
-    int notifyInterval() const override { return 0; }
-    qint64 processedUSecs() const override { return 0; }
-    qint64 elapsedUSecs() const override { return 0; }
-    QAudio::Error error() const override { return QAudio::OpenError; }
-    QAudio::State state() const override { return QAudio::StoppedState; }
+    [[nodiscard]] int notifyInterval() const override { return 0; }
+    [[nodiscard]] qint64 processedUSecs() const override { return 0; }
+    [[nodiscard]] qint64 elapsedUSecs() const override { return 0; }
+    [[nodiscard]] QAudio::Error error() const override { return QAudio::OpenError; }
+    [[nodiscard]] QAudio::State state() const override { return QAudio::StoppedState; }
     void setFormat(const QAudioFormat&) override {}
-    QAudioFormat format() const override { return QAudioFormat(); }
+    [[nodiscard]] QAudioFormat format() const override { return QAudioFormat(); }
 };
 
 QList<QAudioDeviceInfo> QAudioDeviceFactory::availableDevices(QAudio::Mode mode)
diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp
index 338dc4973..bbc5b81c6 100644
--- a/src/multimedia/audio/qaudiodeviceinfo.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo.cpp
@@ -55,12 +55,7 @@ Q_CONSTRUCTOR_FUNCTION(qRegisterAudioDeviceInfoMetaTypes)
 class QAudioDeviceInfoPrivate : public QSharedData
 {
 public:
-    QAudioDeviceInfoPrivate()
-        : mode(QAudio::AudioOutput)
-        , info(nullptr)
-    {
-    }
-
+    QAudioDeviceInfoPrivate() = default;
     QAudioDeviceInfoPrivate(const QByteArray &h, QAudio::Mode m)
         : handle(h), mode(m)
     {
@@ -93,8 +88,8 @@ public:
     }
 
     QByteArray  handle;
-    QAudio::Mode mode;
-    QAbstractAudioDeviceInfo*   info;
+    QAudio::Mode mode = QAudio::AudioOutput;
+    QAbstractAudioDeviceInfo *info = nullptr;
 };
 
 
diff --git a/src/multimedia/audio/qaudiohelpers.cpp b/src/multimedia/audio/qaudiohelpers.cpp
index fae591477..ac5e308aa 100644
--- a/src/multimedia/audio/qaudiohelpers.cpp
+++ b/src/multimedia/audio/qaudiohelpers.cpp
@@ -56,7 +56,7 @@ public:
         data[2] = (v & 0xFF0000) >> 16;
     }
     template<class T>
-    T multiply(qreal factor, T v = 0) const {
+    [[nodiscard]] T multiply(qreal factor, T v = 0) const {
         v |= data[0];
         v |= data[1] << 8;
         v |= data[2] << 16;
@@ -102,19 +102,19 @@ template<class T> void adjustSamples(qreal factor, const void *src, void *dst, i
 template<class T> struct signedVersion {};
 template<> struct signedVersion<quint8>
 {
-    typedef qint8 TS;
+    using TS = qint8;
     enum {offset = 0x80};
 };
 
 template<> struct signedVersion<quint16>
 {
-    typedef qint16 TS;
+    using TS = qint16;
     enum {offset = 0x8000};
 };
 
 template<> struct signedVersion<quint32>
 {
-    typedef qint32 TS;
+    using TS = qint32;
     enum {offset = 0x80000000};
 };