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, 10 insertions, 15 deletions

diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
index 37d7656bc..d2cf8dda9 100644
--- a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
+++ b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
@@ -79,11 +79,10 @@ static void cddb_log_handler(cddb_log_level_t level, const char *message)
 
 // Decoder class
 
-DecoderCDAudio::DecoderCDAudio(const QString &url) : Decoder()
-{
-    m_url = url;
-    m_buffer = new char[CDDA_BUFFER_SIZE];
-}
+DecoderCDAudio::DecoderCDAudio(const QString &url) : Decoder(),
+    m_url(url),
+    m_buffer(new char[CDDA_BUFFER_SIZE])
+{}
 
 DecoderCDAudio::~DecoderCDAudio()
 {
@@ -233,8 +232,7 @@ QList<CDATrack> DecoderCDAudio::generateTrackList(const QString &device, TrackIn
         qDebug("DecoderCDAudio: reading CDDB...");
         cddb_log_set_handler(cddb_log_handler);
         cddb_conn_t *cddb_conn = cddb_new ();
-        cddb_disc_t *cddb_disc = NULL;
-        cddb_track_t *cddb_track = NULL;
+        cddb_disc_t *cddb_disc = nullptr;
         lba_t lba;
         if (!cddb_conn)
             qWarning ("DecoderCDAudio: unable to create cddb connection");
@@ -270,7 +268,7 @@ QList<CDATrack> DecoderCDAudio::generateTrackList(const QString &device, TrackIn
 
             for (int i = first_track_number; i <= last_track_number; ++i)
             {
-                cddb_track = cddb_track_new ();
+                cddb_track_t *cddb_track = cddb_track_new ();
                 cddb_track_set_frame_offset (cddb_track, cdio_get_track_lba (cdio, i));
                 cddb_disc_add_track (cddb_disc, cddb_track);
             }
diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.h b/src/plugins/Input/cdaudio/decoder_cdaudio.h
index 130f85bd4..f3f3e6688 100644
--- a/src/plugins/Input/cdaudio/decoder_cdaudio.h
+++ b/src/plugins/Input/cdaudio/decoder_cdaudio.h
@@ -31,20 +31,17 @@ class CDATrack
 {
 public:
     CDATrack()
-    {
-        first_sector = 0;
-        last_sector = 0;
-    }
+    {}
 
     TrackInfo info;
-    lsn_t first_sector;
-    lsn_t last_sector;
+    lsn_t first_sector = 0;
+    lsn_t last_sector = 0;
 };
 
 class DecoderCDAudio : public Decoder
 {
 public:
-    DecoderCDAudio(const QString &url);
+    explicit DecoderCDAudio(const QString &url);
     virtual ~DecoderCDAudio();
 
     static QList <CDATrack> generateTrackList(const QString &device, TrackInfo::Parts parts = TrackInfo::AllParts);