coding style fixes

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9470 90c681e8-e032-0410-971d-27865f9a5e38

2 files changed, 11 insertions, 18 deletions

diff --git a/src/plugins/Input/sndfile/decoder_sndfile.cpp b/src/plugins/Input/sndfile/decoder_sndfile.cpp
index 45607cb24..94e399996 100644
--- a/src/plugins/Input/sndfile/decoder_sndfile.cpp
+++ b/src/plugins/Input/sndfile/decoder_sndfile.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2016 by Ilya Kotov                                 *
+ *   Copyright (C) 2007-2020 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -29,7 +29,7 @@
 
 sf_count_t sndfile_sf_vio_get_filelen(void *data)
 {
-    return ((QIODevice*) data)->size();
+    return static_cast<QIODevice*>(data)->size();
 }
 
 sf_count_t sndfile_sf_vio_seek(sf_count_t offset, int whence, void *data)
@@ -59,7 +59,7 @@ sf_count_t sndfile_sf_vio_seek(sf_count_t offset, int whence, void *data)
 
 sf_count_t sndfile_sf_vio_read(void *ptr, sf_count_t count, void *data)
 {
-    return ((QIODevice*) data)->read((char *)ptr, count);
+    return static_cast<QIODevice*>(data)->read((char *)ptr, count);
 }
 
 sf_count_t sndfile_sf_vio_write(const void *, sf_count_t, void *)
@@ -69,19 +69,13 @@ sf_count_t sndfile_sf_vio_write(const void *, sf_count_t, void *)
 
 sf_count_t sndfile_sf_vio_tell(void *data)
 {
-    return ((QIODevice*) data)->pos();
+   return static_cast<QIODevice*>(data)->pos();
 }
 
 // Decoder class
 
 DecoderSndFile::DecoderSndFile(QIODevice *input) : Decoder(input)
-{
-    //m_path = input;
-    m_bitrate = 0;
-    m_totalTime = 0;
-    m_sndfile = nullptr;
-    m_freq = 0;
-}
+{}
 
 DecoderSndFile::~DecoderSndFile()
 {
diff --git a/src/plugins/Input/sndfile/decoder_sndfile.h b/src/plugins/Input/sndfile/decoder_sndfile.h
index d202ad546..d651a87f7 100644
--- a/src/plugins/Input/sndfile/decoder_sndfile.h
+++ b/src/plugins/Input/sndfile/decoder_sndfile.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2016 by Ilya Kotov                                 *
+ *   Copyright (C) 2007-2020 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -32,7 +32,7 @@
 class DecoderSndFile : public Decoder
 {
 public:
-    DecoderSndFile(QIODevice *input);
+    explicit DecoderSndFile(QIODevice *input);
     virtual ~DecoderSndFile();
 
     // Standard Decoder API
@@ -43,14 +43,13 @@ public:
     void seek(qint64 time) override;
 
 private:
-
     // helper functions
     void deinit();
 
-    SNDFILE *m_sndfile;
-    int m_bitrate;
-    quint32 m_freq;
-    qint64 m_totalTime;
+    SNDFILE *m_sndfile = nullptr;
+    int m_bitrate = 0;
+    quint32 m_freq = 0;
+    qint64 m_totalTime = 0;
     SF_VIRTUAL_IO m_vio;
 };