coding style fixes

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

6 files changed, 18 insertions, 24 deletions

diff --git a/src/plugins/Input/sid/decoder_sid.cpp b/src/plugins/Input/sid/decoder_sid.cpp
index 31994a2cc..2a6c8e566 100644
--- a/src/plugins/Input/sid/decoder_sid.cpp
+++ b/src/plugins/Input/sid/decoder_sid.cpp
@@ -32,15 +32,12 @@
 #include "decoder_sid.h"
 
 // Decoder class
-DecoderSID::DecoderSID(SidDatabase *db, const QString &url) : Decoder(), m_tune(nullptr)
-{
-    m_db = db;
-    m_url = url;
-    m_player = new sidplayfp();
-    m_length = 0;
-    m_length_in_bytes = 0;
-    m_read_bytes = 0;
-}
+DecoderSID::DecoderSID(SidDatabase *db, const QString &url) : Decoder(),
+    m_url(url),
+    m_player(new sidplayfp()),
+    m_db(db),
+    m_tune(nullptr)
+{}
 
 DecoderSID::~DecoderSID()
 {
diff --git a/src/plugins/Input/sid/decoder_sid.h b/src/plugins/Input/sid/decoder_sid.h
index a97f90ba6..36dd9bbc1 100644
--- a/src/plugins/Input/sid/decoder_sid.h
+++ b/src/plugins/Input/sid/decoder_sid.h
@@ -47,9 +47,9 @@ private:
     QString m_url;
     sidplayfp *m_player;
     SidDatabase *m_db;
-    int m_length;
-    qint64 m_length_in_bytes;
-    qint64 m_read_bytes;
+    int m_length = 0;
+    qint64 m_length_in_bytes = 0;
+    qint64 m_read_bytes = 0;
     SidTune m_tune;
 };
 
diff --git a/src/plugins/Input/sid/settingsdialog.cpp b/src/plugins/Input/sid/settingsdialog.cpp
index dc247d97b..9b028f156 100644
--- a/src/plugins/Input/sid/settingsdialog.cpp
+++ b/src/plugins/Input/sid/settingsdialog.cpp
@@ -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  *
@@ -24,9 +24,9 @@
 #include <sidplayfp/SidConfig.h>
 #include "settingsdialog.h"
 
-SettingsDialog::SettingsDialog(SidDatabase *db, QWidget *parent) : QDialog(parent)
+SettingsDialog::SettingsDialog(SidDatabase *db, QWidget *parent) : QDialog(parent),
+    m_db(db)
 {
-    m_db = db;
     m_ui.setupUi(this);
     setAttribute(Qt::WA_DeleteOnClose);
 
diff --git a/src/plugins/Input/sid/settingsdialog.h b/src/plugins/Input/sid/settingsdialog.h
index 42a501176..5749e23fc 100644
--- a/src/plugins/Input/sid/settingsdialog.h
+++ b/src/plugins/Input/sid/settingsdialog.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2013 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  *
@@ -31,7 +31,7 @@ class SettingsDialog : public QDialog
 {
     Q_OBJECT
 public:
-    SettingsDialog(SidDatabase *db, QWidget *parent = nullptr);
+    explicit SettingsDialog(SidDatabase *db, QWidget *parent = nullptr);
 
     virtual ~SettingsDialog();
 
diff --git a/src/plugins/Input/sid/sidhelper.cpp b/src/plugins/Input/sid/sidhelper.cpp
index e619cdfc4..701f269a6 100644
--- a/src/plugins/Input/sid/sidhelper.cpp
+++ b/src/plugins/Input/sid/sidhelper.cpp
@@ -22,11 +22,8 @@
 #include <sidplayfp/SidDatabase.h>
 #include "sidhelper.h"
 
-SIDHelper::SIDHelper(SidDatabase *db)
-{
-    m_tune = nullptr;
-    m_db = db;
-}
+SIDHelper::SIDHelper(SidDatabase *db) : m_db(db)
+{}
 
 SIDHelper::~SIDHelper()
 {
diff --git a/src/plugins/Input/sid/sidhelper.h b/src/plugins/Input/sid/sidhelper.h
index f25a20ff5..9357021cc 100644
--- a/src/plugins/Input/sid/sidhelper.h
+++ b/src/plugins/Input/sid/sidhelper.h
@@ -34,14 +34,14 @@
 class SIDHelper
 {
 public:
-    SIDHelper(SidDatabase *db);
+    explicit SIDHelper(SidDatabase *db);
     ~SIDHelper();
     SidTune *load(const QString &url);
     QList<TrackInfo *> createPlayList(TrackInfo::Parts parts);
 
 private:
     QString m_path;
-    SidTune *m_tune;
+    SidTune *m_tune = nullptr;
     SidDatabase *m_db;
 };