From 7ef8d11baeaf1847ba7f1df5d858f8cffea9300d Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 12 Aug 2020 21:03:34 +0000 Subject: coding style fixes git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9470 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/cue/cuefile.cpp | 6 +++--- src/plugins/Input/cue/cuefile.h | 2 +- src/plugins/Input/cue/cuemetadatamodel.h | 2 +- src/plugins/Input/cue/decoder_cue.cpp | 13 +++---------- src/plugins/Input/cue/decoder_cue.h | 26 +++++++++++++------------- 5 files changed, 21 insertions(+), 28 deletions(-) (limited to 'src/plugins/Input/cue') diff --git a/src/plugins/Input/cue/cuefile.cpp b/src/plugins/Input/cue/cuefile.cpp index 8941c2059..d1980fe39 100644 --- a/src/plugins/Input/cue/cuefile.cpp +++ b/src/plugins/Input/cue/cuefile.cpp @@ -95,11 +95,11 @@ CueFile::CueFile(const QString &path) : CueParser() } } - for(const QString &path : m_dataFiles.values()) + for(const QString &p : m_dataFiles.values()) { - if(!QFile::exists(path)) + if(!QFile::exists(p)) { - qDebug("CueFile: unable to find file: %s", qPrintable(path)); + qDebug("CueFile: unable to find file: %s", qPrintable(p)); clear(); return; } diff --git a/src/plugins/Input/cue/cuefile.h b/src/plugins/Input/cue/cuefile.h index ca9da23bd..91b82c9f3 100644 --- a/src/plugins/Input/cue/cuefile.h +++ b/src/plugins/Input/cue/cuefile.h @@ -35,7 +35,7 @@ class CueFile : public CueParser { public: - CueFile(const QString &path); + explicit CueFile(const QString &path); ~CueFile(); QString dataFilePath(int track) const; diff --git a/src/plugins/Input/cue/cuemetadatamodel.h b/src/plugins/Input/cue/cuemetadatamodel.h index 7c827ce54..b5eba82ca 100644 --- a/src/plugins/Input/cue/cuemetadatamodel.h +++ b/src/plugins/Input/cue/cuemetadatamodel.h @@ -28,7 +28,7 @@ class CueFile; class CUEMetaDataModel : public MetaDataModel { public: - CUEMetaDataModel(const QString &url); + explicit CUEMetaDataModel(const QString &url); ~CUEMetaDataModel(); QList extraProperties() const override; QString coverPath() const override; diff --git a/src/plugins/Input/cue/decoder_cue.cpp b/src/plugins/Input/cue/decoder_cue.cpp index 9f5680113..fcd597bfc 100644 --- a/src/plugins/Input/cue/decoder_cue.cpp +++ b/src/plugins/Input/cue/decoder_cue.cpp @@ -29,16 +29,9 @@ #include "decoder_cue.h" -DecoderCUE::DecoderCUE(const QString &url) - : Decoder() -{ - m_path = url; - m_decoder = nullptr; - m_cueFile = nullptr; - m_track = 0; - m_buf = nullptr; - m_input = nullptr; -} +DecoderCUE::DecoderCUE(const QString &url) : Decoder(), + m_path(url) +{} DecoderCUE::~DecoderCUE() { diff --git a/src/plugins/Input/cue/decoder_cue.h b/src/plugins/Input/cue/decoder_cue.h index f0aa7b906..216f29cad 100644 --- a/src/plugins/Input/cue/decoder_cue.h +++ b/src/plugins/Input/cue/decoder_cue.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-2020 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -31,7 +31,7 @@ class CueFile; class DecoderCUE : public Decoder { public: - DecoderCUE(const QString &url); + explicit DecoderCUE(const QString &url); virtual ~DecoderCUE(); // Standard Decoder API @@ -44,18 +44,18 @@ public: void next() override; private: - Decoder *m_decoder; - qint64 m_length; - qint64 m_offset; - qint64 length_in_bytes; - qint64 m_totalBytes; + Decoder *m_decoder = nullptr; + qint64 m_length = 0; + qint64 m_offset = 0; + qint64 length_in_bytes = 0; + qint64 m_totalBytes = 0; QString m_path; - CueFile *m_cueFile; - int m_track; - char *m_buf; //buffer for remainig data - qint64 m_buf_size; - qint64 m_sz; //sample size - QIODevice *m_input; + CueFile *m_cueFile = nullptr; + int m_track = 0; + char *m_buf = nullptr; //buffer for remainig data + qint64 m_buf_size = 0; + qint64 m_sz = 0; //sample size + QIODevice *m_input = nullptr; }; #endif // DECODER_CUE_H -- cgit v1.2.3-13-gbd6f