coding style fixes

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

3 files changed, 22 insertions, 34 deletions

diff --git a/src/plugins/Transports/http/httpinputsource.h b/src/plugins/Transports/http/httpinputsource.h
index fad94992d..515e7306b 100644
--- a/src/plugins/Transports/http/httpinputsource.h
+++ b/src/plugins/Transports/http/httpinputsource.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009-2012 by Ilya Kotov                                 *
+ *   Copyright (C) 2009-2020 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -32,7 +32,7 @@ class HTTPInputSource : public InputSource
 {
 Q_OBJECT
 public:
-    HTTPInputSource(const QString &path, QObject *parent = nullptr);
+    explicit HTTPInputSource(const QString &path, QObject *parent = nullptr);
 
     QIODevice *ioDevice() override;
     bool initialize() override;
diff --git a/src/plugins/Transports/http/httpstreamreader.cpp b/src/plugins/Transports/http/httpstreamreader.cpp
index 1faf8b6ee..29fccc4a6 100644
--- a/src/plugins/Transports/http/httpstreamreader.cpp
+++ b/src/plugins/Transports/http/httpstreamreader.cpp
@@ -37,7 +37,7 @@
 static size_t curl_write_data(void *data, size_t size, size_t nmemb,
                               void *pointer)
 {
-    HttpStreamReader *dl = (HttpStreamReader *)pointer;
+    HttpStreamReader *dl = static_cast<HttpStreamReader *>(pointer);
     dl->mutex()->lock();
 
     if(dl->stream()->buf_fill > MAX_BUFFER_SIZE)
@@ -77,7 +77,7 @@ static size_t curl_write_data(void *data, size_t size, size_t nmemb,
 static size_t curl_header(void *data, size_t size, size_t nmemb,
                           void *pointer)
 {
-    HttpStreamReader *dl = (HttpStreamReader *)pointer;
+    HttpStreamReader *dl = static_cast<HttpStreamReader *>(pointer);
     dl->mutex()->lock ();
     size_t data_size = size * nmemb;
     if (data_size < 3)
@@ -126,7 +126,7 @@ int curl_progress(void *pointer, double dltotal, double dlnow, double ultotal, d
     Q_UNUSED(dlnow);
     Q_UNUSED(ultotal);
     Q_UNUSED(ulnow);
-    HttpStreamReader *dl = (HttpStreamReader *)pointer;
+    HttpStreamReader *dl = static_cast<HttpStreamReader *>(pointer);
     dl->mutex()->lock ();
     bool aborted = dl->stream()->aborted;
     dl->mutex()->unlock();
@@ -135,21 +135,11 @@ int curl_progress(void *pointer, double dltotal, double dlnow, double ultotal, d
     return 0;
 }
 
-HttpStreamReader::HttpStreamReader(const QString &url, HTTPInputSource *parent) : QIODevice(parent)
+HttpStreamReader::HttpStreamReader(const QString &url, HTTPInputSource *parent) : QIODevice(parent),
+    m_url(url),
+    m_parent(parent)
 {
-    m_parent = parent;
-    m_url = url;
     curl_global_init(CURL_GLOBAL_ALL);
-    m_stream.buf_fill = 0;
-    m_stream.buf_size = 0;
-    m_stream.buf = nullptr;
-    m_stream.icy_meta_data = false;
-    m_stream.aborted = true;
-    m_stream.icy_metaint = 0;
-    m_handle = nullptr;
-    m_metacount = 0;
-    m_meta_sent = false;
-    m_ready = false;
     m_thread = new DownloadThread(this);
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("HTTP");
@@ -162,8 +152,6 @@ HttpStreamReader::HttpStreamReader(const QString &url, HTTPInputSource *parent)
     if (!m_codec)
         m_codec = QTextCodec::codecForName ("UTF-8");
 #ifdef WITH_ENCA
-    m_analyser = nullptr;
-    m_prevCodec = nullptr;
     if(settings.value("use_enca", false).toBool())
         m_analyser = enca_analyser_alloc(settings.value("enca_lang").toByteArray ().constData());
     if(m_analyser)
diff --git a/src/plugins/Transports/http/httpstreamreader.h b/src/plugins/Transports/http/httpstreamreader.h
index e63220525..e27195936 100644
--- a/src/plugins/Transports/http/httpstreamreader.h
+++ b/src/plugins/Transports/http/httpstreamreader.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2016 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2020 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -42,14 +42,14 @@ class HTTPInputSource;
  */
 struct HttpStreamData
 {
-    char *buf;
-    size_t buf_fill;
-    size_t buf_size;
+    char *buf = nullptr;
+    size_t buf_fill = 0;
+    size_t buf_size = 0;
     QString content_type;
-    bool aborted;
+    bool aborted = true;
     QHash <QString, QByteArray> header;
-    bool icy_meta_data;
-    size_t icy_metaint;
+    bool icy_meta_data = false;
+    size_t icy_metaint = 0;
 };
 
 /*! @internal
@@ -97,22 +97,22 @@ private:
     void readICYMetaData();
     void parseICYMetaData(char *data, qint64 size);
     void sendStreamInfo(QTextCodec *codec);
-    CURL *m_handle;
+    CURL *m_handle = nullptr;
     QMutex m_mutex;
     HttpStreamData m_stream;
     QString m_url;
     QString m_userAgent;
-    size_t m_metacount;
+    size_t m_metacount = 0;
     QString m_title;
-    bool m_ready;
-    bool m_meta_sent;
+    bool m_ready = false;
+    bool m_meta_sent = false;
     size_t m_prebuffer_size;
     QTextCodec *m_codec;
     DownloadThread *m_thread;
     HTTPInputSource *m_parent;
 #ifdef WITH_ENCA
-    EncaAnalyser m_analyser;
-    QTextCodec *m_prevCodec;
+    EncaAnalyser m_analyser = nullptr;
+    QTextCodec *m_prevCodec = nullptr;
 #endif
 };
 
@@ -120,7 +120,7 @@ class DownloadThread : public QThread
 {
     Q_OBJECT
 public:
-    DownloadThread(HttpStreamReader *parent);
+    explicit DownloadThread(HttpStreamReader *parent);
     virtual ~DownloadThread ();
 
 private: