coding style fixes

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

5 files changed, 15 insertions, 24 deletions

diff --git a/src/plugins/Input/archive/archiveinputdevice.cpp b/src/plugins/Input/archive/archiveinputdevice.cpp
index 95b336750..bbe2151c5 100644
--- a/src/plugins/Input/archive/archiveinputdevice.cpp
+++ b/src/plugins/Input/archive/archiveinputdevice.cpp
@@ -23,14 +23,11 @@
 
 ArchiveInputDevice::ArchiveInputDevice(const QString &url, QObject *parent)  : QIODevice(parent)
 {
-    m_archive = nullptr;
-    m_entry = nullptr;
     QString filePath = url.section("#", -1);
     QString archivePath = url;
     archivePath.remove(QRegExp("^.+://"));
     archivePath.remove(QRegExp("#.+$"));
 
-    m_close_libarchive = true;
     m_archive = archive_read_new();
     archive_read_support_filter_all(m_archive);
     archive_read_support_format_all(m_archive);
diff --git a/src/plugins/Input/archive/archiveinputdevice.h b/src/plugins/Input/archive/archiveinputdevice.h
index 18d8024d6..fef847a77 100644
--- a/src/plugins/Input/archive/archiveinputdevice.h
+++ b/src/plugins/Input/archive/archiveinputdevice.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  *
@@ -30,8 +30,8 @@ class ArchiveInputDevice : public QIODevice
 {
     Q_OBJECT
 public:
-    ArchiveInputDevice(const QString &url, QObject *parent = nullptr);
-    ArchiveInputDevice(struct archive *a, struct archive_entry *e, QObject *parent = nullptr);
+    explicit ArchiveInputDevice(const QString &url, QObject *parent = nullptr);
+    explicit ArchiveInputDevice(struct archive *a, struct archive_entry *e, QObject *parent = nullptr);
     virtual ~ArchiveInputDevice();
 
     bool seek(qint64 pos) override;
@@ -42,10 +42,10 @@ protected:
     virtual qint64 writeData(const char *, qint64) override;
 
 private:
-    struct archive *m_archive;
-    struct archive_entry *m_entry;
+    struct archive *m_archive = nullptr;
+    struct archive_entry *m_entry = nullptr;
     QBuffer m_buffer;
-    bool m_close_libarchive;
+    bool m_close_libarchive = true;
 };
 
 #endif // ARCHIVEINPUTDEVICE_H
diff --git a/src/plugins/Input/archive/archivetagreader.cpp b/src/plugins/Input/archive/archivetagreader.cpp
index f1837c18a..2ec7fe524 100644
--- a/src/plugins/Input/archive/archivetagreader.cpp
+++ b/src/plugins/Input/archive/archivetagreader.cpp
@@ -24,15 +24,13 @@
 class IODeviceStream : public TagLib::IOStream
 {
 public:
-    IODeviceStream(QIODevice *input, const QString &url)
-    {
-        m_input = input;
+    IODeviceStream(QIODevice *input, const QString &url) : m_input(input),
 #ifdef Q_OS_WIN
-        m_fileName = url.section("/", -1);
+          m_fileName(url.section("/", -1))
 #else
-        m_fileName = url.section("/", -1).toLocal8Bit();
+          m_fileName(url.section("/", -1).toLocal8Bit())
 #endif
-    }
+    {}
 
     virtual ~IODeviceStream() {}
 
diff --git a/src/plugins/Input/archive/decoder_archive.cpp b/src/plugins/Input/archive/decoder_archive.cpp
index 0f1fc860f..34a37aa01 100644
--- a/src/plugins/Input/archive/decoder_archive.cpp
+++ b/src/plugins/Input/archive/decoder_archive.cpp
@@ -24,12 +24,8 @@
 #include "archivetagreader.h"
 #include "decoder_archive.h"
 
-DecoderArchive::DecoderArchive(const QString &url)
-{
-    m_url = url;
-    m_decoder = nullptr;
-    m_input = nullptr;
-}
+DecoderArchive::DecoderArchive(const QString &url) : m_url(url)
+{}
 
 DecoderArchive::~DecoderArchive()
 {
diff --git a/src/plugins/Input/archive/decoder_archive.h b/src/plugins/Input/archive/decoder_archive.h
index 3b9b06f94..d14a11180 100644
--- a/src/plugins/Input/archive/decoder_archive.h
+++ b/src/plugins/Input/archive/decoder_archive.h
@@ -30,7 +30,7 @@
 class DecoderArchive : public Decoder
 {
 public:
-    DecoderArchive(const QString &url);
+    explicit DecoderArchive(const QString &url);
 
     virtual ~DecoderArchive();
 
@@ -42,8 +42,8 @@ public:
 
 private:
     QString m_url;
-    Decoder *m_decoder;
-    QIODevice *m_input;
+    Decoder *m_decoder = nullptr;
+    QIODevice *m_input = nullptr;
 
 };