4 files changed, 14 insertions, 23 deletions
diff --git a/src/plugins/Input/vorbis/decoder_vorbis.cpp b/src/plugins/Input/vorbis/decoder_vorbis.cpp
index bcf051c04..cad4a2082 100644
--- a/src/plugins/Input/vorbis/decoder_vorbis.cpp
+++ b/src/plugins/Input/vorbis/decoder_vorbis.cpp
@@ -16,16 +16,14 @@
 // ic functions for OggVorbis
 static size_t oggread (void *buf, size_t size, size_t nmemb, void *src)
 {
-    if (! src) return 0;
-
-    DecoderVorbis *dogg = (DecoderVorbis *) src;
+    DecoderVorbis *dogg = static_cast<DecoderVorbis *>(src);
     int len = dogg->input()->read((char *) buf, (size * nmemb));
     return len / size;
 }
 
 static int oggseek(void *src, ogg_int64_t offset, int whence)
 {
-    DecoderVorbis *dogg = (DecoderVorbis *) src;
+    DecoderVorbis *dogg = static_cast<DecoderVorbis *>(src);
 
     if ( dogg->input()->isSequential ())
         return -1;
@@ -60,7 +58,7 @@ static int oggclose(void *)
 
 static long oggtell(void *src)
 {
-    DecoderVorbis *dogg = (DecoderVorbis *) src;
+    DecoderVorbis *dogg = static_cast<DecoderVorbis *>(src);
     long t = dogg->input()->pos();
     return t;
 }
@@ -68,14 +66,8 @@ static long oggtell(void *src)
 
 // Decoder class
 
-DecoderVorbis::DecoderVorbis(QIODevice *i)
-        : Decoder(i)
+DecoderVorbis::DecoderVorbis(QIODevice *i) : Decoder(i)
 {
-    m_inited = false;
-    m_totalTime = 0;
-    m_last_section = -1;
-    m_bitrate = 0;
-    len = 0;
     memset(&oggfile, 0, sizeof(OggVorbis_File));
 }
 
@@ -150,7 +142,6 @@ int DecoderVorbis::bitrate() const
     return m_bitrate;
 }
 
-
 void DecoderVorbis::deinit()
 {
     if (m_inited)
diff --git a/src/plugins/Input/vorbis/decoder_vorbis.h b/src/plugins/Input/vorbis/decoder_vorbis.h
index 8f23236c4..60660e779 100644
--- a/src/plugins/Input/vorbis/decoder_vorbis.h
+++ b/src/plugins/Input/vorbis/decoder_vorbis.h
@@ -15,7 +15,7 @@
 class DecoderVorbis : public Decoder
 {
 public:
-    DecoderVorbis(QIODevice *i);
+    explicit DecoderVorbis(QIODevice *i);
     virtual ~DecoderVorbis();
 
     // Standard Decoder API
@@ -34,11 +34,11 @@ private:
 
     // OggVorbis Decoder
     OggVorbis_File oggfile;
-    qint64 m_totalTime;
-    long len;
-    int m_last_section;
-    int m_bitrate;
-    bool m_inited;
+    qint64 m_totalTime = 0;
+    long len = 0;
+    int m_last_section = -1;
+    int m_bitrate = 0;
+    bool m_inited = false;
 };
 
 
diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
index 9c1117c6c..3ff4c8c46 100644
--- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
+++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
@@ -30,12 +30,12 @@
 
 VorbisMetaDataModel::VorbisMetaDataModel(const QString &path, bool readOnly)
 #ifdef HAS_PICTURE_LIST
-    : MetaDataModel(readOnly, MetaDataModel::IsCoverEditable)
+    : MetaDataModel(readOnly, MetaDataModel::IsCoverEditable),
 #else
-    : MetaDataModel(readOnly)
+    : MetaDataModel(readOnly),
 #endif
+      m_path(path)
 {
-    m_path = path;
     m_stream = new TagLib::FileStream(QStringToFileName(path), readOnly);
     m_file = new TagLib::Ogg::Vorbis::File(m_stream);
     m_tag = m_file->tag();
diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.h b/src/plugins/Input/vorbis/vorbismetadatamodel.h
index e773ef6d5..064c9da39 100644
--- a/src/plugins/Input/vorbis/vorbismetadatamodel.h
+++ b/src/plugins/Input/vorbis/vorbismetadatamodel.h
@@ -58,7 +58,7 @@ private:
 class VorbisCommentModel : public TagModel
 {
 public:
-    VorbisCommentModel(VorbisMetaDataModel *model);
+    explicit VorbisCommentModel(VorbisMetaDataModel *model);
     ~VorbisCommentModel();
     QString name() const override;
     QString value(Qmmp::MetaData key) const override;