ALSA: cleanups

* connect by member function pointer
* silence -Wfallthrough
* silence -Wunused-private-field

Pick-to: 6.5 6.7
Change-Id: I4691b072cccc566e10eebe6d0055fb99cd3495a3
Reviewed-by: Mikko Hallamaa <mikko.hallamaa@qt.io>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>

3 files changed, 7 insertions, 7 deletions

diff --git a/src/multimedia/alsa/qalsaaudiosink.cpp b/src/multimedia/alsa/qalsaaudiosink.cpp
index 98a68861f..e515219a2 100644
--- a/src/multimedia/alsa/qalsaaudiosink.cpp
+++ b/src/multimedia/alsa/qalsaaudiosink.cpp
@@ -30,13 +30,13 @@ QAlsaAudioSink::QAlsaAudioSink(const QByteArray &device, QObject *parent)
     m_device = device;
 
     timer = new QTimer(this);
-    connect(timer, SIGNAL(timeout()), this, SLOT(userFeed()));
+    connect(timer, &QTimer::timeout, this, &QAlsaAudioSink::userFeed);
 }
 
 QAlsaAudioSink::~QAlsaAudioSink()
 {
     close();
-    disconnect(timer, SIGNAL(timeout()));
+    disconnect(timer, &QTimer::timeout, this, &QAlsaAudioSink::userFeed);
     QCoreApplication::processEvents();
     delete timer;
 }
@@ -130,6 +130,7 @@ int QAlsaAudioSink::setFormat()
             pcmformat = SND_PCM_FORMAT_FLOAT_BE;
         else
             pcmformat = SND_PCM_FORMAT_FLOAT_LE;
+        break;
     default:
         break;
     }
diff --git a/src/multimedia/alsa/qalsaaudiosink_p.h b/src/multimedia/alsa/qalsaaudiosink_p.h
index 7e8836f96..0f5a5aa5a 100644
--- a/src/multimedia/alsa/qalsaaudiosink_p.h
+++ b/src/multimedia/alsa/qalsaaudiosink_p.h
@@ -96,7 +96,6 @@ private:
     char* audioBuffer = nullptr;
     snd_pcm_t* handle = nullptr;
     snd_pcm_access_t access = SND_PCM_ACCESS_RW_INTERLEAVED;
-    snd_pcm_format_t pcmformat = SND_PCM_FORMAT_S16;
     snd_pcm_hw_params_t *hwparams = nullptr;
     qreal m_volume = 1.0f;
 };
diff --git a/src/multimedia/alsa/qalsaaudiosource.cpp b/src/multimedia/alsa/qalsaaudiosource.cpp
index 951cfeabb..ebf6e24e2 100644
--- a/src/multimedia/alsa/qalsaaudiosource.cpp
+++ b/src/multimedia/alsa/qalsaaudiosource.cpp
@@ -16,7 +16,6 @@
 #include <QtCore/qvarlengtharray.h>
 #include <QtMultimedia/private/qaudiohelpers_p.h>
 #include "qalsaaudiosource_p.h"
-#include "qalsaaudiodevice_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -45,13 +44,13 @@ QAlsaAudioSource::QAlsaAudioSource(const QByteArray &device, QObject *parent)
     m_device = device;
 
     timer = new QTimer(this);
-    connect(timer, SIGNAL(timeout()), this, SLOT(userFeed()));
+    connect(timer, &QTimer::timeout, this, &QAlsaAudioSource::userFeed);
 }
 
 QAlsaAudioSource::~QAlsaAudioSource()
 {
     close();
-    disconnect(timer, SIGNAL(timeout()));
+    disconnect(timer, &QTimer::timeout, this, &QAlsaAudioSource::userFeed);
     QCoreApplication::processEvents();
     delete timer;
 }
@@ -158,6 +157,7 @@ int QAlsaAudioSource::setFormat()
             pcmformat = SND_PCM_FORMAT_FLOAT_BE;
         else
             pcmformat = SND_PCM_FORMAT_FLOAT_LE;
+        break;
     default:
         break;
     }
@@ -370,7 +370,7 @@ bool QAlsaAudioSource::open()
     bytesAvailable = checkBytesReady();
 
     if(pullMode)
-        connect(audioSource,SIGNAL(readyRead()),this,SLOT(userFeed()));
+        connect(audioSource, &QIODevice::readyRead, this, &QAlsaAudioSource::userFeed);
 
     // Step 6: Start audio processing
     chunks = buffer_size/period_size;