coding style fixes

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

7 files changed, 17 insertions, 20 deletions

diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
index 986528d19..b9d890770 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
@@ -35,12 +35,12 @@ static int ffmpeg_read(void *data, uint8_t *buf, int size)
     if(d->input()->atEnd())
         return AVERROR_EOF;
 #endif
-    return (int)d->input()->read((char*)buf, size);
+    return static_cast<int>(d->input()->read((char*)buf, size));
 }
 
 static int64_t ffmpeg_seek(void *data, int64_t offset, int whence)
 {
-    DecoderFFmpeg *d = (DecoderFFmpeg*)data;
+    DecoderFFmpeg *d = static_cast<DecoderFFmpeg*>(data);
     int64_t absolute_pos = 0;
     /*if(d->input()->isSequential())
         return -1;*/
@@ -66,10 +66,10 @@ static int64_t ffmpeg_seek(void *data, int64_t offset, int whence)
 }
 
 // Decoder class
-DecoderFFmpeg::DecoderFFmpeg(const QString &path, QIODevice *i)
-        : Decoder(i)
+DecoderFFmpeg::DecoderFFmpeg(const QString &path, QIODevice *i) : Decoder(i),
+    m_path(path)
+
 {
-    m_path = path;
     m_pkt = av_packet_alloc();
 }
 
@@ -410,9 +410,9 @@ void DecoderFFmpeg::fillBuffer()
 
         if((m_eof || send_error < 0) && recv_error < 0)
         {
-            char errbuf[AV_ERROR_MAX_STRING_SIZE] = { 0 };
             if(!m_eof)
             {
+                char errbuf[AV_ERROR_MAX_STRING_SIZE] = { 0 };
                 av_strerror(send_error, errbuf, sizeof(errbuf));
                 qWarning("DecoderFFmpeg: avcodec_send_packet error: %s", errbuf);
                 av_strerror(recv_error, errbuf, sizeof(errbuf));
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h
index 5bea3901d..303234f2c 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h
@@ -36,7 +36,7 @@ extern "C"{
 class DecoderFFmpeg : public Decoder
 {
 public:
-    DecoderFFmpeg(const QString &, QIODevice *i);
+    explicit DecoderFFmpeg(const QString &, QIODevice *i);
     virtual ~DecoderFFmpeg();
 
     // Standard Decoder API
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpegcue.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpegcue.cpp
index b85ff55db..a27a687fe 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpegcue.cpp
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpegcue.cpp
@@ -25,12 +25,9 @@
 #include "decoder_ffmpeg.h"
 #include "decoder_ffmpegcue.h"
 
-
-DecoderFFmpegCue::DecoderFFmpegCue(const QString &url)
-    : Decoder()
-{
-    m_url = url;
-}
+DecoderFFmpegCue::DecoderFFmpegCue(const QString &url) : Decoder(),
+    m_url(url)
+{}
 
 DecoderFFmpegCue::~DecoderFFmpegCue()
 {
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpegcue.h b/src/plugins/Input/ffmpeg/decoder_ffmpegcue.h
index 7edb372b2..b8203e70c 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpegcue.h
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpegcue.h
@@ -33,7 +33,7 @@ class CueParser;
 class DecoderFFmpegCue : public Decoder
 {
 public:
-    DecoderFFmpegCue(const QString &url);
+    explicit DecoderFFmpegCue(const QString &url);
     virtual ~DecoderFFmpegCue();
 
     // Standard Decoder API
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
index fccd90bd3..4fb284b98 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
@@ -174,14 +174,14 @@ Decoder *DecoderFFmpegFactory::create(const QString &path, QIODevice *input)
 
 QList<TrackInfo *> DecoderFFmpegFactory::createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *)
 {
-    int track = -1; //cue track
+    int cueTrack = -1; //cue track
     QString filePath = path;
 
     if(path.contains("://")) //is it cue track?
     {
         filePath.remove("ffmpeg://");
         filePath.remove(QRegExp("#\\d+$"));
-        track = path.section("#", -1).toInt();
+        cueTrack = path.section("#", -1).toInt();
         parts = TrackInfo::AllParts; //extract all metadata for single cue track
     }
 
@@ -240,7 +240,7 @@ QList<TrackInfo *> DecoderFFmpegFactory::createPlayList(const QString &path, Tra
 
             avformat_close_input(&in);
             delete info;
-            return (track > 0) ? parser.createPlayList(track) : parser.createPlayList();
+            return (cueTrack > 0) ? parser.createPlayList(cueTrack) : parser.createPlayList();
         }
 
         AVDictionaryEntry *album = av_dict_get(in->metadata,"album",nullptr,0);
diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h
index 13d040231..9e18add0a 100644
--- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h
+++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h
@@ -26,7 +26,7 @@
 class FFmpegMetaDataModel : public MetaDataModel
 {
 public:
-    FFmpegMetaDataModel(const QString &path);
+    explicit FFmpegMetaDataModel(const QString &path);
     ~FFmpegMetaDataModel();
     QPixmap cover() const override;
 
diff --git a/src/plugins/Input/ffmpeg/replaygainreader.h b/src/plugins/Input/ffmpeg/replaygainreader.h
index 2002b15b6..6b11ab868 100644
--- a/src/plugins/Input/ffmpeg/replaygainreader.h
+++ b/src/plugins/Input/ffmpeg/replaygainreader.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2016 by Ilya Kotov                                      *
+ *   Copyright (C) 2016-2020 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -35,7 +35,7 @@ extern "C"{
 class ReplayGainReader
 {
 public:
-    ReplayGainReader(AVFormatContext *ic);
+    explicit ReplayGainReader(AVFormatContext *ic);
     QMap <Qmmp::ReplayGainKey, double> replayGainInfo() const;
 
 private: