1 files changed, 10 insertions, 12 deletions

diff --git a/src/plugins/Input/flac/decoder_flac.cpp b/src/plugins/Input/flac/decoder_flac.cpp
index cfc34a35e..d95b1a9f3 100644
--- a/src/plugins/Input/flac/decoder_flac.cpp
+++ b/src/plugins/Input/flac/decoder_flac.cpp
@@ -84,9 +84,9 @@ static size_t pack_pcm_signed (FLAC__byte *output,
      return samples * channels * bps / 8;
 }
 
-static int flac_decode (void *void_data, unsigned char *buf, int buf_len)
+static int flac_decode (void *client_data, unsigned char *buf, int buf_len)
 {
-    flac_data *data = (flac_data *) void_data;
+    flac_data *data = static_cast<flac_data *>(client_data);
     unsigned to_copy;
 
     if (!data->sample_buffer_fill)
@@ -120,7 +120,7 @@ static FLAC__StreamDecoderReadStatus flac_callback_read (const FLAC__StreamDecod
         size_t *bytes,
         void *client_data)
 {
-    flac_data *data = (flac_data *) client_data;
+    flac_data *data = static_cast<flac_data *>(client_data);
     qint64 res = data->input->read((char *)buffer, *bytes);
 
     if (res > 0)
@@ -143,7 +143,7 @@ static FLAC__StreamDecoderWriteStatus flac_callback_write (const FLAC__StreamDec
         const FLAC__int32* const buffer[],
         void *client_data)
 {
-    flac_data *data = (flac_data *) client_data;
+    flac_data *data = static_cast<flac_data *>(client_data);
     const unsigned wide_samples = frame->header.blocksize;
 
     if (data->abort)
@@ -185,7 +185,7 @@ static FLAC__StreamDecoderTellStatus flac_callback_tell (const FLAC__StreamDecod
         FLAC__uint64 *offset,
         void *client_data)
 {
-    flac_data *data = (flac_data *) client_data;
+    flac_data *data = static_cast<flac_data *>(client_data);
     if(data->input->isSequential())
         return FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED;
 
@@ -197,7 +197,7 @@ static FLAC__StreamDecoderSeekStatus flac_callback_seek (const FLAC__StreamDecod
         FLAC__uint64 offset,
         void *client_data)
 {
-    flac_data *data = (flac_data *) client_data;
+    flac_data *data = static_cast<flac_data *>(client_data);
     if(data->input->isSequential())
         return FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED;
 
@@ -210,7 +210,7 @@ static FLAC__StreamDecoderLengthStatus flac_callback_length (const FLAC__StreamD
         FLAC__uint64 *stream_length,
         void *client_data)
 {
-    flac_data *data = (flac_data *) client_data;
+    flac_data *data = static_cast<flac_data *>(client_data);
     if(data->input->isSequential())
         return FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED;
 
@@ -222,7 +222,7 @@ static void flac_callback_metadata (const FLAC__StreamDecoder *,
                                     const FLAC__StreamMetadata *metadata,
                                     void *client_data)
 {
-    flac_data *data = (flac_data *) client_data;
+    flac_data *data = static_cast<flac_data *>(client_data);
 
     if (metadata->type == FLAC__METADATA_TYPE_STREAMINFO)
     {
@@ -262,12 +262,10 @@ static void flac_callback_error (const FLAC__StreamDecoder *,
 
 // Decoder class
 
-DecoderFLAC::DecoderFLAC(const QString &path, QIODevice *i)
-        : Decoder(i)
+DecoderFLAC::DecoderFLAC(const QString &path, QIODevice *i) : Decoder(i),
+    m_path(path)
 {
-    m_path = path;
     m_data = new flac_data;
-    m_data->decoder = nullptr;
     m_data->input = i;
 }