coding style fixes

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

4 files changed, 17 insertions, 22 deletions

diff --git a/src/plugins/Input/opus/decoder_opus.cpp b/src/plugins/Input/opus/decoder_opus.cpp
index 5a6ffdb78..0f6cca847 100644
--- a/src/plugins/Input/opus/decoder_opus.cpp
+++ b/src/plugins/Input/opus/decoder_opus.cpp
@@ -27,13 +27,13 @@
 // ic functions for libopusfile
 static int opusread (void *src, unsigned char *buf,int size)
 {
-    DecoderOpus *d = (DecoderOpus *) src;
+    DecoderOpus *d = static_cast<DecoderOpus *>(src);
     return d->input()->read((char *) buf, size);
 }
 
 static int opusseek(void *src, opus_int64 offset, int whence)
 {
-    DecoderOpus *d = (DecoderOpus *) src;
+    DecoderOpus *d = static_cast<DecoderOpus *>(src);
     if (d->input()->isSequential())
         return -1;
     long start = 0;
@@ -57,21 +57,16 @@ static int opusseek(void *src, opus_int64 offset, int whence)
     return -1;
 }
 
-static opus_int64  opustell(void *src)
+static opus_int64 opustell(void *src)
 {
-    DecoderOpus *dogg = (DecoderOpus *) src;
-    return (long) dogg->input()->pos();
+    DecoderOpus *d = static_cast<DecoderOpus *>(src);
+    return (opus_int64)d->input()->pos();
 }
 
 // Decoder class
-DecoderOpus::DecoderOpus(const QString &url, QIODevice *i) : Decoder(i)
-{
-    m_totalTime = 0;
-    m_opusfile = nullptr;
-    m_chan = 0;
-    m_bitrate = 0;
-    m_url = url;
-}
+DecoderOpus::DecoderOpus(const QString &url, QIODevice *i) : Decoder(i),
+    m_url(url)
+{}
 
 DecoderOpus::~DecoderOpus()
 {
diff --git a/src/plugins/Input/opus/decoder_opus.h b/src/plugins/Input/opus/decoder_opus.h
index b31492938..f2abbffcf 100644
--- a/src/plugins/Input/opus/decoder_opus.h
+++ b/src/plugins/Input/opus/decoder_opus.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2013-2016 by Ilya Kotov                                 *
+ *   Copyright (C) 2013-2020 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -44,10 +44,10 @@ private:
 
     // helper functions
     ChannelMap findChannelMap(int channels);
-    OggOpusFile *m_opusfile;
-    qint64 m_totalTime;
-    int m_bitrate;
-    int m_chan;
+    OggOpusFile *m_opusfile = nullptr;
+    qint64 m_totalTime = 0;
+    int m_bitrate = 0;
+    int m_chan = 0;
     QString m_url;
 };
 
diff --git a/src/plugins/Input/opus/opusmetadatamodel.cpp b/src/plugins/Input/opus/opusmetadatamodel.cpp
index c847f2587..bc132a5a6 100644
--- a/src/plugins/Input/opus/opusmetadatamodel.cpp
+++ b/src/plugins/Input/opus/opusmetadatamodel.cpp
@@ -30,12 +30,12 @@
 
 OpusMetaDataModel::OpusMetaDataModel(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::Opus::File(m_stream);
     m_tags << new VorbisCommentModel(m_file);
diff --git a/src/plugins/Input/opus/opusmetadatamodel.h b/src/plugins/Input/opus/opusmetadatamodel.h
index f0dc88f42..725cb100b 100644
--- a/src/plugins/Input/opus/opusmetadatamodel.h
+++ b/src/plugins/Input/opus/opusmetadatamodel.h
@@ -54,7 +54,7 @@ private:
 class VorbisCommentModel : public TagModel
 {
 public:
-    VorbisCommentModel(TagLib::Ogg::Opus::File *file);
+    explicit VorbisCommentModel(TagLib::Ogg::Opus::File *file);
     ~VorbisCommentModel();
     QString name() const override;
     QString value(Qmmp::MetaData key) const override;