coding style fixes

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

32 files changed, 152 insertions, 221 deletions

diff --git a/src/qmmpui/addurldialog_p.h b/src/qmmpui/addurldialog_p.h
index d9d4a3d78..005915ed1 100644
--- a/src/qmmpui/addurldialog_p.h
+++ b/src/qmmpui/addurldialog_p.h
@@ -44,7 +44,7 @@ private slots:
     void onFinished(bool ok, const QString &message);
 
 private:
-    AddUrlDialog(QWidget *parent);
+    explicit AddUrlDialog(QWidget *parent);
     ~AddUrlDialog();
     void accept() override;
     void setModel(PlayListModel*);
diff --git a/src/qmmpui/detailsdialog.cpp b/src/qmmpui/detailsdialog.cpp
index fe0625b17..0cc798c94 100644
--- a/src/qmmpui/detailsdialog.cpp
+++ b/src/qmmpui/detailsdialog.cpp
@@ -35,7 +35,7 @@
 #include "detailsdialog.h"
 
 DetailsDialog::DetailsDialog(QList<PlayListTrack *> tracks, QWidget *parent)
-        : QDialog(parent)
+        : QDialog(parent), m_tracks(tracks)
 {
     m_ui = new Ui::DetailsDialog;
     m_ui->setupUi(this);
@@ -44,9 +44,6 @@ DetailsDialog::DetailsDialog(QList<PlayListTrack *> tracks, QWidget *parent)
     m_ui->directoryButton->setIcon(QApplication::style()->standardIcon(QStyle::SP_DirOpenIcon));
     m_ui->nextButton->setIcon(QApplication::style()->standardIcon(QStyle::SP_ArrowRight));
     m_ui->prevButton->setIcon(QApplication::style()->standardIcon(QStyle::SP_ArrowLeft));
-    m_metaDataModel = nullptr;
-    m_page = 0;
-    m_tracks = tracks;
     updatePage();
     on_tabWidget_currentChanged(0);
 }
diff --git a/src/qmmpui/detailsdialog.h b/src/qmmpui/detailsdialog.h
index 725c6b817..c4c5e04e9 100644
--- a/src/qmmpui/detailsdialog.h
+++ b/src/qmmpui/detailsdialog.h
@@ -48,7 +48,7 @@ public:
      * @param tracks a list of tracks which should be used.
      * @param parent Parent widget.
      */
-    DetailsDialog(QList<PlayListTrack *> tracks, QWidget *parent = nullptr);
+    explicit DetailsDialog(QList<PlayListTrack *> tracks, QWidget *parent = nullptr);
     /*!
      * Destructor.
      */
@@ -68,10 +68,10 @@ private:
     void printInfo();
     QString formatRow(const QString &key, const QString &value) const;
     QString formatRow(const MetaDataItem &item) const;
-    MetaDataModel *m_metaDataModel;
+    MetaDataModel *m_metaDataModel = nullptr;
     QList<PlayListTrack *> m_tracks;
     TrackInfo m_info;
-    int m_page;
+    int m_page = 0;
 };
 
 #endif
diff --git a/src/qmmpui/filedialog.cpp b/src/qmmpui/filedialog.cpp
index 5d2915b6e..ab67d6889 100644
--- a/src/qmmpui/filedialog.cpp
+++ b/src/qmmpui/filedialog.cpp
@@ -24,6 +24,7 @@
 #include <QPluginLoader>
 #include <QMetaObject>
 #include <QLibrary>
+#include <algorithm>
 #include <qmmp/qmmp.h>
 #include "qmmpuiplugincache_p.h"
 #include "filedialog.h"
@@ -85,12 +86,9 @@ bool FileDialog::isEnabled(const FileDialogFactory *factory)
 QString FileDialog::file(const FileDialogFactory *factory)
 {
     loadPlugins();
-    for(const QmmpUiPluginCache *item : qAsConst(*m_cache))
-    {
-        if(item->shortName() == factory->properties().shortName)
-            return item->file();
-    }
-    return QString();
+    auto it = std::find_if(m_cache->cbegin(), m_cache->cend(),
+                           [factory] (QmmpUiPluginCache *item){ return item->shortName() == factory->properties().shortName; } );
+    return it == m_cache->cend() ? QString() : (*it)->file();
 }
 
 QString FileDialog::getExistingDirectory(QWidget *parent,
@@ -167,14 +165,11 @@ FileDialog* FileDialog::instance()
 
     QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
     QString name = settings.value("FileDialog", "qt_dialog").toString();
-    for(QmmpUiPluginCache *item : qAsConst(*m_cache))
-    {
-        if(item->shortName() == name)
-        {
-            selected = item->fileDialogFactory();
-            break;
-        }
-    }
+
+    auto it = std::find_if(m_cache->cbegin(), m_cache->cend(),
+                           [name] (QmmpUiPluginCache *item){ return item->shortName() == name; } );
+    if(it != m_cache->cend())
+        selected = (*it)->fileDialogFactory();
 
     if(!selected)
         selected = m_cache->at(0)->fileDialogFactory();
diff --git a/src/qmmpui/general.cpp b/src/qmmpui/general.cpp
index 0ca8e2fb0..592bdf894 100644
--- a/src/qmmpui/general.cpp
+++ b/src/qmmpui/general.cpp
@@ -100,12 +100,9 @@ QList<GeneralFactory *> General::enabledFactories()
 QString General::file(const GeneralFactory *factory)
 {
     loadPlugins();
-    for(const QmmpUiPluginCache *item : qAsConst(*m_cache))
-    {
-        if(item->shortName() == factory->properties().shortName)
-            return item->file();
-    }
-    return QString();
+    auto it = std::find_if(m_cache->cbegin(), m_cache->cend(),
+                           [factory] (QmmpUiPluginCache *item){ return item->shortName() == factory->properties().shortName; } );
+    return it == m_cache->cend() ? QString() : (*it)->file();
 }
 
 void General::setEnabled(GeneralFactory* factory, bool enable)
diff --git a/src/qmmpui/groupedcontainer.cpp b/src/qmmpui/groupedcontainer.cpp
index 24193261c..68c8164c6 100644
--- a/src/qmmpui/groupedcontainer.cpp
+++ b/src/qmmpui/groupedcontainer.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2013-2015 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  *
@@ -26,9 +26,7 @@
 #endif
 
 GroupedContainer::GroupedContainer()
-{
-    m_update = true;
-}
+{}
 
 GroupedContainer::~GroupedContainer()
 {
@@ -70,11 +68,9 @@ void GroupedContainer::addTrack(PlayListTrack *track)
 
 void GroupedContainer::addTracks(const QList<PlayListTrack *> &tracks)
 {
-    bool found = false;
-
     for(int i = 0; i < tracks.count(); ++i)
     {
-        found = false;
+        bool found = false;
         for(int j = m_groups.count() - 1; j >= 0; --j)
         {
             if(m_groups.at(j)->formattedTitle() == tracks.at(i)->groupName())
diff --git a/src/qmmpui/groupedcontainer_p.h b/src/qmmpui/groupedcontainer_p.h
index 3a0e1d0b6..ca7178c67 100644
--- a/src/qmmpui/groupedcontainer_p.h
+++ b/src/qmmpui/groupedcontainer_p.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2013-2015 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  *
@@ -69,7 +69,7 @@ private:
     QList<PlayListGroup *> m_groups;
 
     mutable QList<PlayListItem *> m_items;
-    mutable bool m_update;
+    mutable bool m_update = true;
 
 };
 
diff --git a/src/qmmpui/jumptotrackdialog_p.h b/src/qmmpui/jumptotrackdialog_p.h
index 2ea9b677b..e28b22104 100644
--- a/src/qmmpui/jumptotrackdialog_p.h
+++ b/src/qmmpui/jumptotrackdialog_p.h
@@ -41,7 +41,7 @@ class JumpToTrackDialog : public QDialog, private Ui::JumpToTrackDialog
     Q_OBJECT
 
 public:
-    JumpToTrackDialog(PlayListModel *model, QWidget* parent = nullptr);
+    explicit JumpToTrackDialog(PlayListModel *model, QWidget* parent = nullptr);
     ~JumpToTrackDialog();
     void refresh();
 
diff --git a/src/qmmpui/metadataformatter.cpp b/src/qmmpui/metadataformatter.cpp
index ebc4cad38..0b58bd6a1 100644
--- a/src/qmmpui/metadataformatter.cpp
+++ b/src/qmmpui/metadataformatter.cpp
@@ -609,59 +609,59 @@ QList<MetaDataFormatter::Node> MetaDataFormatter::compile(const QString &expr)
     {
         if((*i) == QChar('%'))
         {
-            i++;
+            ++i;
             if(i == expr.constEnd())
                 continue;
 
             if(parseDir(&nodes, &i, expr.constEnd()))
             {
-                i++;
+                ++i;
                 continue;
             }
 
             if(parseField(&nodes, &i, expr.constEnd()))
             {
-                i++;
+                ++i;
                 continue;
             }
 
             if(parseProperty(&nodes, &i, expr.constEnd()))
             {
-                i++;
+                ++i;
                 continue;
             }
 
             if(parseIf(&nodes, &i, expr.constEnd()))
             {
-                i++;
+                ++i;
                 continue;
             }
             continue;
         }
         else if((*i) == QChar('&'))
         {
-            i++;
+            ++i;
             Node node;
             node.command = Node::AND_OPERATOR;
             nodes.append(node);
         }
         else if((*i) == QChar('|'))
         {
-            i++;
+            ++i;
             Node node;
             node.command = Node::OR_OPERATOR;
             nodes.append(node);
         }
         else if((*i) == QChar('\\'))
         {
-            i++;
+            ++i;
             parseEscape(&nodes, &i, expr.constEnd());
-            i++;
+            ++i;
         }
         else
         {
             parseText(&nodes, &i, expr.constEnd());
-            i++;
+            ++i;
         }
     }
 
diff --git a/src/qmmpui/playlistdownloader.cpp b/src/qmmpui/playlistdownloader.cpp
index cc71eebd3..57ac8f6e4 100644
--- a/src/qmmpui/playlistdownloader.cpp
+++ b/src/qmmpui/playlistdownloader.cpp
@@ -26,9 +26,9 @@
 #include "playlistparser.h"
 #include "playlistdownloader.h"
 
-PlayListDownloader::PlayListDownloader(QObject *parent) : QObject(parent)
+PlayListDownloader::PlayListDownloader(QObject *parent) : QObject(parent),
+    m_ua(QString("qmmp/%1").arg(Qmmp::strVersion()).toLatin1())
 {
-    m_ua = QString("qmmp/%1").arg(Qmmp::strVersion()).toLatin1();
     m_manager = new QNetworkAccessManager(this);
     connect(m_manager, SIGNAL(finished (QNetworkReply *)), SLOT(readResponse(QNetworkReply *)));
     //load global proxy settings
diff --git a/src/qmmpui/playlistgroup.cpp b/src/qmmpui/playlistgroup.cpp
index cd2080762..d9f6d44fa 100644
--- a/src/qmmpui/playlistgroup.cpp
+++ b/src/qmmpui/playlistgroup.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2013-2014 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  *
@@ -20,10 +20,8 @@
 
 #include "playlistgroup.h"
 
-PlayListGroup::PlayListGroup(const QString &name)
-{
-    m_name = name;
-}
+PlayListGroup::PlayListGroup(const QString &name) : m_name(name)
+{}
 
 PlayListGroup::~PlayListGroup()
 {
diff --git a/src/qmmpui/playlistgroup.h b/src/qmmpui/playlistgroup.h
index a6ce2921c..59a177d6a 100644
--- a/src/qmmpui/playlistgroup.h
+++ b/src/qmmpui/playlistgroup.h
@@ -37,7 +37,7 @@ public:
      * Constructor.
      * @param formattedTitle Title of the group.
      */
-    PlayListGroup(const QString &formattedTitle);
+    explicit PlayListGroup(const QString &formattedTitle);
     /*!
      * Object destructor.
      */
diff --git a/src/qmmpui/playlistmanager.cpp b/src/qmmpui/playlistmanager.cpp
index 48480a299..3b128745a 100644
--- a/src/qmmpui/playlistmanager.cpp
+++ b/src/qmmpui/playlistmanager.cpp
@@ -47,23 +47,27 @@ PlayListManager::PlayListManager(QObject *parent) : QObject(parent)
     m_timer->setSingleShot(true);
     connect(m_timer, SIGNAL(timeout()), SLOT(writePlayLists()));
     //key names
-    m_metaKeys.insert("title", Qmmp::TITLE);
-    m_metaKeys.insert("artist", Qmmp::ARTIST);
-    m_metaKeys.insert("albumartist", Qmmp::ALBUMARTIST);
-    m_metaKeys.insert("album", Qmmp::ALBUM);
-    m_metaKeys.insert("comment", Qmmp::COMMENT);
-    m_metaKeys.insert("genre", Qmmp::GENRE);
-    m_metaKeys.insert("composer", Qmmp::COMPOSER);
-    m_metaKeys.insert("year", Qmmp::YEAR);
-    m_metaKeys.insert("track", Qmmp::TRACK);
-    m_metaKeys.insert("disk", Qmmp::DISCNUMBER);
-    m_propKeys.insert("bitrate", Qmmp::BITRATE);
-    m_propKeys.insert("samplerate", Qmmp::SAMPLERATE);
-    m_propKeys.insert("channels", Qmmp::CHANNELS);
-    m_propKeys.insert("bits_per_sample", Qmmp::BITS_PER_SAMPLE);
-    m_propKeys.insert("format_name", Qmmp::FORMAT_NAME);
-    m_propKeys.insert("decoder", Qmmp::DECODER);
-    m_propKeys.insert("file_size", Qmmp::FILE_SIZE);
+    m_metaKeys = {
+        { "title", Qmmp::TITLE },
+        { "artist", Qmmp::ARTIST },
+        { "albumartist", Qmmp::ALBUMARTIST },
+        { "album", Qmmp::ALBUM },
+        { "comment", Qmmp::COMMENT },
+        { "genre", Qmmp::GENRE },
+        { "composer", Qmmp::COMPOSER },
+        { "year", Qmmp::YEAR },
+        { "track", Qmmp::TRACK },
+        { "disk", Qmmp::DISCNUMBER }
+    };
+    m_propKeys = {
+        { "bitrate", Qmmp::BITRATE },
+        { "samplerate", Qmmp::SAMPLERATE },
+        { "channels", Qmmp::CHANNELS },
+        { "bits_per_sample", Qmmp::BITS_PER_SAMPLE },
+        { "format_name", Qmmp::FORMAT_NAME },
+        { "decoder", Qmmp::DECODER },
+        { "file_size", Qmmp::FILE_SIZE }
+    };
     readPlayLists(); //read playlists
 }
 
@@ -266,7 +270,7 @@ void PlayListManager::readPlayLists()
     Qmmp::MetaData metaKey;
     Qmmp::TrackProperty propKey;
     QString line, key, value;
-    int s = 0, current = 0, pl = 0;
+    int current = 0, pl = 0;
     QList <PlayListTrack *> tracks;
     QFile file(Qmmp::configDir() + "/playlist.txt");
     file.open(QIODevice::ReadOnly);
@@ -278,7 +282,8 @@ void PlayListManager::readPlayLists()
     while (!buffer.atEnd())
     {
         line = QString::fromUtf8(buffer.readLine().constData()).trimmed();
-        if ((s = line.indexOf("=")) < 0)
+        int s = line.indexOf("=");
+        if (s < 0)
             continue;
 
         key = line.left(s);
diff --git a/src/qmmpui/playlistmanager.h b/src/qmmpui/playlistmanager.h
index 7298b78a9..5352eef43 100644
--- a/src/qmmpui/playlistmanager.h
+++ b/src/qmmpui/playlistmanager.h
@@ -41,7 +41,7 @@ public:
      * Constructor.
      * @param parent Parent object.
      */
-    PlayListManager(QObject *parent);
+    explicit PlayListManager(QObject *parent);
     /*!
      * Destructor.
      */
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index 3b5ae17ed..9c44acc3b 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -20,6 +20,7 @@
 #include <QWidget>
 #include <QtAlgorithms>
 #include <QTextStream>
+#include <algorithm>
 #include <time.h>
 #include <qmmp/metadatamanager.h>
 #include "metadatahelper_p.h"
@@ -39,14 +40,11 @@
 #define INVALID_INDEX -1
 
 PlayListModel::PlayListModel(const QString &name, QObject *parent)
-        : QObject(parent) , m_selection()
+    : QObject(parent) , m_name(name)
 {
     qsrand(time(nullptr));
     m_ui_settings = QmmpUiSettings::instance();
-    m_total_duration = 0;
-    m_current = 0;
-    m_stop_track = nullptr;
-    m_name = name;
+
     m_loader = new FileLoader(this);
     m_task = new PlayListTask(this);
     if(m_ui_settings->isGroupsEnabled())
@@ -728,11 +726,8 @@ void PlayListModel::moveItems(int from, int to)
     if(selected_indexes.isEmpty())
         return;
 
-    for(const int &i : qAsConst(selected_indexes)) //do no move groups
-    {
-        if(!isTrack(i))
-            return;
-    }
+    if(std::any_of(selected_indexes.cbegin(), selected_indexes.cend(), [this](int i){ return !isTrack(i); }))
+        return;
 
     if (bottommostInSelection(from) == INVALID_INDEX ||
             from == INVALID_INDEX ||
@@ -959,7 +954,7 @@ void PlayListModel::onTaskFinished()
             || m_task->type() == PlayListTask::REFRESH)
     {
         PlayListTrack *prev_current_track = m_current_track;
-        bool prev_count = m_container->count();
+        int prev_count = m_container->count();
 
         m_container->replaceTracks(m_task->takeResults(&m_current_track));
 
diff --git a/src/qmmpui/playlistmodel.h b/src/qmmpui/playlistmodel.h
index 11b8c34ca..d4e177714 100644
--- a/src/qmmpui/playlistmodel.h
+++ b/src/qmmpui/playlistmodel.h
@@ -48,14 +48,6 @@ class PlayListTask;
 struct SimpleSelection
 {
     /*!
-     * Constructs an empty selection model.
-     */
-    SimpleSelection()
-    {
-        m_bottom = -1;
-        m_top = 1;
-    }
-    /*!
      * Returns \p true if this selection is valid; otherwise returns returns \p false.
      */
     inline bool isValid()const
@@ -76,8 +68,8 @@ struct SimpleSelection
     {
         return m_bottom - m_top + 1;
     }
-    int m_bottom;               /*!< Bottom of the selection */
-    int m_top;                  /*!< Top of the selection   */
+    int m_bottom = -1;              /*!< Bottom of the selection */
+    int m_top = 1;                  /*!< Top of the selection   */
     QList<int> m_selected_indexes;  /*!< Selected items numbers */
 };
 /*! @brief The PlayListModel class provides a data model for the playlist.
@@ -109,7 +101,7 @@ public:
      * @param name Playlist name.
      * @param parent QObject parent
      */
-    PlayListModel(const QString &name, QObject *parent = nullptr);
+    explicit PlayListModel(const QString &name, QObject *parent = nullptr);
     /*!
      * Object destructor.
      */
@@ -594,13 +586,13 @@ private slots:
     void onTaskFinished();
 
 private:
-    PlayListTrack* m_current_track;
-    PlayListTrack* m_stop_track;
-    int m_current;
+    PlayListTrack* m_current_track = nullptr;
+    PlayListTrack* m_stop_track = nullptr;
+    int m_current = 0;
     SimpleSelection m_selection;  /*!< This flyweight object represents current selection. */
     QQueue <PlayListTrack*> m_queued_songs; /*!< Songs in play queue. */
     PlayState* m_play_state; /*!< Current playing state (Normal or Shuffle) */
-    qint64 m_total_duration;
+    qint64 m_total_duration = 0;
     FileLoader *m_loader;
     QString m_name;
     PlayListContainer *m_container;
diff --git a/src/qmmpui/playlistparser.cpp b/src/qmmpui/playlistparser.cpp
index 6cf3dbadd..2aac76bda 100644
--- a/src/qmmpui/playlistparser.cpp
+++ b/src/qmmpui/playlistparser.cpp
@@ -23,6 +23,7 @@
 #include <QList>
 #include <QDir>
 #include <QApplication>
+#include <algorithm>
 #include <qmmp/qmmp.h>
 #include "playlistformat.h"
 #include "playlistparser.h"
@@ -72,12 +73,9 @@ bool PlayListParser::isPlayList(const QString &url)
 PlayListFormat *PlayListParser::findByMime(const QString &mime)
 {
     loadFormats();
-    for(PlayListFormat *format : qAsConst(*m_formats))
-    {
-        if(format->properties().contentTypes.contains(mime))
-            return format;
-    }
-    return nullptr;
+    auto it = std::find_if(m_formats->cbegin(), m_formats->cend(),
+                           [mime](PlayListFormat *format) { return format->properties().contentTypes.contains(mime); } );
+    return it == m_formats->cend() ? nullptr : *it;
 }
 
 PlayListFormat *PlayListParser::findByPath(const QString &filePath)
@@ -161,12 +159,9 @@ QList<PlayListTrack *> PlayListParser::loadPlaylist(const QString &f_name)
 
 QList<PlayListTrack *> PlayListParser::loadPlaylist(const QString &fmt, const QByteArray &content)
 {
-    for(PlayListFormat *p : qAsConst(*m_formats))
-    {
-        if(p->properties().shortName == fmt)
-            return p->decode(content);
-    }
-    return QList<PlayListTrack *>();
+    auto it = std::find_if(m_formats->cbegin(), m_formats->cend(),
+                           [fmt](PlayListFormat *format) { return format->properties().shortName == fmt; } );
+    return it == m_formats->cend() ? QList<PlayListTrack *>() : (*it)->decode(content);
 }
 
 void PlayListParser::loadFormats()
diff --git a/src/qmmpui/playlisttask.cpp b/src/qmmpui/playlisttask.cpp
index 9933476a7..0ff0eecc2 100644
--- a/src/qmmpui/playlisttask.cpp
+++ b/src/qmmpui/playlisttask.cpp
@@ -112,24 +112,19 @@ static bool _filenameGreaterComparator(TrackField* s1, TrackField* s2)
 
 PlayListTask::PlayListTask(QObject *parent) : QThread(parent)
 {
-    m_reverted = true;
-    m_align_groups = false;
-    m_current_track = nullptr;
-    m_column = 0;
-    m_task = EMPTY;
-    m_sort_mode = PlayListModel::TITLE;
-
-    m_sort_keys.insert(PlayListModel::TITLE, Qmmp::TITLE);
-    m_sort_keys.insert(PlayListModel::DISCNUMBER, Qmmp::DISCNUMBER);
-    m_sort_keys.insert(PlayListModel::ALBUM, Qmmp::ALBUM);
-    m_sort_keys.insert(PlayListModel::ARTIST, Qmmp::ARTIST);
-    m_sort_keys.insert(PlayListModel::ALBUMARTIST, Qmmp::ALBUMARTIST);
-    m_sort_keys.insert(PlayListModel::FILENAME, Qmmp::UNKNOWN);
-    m_sort_keys.insert(PlayListModel::PATH_AND_FILENAME, Qmmp::UNKNOWN);
-    m_sort_keys.insert(PlayListModel::DATE, Qmmp::YEAR);
-    m_sort_keys.insert(PlayListModel::TRACK, Qmmp::TRACK);
-    m_sort_keys.insert(PlayListModel::FILE_CREATION_DATE, Qmmp::UNKNOWN);
-    m_sort_keys.insert(PlayListModel::FILE_MODIFICATION_DATE, Qmmp::UNKNOWN);
+    m_sort_keys = {
+        { PlayListModel::TITLE, Qmmp::TITLE },
+        { PlayListModel::DISCNUMBER, Qmmp::DISCNUMBER },
+        { PlayListModel::ALBUM, Qmmp::ALBUM },
+        { PlayListModel::ARTIST, Qmmp::ARTIST },
+        { PlayListModel::ALBUMARTIST, Qmmp::ALBUMARTIST },
+        { PlayListModel::FILENAME, Qmmp::UNKNOWN },
+        { PlayListModel::PATH_AND_FILENAME, Qmmp::UNKNOWN },
+        { PlayListModel::DATE, Qmmp::YEAR },
+        { PlayListModel::TRACK, Qmmp::TRACK },
+        { PlayListModel::FILE_CREATION_DATE, Qmmp::UNKNOWN },
+        { PlayListModel::FILE_MODIFICATION_DATE, Qmmp::UNKNOWN }
+    };
 }
 
 PlayListTask::~PlayListTask()
@@ -335,10 +330,9 @@ void PlayListTask::run()
         if(m_align_groups)
         {
             QList<GroupdField *> groups;
-            bool found = false;
             for(int i = 0; i < m_fields.count(); ++i)
             {
-                found = false;
+                bool found = false;
                 for(int j = groups.count() - 1; j >= 0; j--)
                 {
                     if(groups[j]->groupName == m_fields[i]->groupName)
@@ -453,11 +447,11 @@ void PlayListTask::run()
         QList<int> indexes;
         for(int i = 0; i < l.count(); ++i)
         {
-            QFileInfo f = l[i];
-            if(urls.contains(f.canonicalFilePath()))
+            QFileInfo info = l[i];
+            if(urls.contains(info.canonicalFilePath()))
                 indexes.append(i);
             else
-                urls.append(f.canonicalFilePath());
+                urls.append(info.canonicalFilePath());
         }
         //remove existing URLs
         for(int i = indexes.count() - 1; i >= 0; i--)
@@ -466,10 +460,10 @@ void PlayListTask::run()
         //create new playlist tracks
         QStringList ignoredFiles;
         TrackInfo::Parts parts = QmmpUiSettings::instance()->useMetaData() ? TrackInfo::AllParts : TrackInfo::Parts();
-        for(const QFileInfo &f : qAsConst(l))
+        for(const QFileInfo &info : qAsConst(l))
         {
             QStringList ignored;
-            for(TrackInfo *info : mm->createPlayList(f.canonicalFilePath(), parts, &ignored))
+            for(TrackInfo *info : mm->createPlayList(info.canonicalFilePath(), parts, &ignored))
             {
                 m_new_tracks << new PlayListTrack(info);
             }
@@ -522,12 +516,10 @@ QList<PlayListTrack *> PlayListTask::takeResults(PlayListTrack **current_track)
     }
     else if(m_task == REMOVE_INVALID || m_task == REMOVE_DUPLICATES || m_task == REFRESH)
     {
-        int index = 0;
-        PlayListTrack *t = nullptr;
         for (int i = m_indexes.count() - 1; i >= 0; i--)
         {
-            index = m_indexes.at(i);
-            t = m_tracks.takeAt(index);
+            int index = m_indexes.at(i);
+            PlayListTrack *t = m_tracks.takeAt(index);
             if(t == m_current_track)
             {
                 if(m_tracks.isEmpty())
diff --git a/src/qmmpui/playlisttask_p.h b/src/qmmpui/playlisttask_p.h
index 1b2aaca8d..1ce3f9f32 100644
--- a/src/qmmpui/playlisttask_p.h
+++ b/src/qmmpui/playlisttask_p.h
@@ -76,11 +76,11 @@ private:
     QList<int> m_indexes;
     QList <PlayListTrack *> m_new_tracks;
     PlayListTrack *m_current_track;
-    int m_sort_mode;
-    TaskType m_task;
-    bool m_reverted;
-    bool m_align_groups;
-    int m_column;
+    int m_sort_mode = PlayListModel::TITLE;
+    TaskType m_task = EMPTY;
+    bool m_reverted = true;
+    bool m_align_groups = false;
+    int m_column = 0;
     QHash<int, Qmmp::MetaData> m_sort_keys;
 
 };
diff --git a/src/qmmpui/playlisttrack.cpp b/src/qmmpui/playlisttrack.cpp
index d44a3cd7b..0f89314e6 100644
--- a/src/qmmpui/playlisttrack.cpp
+++ b/src/qmmpui/playlisttrack.cpp
@@ -26,21 +26,15 @@
 
 PlayListTrack::PlayListTrack() : TrackInfo(), PlayListItem()
 {
-    m_track_index = -1;
     m_settings = QmmpUiSettings::instance();
     m_helper = MetaDataHelper::instance();
-    m_refCount = 0;
-    m_sheduledForDeletion = false;
 }
 
 PlayListTrack::PlayListTrack(const PlayListTrack &other) : TrackInfo(other),
     PlayListItem()
 {
-    m_track_index = -1;
     m_settings = QmmpUiSettings::instance();
     m_helper = MetaDataHelper::instance();
-    m_refCount = 0;
-    m_sheduledForDeletion = false;
 
     m_formattedTitles = other.m_formattedTitles;
     m_group = other.m_group;
@@ -54,11 +48,8 @@ PlayListTrack::PlayListTrack(const PlayListTrack &other) : TrackInfo(other),
 PlayListTrack::PlayListTrack(TrackInfo *info) : TrackInfo(*info),
     PlayListItem()
 {
-    m_track_index = -1;
     m_settings = QmmpUiSettings::instance();
     m_helper = MetaDataHelper::instance();
-    m_refCount = 0;
-    m_sheduledForDeletion = false;
 }
 
 PlayListTrack::~PlayListTrack()
diff --git a/src/qmmpui/playlisttrack.h b/src/qmmpui/playlisttrack.h
index 1229d063a..2d878e176 100644
--- a/src/qmmpui/playlisttrack.h
+++ b/src/qmmpui/playlisttrack.h
@@ -43,7 +43,7 @@ public:
     /*!
      * Constructs a new PlayListTrack that is a copy of the given track \b other
      */
-    PlayListTrack(const PlayListTrack &other);
+    explicit PlayListTrack(const PlayListTrack &other);
     /*!
      * Constructs plalist item with given metadata.
      * @param info Media file information.
@@ -129,9 +129,9 @@ private:
     QStringList m_titleFormats;
     QString m_groupFormat;
     QmmpUiSettings *m_settings;
-    int m_refCount;
-    int m_track_index;
-    bool m_sheduledForDeletion;
+    int m_refCount = 0;
+    int m_track_index = -1;
+    bool m_sheduledForDeletion = false;
     MetaDataHelper *m_helper;
 };
 
diff --git a/src/qmmpui/playstate_p.h b/src/qmmpui/playstate_p.h
index 22e619875..221ea9cde 100644
--- a/src/qmmpui/playstate_p.h
+++ b/src/qmmpui/playstate_p.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2013 by Ilya Kotov                                 *
+ *   Copyright (C) 2007-2020 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -62,7 +62,7 @@ public:
     {
         ;
     }
-    PlayState(PlayListModel* model);
+    explicit PlayState(PlayListModel* model);
 
 protected:
     /// Data model
@@ -80,7 +80,7 @@ public:
     virtual bool next() override;
     virtual bool previous() override;
     virtual int nextIndex() override;
-    NormalPlayState(PlayListModel* model);
+    explicit NormalPlayState(PlayListModel* model);
 };
 
 /*! @internal
@@ -94,12 +94,12 @@ public:
     virtual bool previous() override;
     virtual int nextIndex() override;
     virtual void prepare() override;
-    ShufflePlayState(PlayListModel* model);
+    explicit ShufflePlayState(PlayListModel* model);
     virtual void resetState() override;
 private:
 
     /// Current shuffled index.
-    int m_shuffled_current;
+    int m_shuffled_current = 0;
 
     /// List of indexes used for shuffled playing.
     QList<int> m_shuffled_indexes;
diff --git a/src/qmmpui/qmmpuiplugincache.cpp b/src/qmmpui/qmmpuiplugincache.cpp
index c90b49386..011cbfff0 100644
--- a/src/qmmpui/qmmpuiplugincache.cpp
+++ b/src/qmmpui/qmmpuiplugincache.cpp
@@ -32,12 +32,6 @@
 
 QmmpUiPluginCache::QmmpUiPluginCache(const QString &file, QSettings *settings)
 {
-    m_error = false;
-    m_instance = nullptr;
-    m_generalFactory = nullptr;
-    m_uiFactory = nullptr;
-    m_fileDialogFactory = nullptr;
-    m_priority = 0;
     bool update = false;
     QFileInfo info(file);
     m_path = info.QFileInfo::canonicalFilePath();
@@ -102,13 +96,8 @@ QmmpUiPluginCache::QmmpUiPluginCache(const QString &file, QSettings *settings)
 }
 
 QmmpUiPluginCache::QmmpUiPluginCache(QObject *instance)
-{
-    m_error = false;
+{   
     m_instance = instance;
-    m_generalFactory = nullptr;
-    m_uiFactory = nullptr;
-    m_fileDialogFactory = nullptr;
-    m_priority = 0;
 
     if(GeneralFactory *factory = generalFactory())
     {
diff --git a/src/qmmpui/qmmpuiplugincache_p.h b/src/qmmpui/qmmpuiplugincache_p.h
index 4454b3045..db5c149d6 100644
--- a/src/qmmpui/qmmpuiplugincache_p.h
+++ b/src/qmmpui/qmmpuiplugincache_p.h
@@ -36,7 +36,7 @@ class QmmpUiPluginCache
 {
 public:
     QmmpUiPluginCache(const QString &file, QSettings *settings);
-    QmmpUiPluginCache(QObject *instance);
+    explicit QmmpUiPluginCache(QObject *instance);
 
     const QString shortName() const;
     const QString file() const;
@@ -54,12 +54,12 @@ private:
     void loadTranslation(const QString &translation);
     QString m_path;
     QString m_shortName;
-    bool m_error;
-    QObject *m_instance;
-    GeneralFactory *m_generalFactory;
-    UiFactory *m_uiFactory;
-    FileDialogFactory *m_fileDialogFactory;
-    int m_priority;
+    bool m_error = false;
+    QObject *m_instance = nullptr;
+    GeneralFactory *m_generalFactory = nullptr;
+    UiFactory *m_uiFactory = nullptr;
+    FileDialogFactory *m_fileDialogFactory = nullptr;
+    int m_priority = 0;
 };
 
 #endif // QMMPUIPLUGINCACHE_P_H
diff --git a/src/qmmpui/tageditor.cpp b/src/qmmpui/tageditor.cpp
index ff01c5fb3..96dc5d10a 100644
--- a/src/qmmpui/tageditor.cpp
+++ b/src/qmmpui/tageditor.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009-2016 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  *
@@ -26,7 +26,6 @@ TagEditor::TagEditor(TagModel *tagModel, QWidget *parent) : QWidget(parent), m_u
 {
     m_ui->setupUi(this);
     m_tagModel = tagModel;
-    m_discs = -1;
     //check available keys
     m_ui->titleLineEdit->setEnabled(m_tagModel->keys().contains(Qmmp::TITLE));
     m_ui->artistLineEdit->setEnabled(m_tagModel->keys().contains(Qmmp::ARTIST));
diff --git a/src/qmmpui/tageditor_p.h b/src/qmmpui/tageditor_p.h
index 1e332086c..dc439f0f7 100644
--- a/src/qmmpui/tageditor_p.h
+++ b/src/qmmpui/tageditor_p.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009-2016 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  *
@@ -36,7 +36,7 @@ class TagEditor : public QWidget
 {
 Q_OBJECT
 public:
-    TagEditor(TagModel *tagModel, QWidget *parent = nullptr);
+    explicit TagEditor(TagModel *tagModel, QWidget *parent = nullptr);
     ~TagEditor();
 
     void save();
@@ -45,7 +45,7 @@ private:
     void readTag();
     Ui::TagEditor *m_ui;
     TagModel *m_tagModel;
-    int m_discs; //Number of discs
+    int m_discs = -1; //Number of discs
 
 };
 
diff --git a/src/qmmpui/tagupdater.cpp b/src/qmmpui/tagupdater.cpp
index 1feb7cb21..e0c3ed4e6 100644
--- a/src/qmmpui/tagupdater.cpp
+++ b/src/qmmpui/tagupdater.cpp
@@ -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  *
@@ -20,9 +20,10 @@
 
 #include "tagupdater_p.h"
 
-TagUpdater::TagUpdater(QObject* o, QList<PlayListTrack *> tracks) : m_observable(o)
+TagUpdater::TagUpdater(QObject* o, QList<PlayListTrack *> tracks) :
+    m_observable(o),
+    m_tracks(tracks)
 {
-    m_tracks = tracks;
     for(PlayListTrack *t : qAsConst(m_tracks))
         t->beginUsage();
     connect(m_observable, SIGNAL(destroyed(QObject *)),SLOT(updateTags()));
diff --git a/src/qmmpui/uihelper.cpp b/src/qmmpui/uihelper.cpp
index d2ada8e9b..6e800b831 100644
--- a/src/qmmpui/uihelper.cpp
+++ b/src/qmmpui/uihelper.cpp
@@ -26,6 +26,7 @@
 #include <QApplication>
 #include <QMessageBox>
 #include <QFileInfo>
+#include <algorithm>
 #include <qmmp/soundcore.h>
 #include <qmmp/metadatamanager.h>
 #include "filedialog.h"
@@ -46,7 +47,6 @@ UiHelper::UiHelper(QObject *parent)
         : QObject(parent)
 {
     m_instance = this;
-    m_jumpDialog = nullptr;
     General::create(parent);
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     m_lastDir = settings.value("General/last_dir", QDir::homePath()).toString(); //last directory
@@ -60,12 +60,9 @@ UiHelper::~UiHelper()
 
 bool UiHelper::visibilityControl()
 {
-    for(const GeneralFactory *factory : General::enabledFactories())
-    {
-        if (factory->properties().visibilityControl)
-            return true;
-    }
-    return false;
+    const QList<GeneralFactory *> factories = General::enabledFactories();
+    return std::any_of(factories.cbegin(), factories.cend(),
+                       [](GeneralFactory *factory){ return factory->properties().visibilityControl; });
 }
 
 void UiHelper::addAction(QAction *action, MenuType type)
@@ -292,7 +289,7 @@ UiHelper* UiHelper::instance()
 
 void UiHelper::removeAction(QObject *action)
 {
-    removeAction((QAction *) action);
+    removeAction(qobject_cast<QAction *>(action));
 }
 
 void UiHelper::addSelectedFiles(const QStringList &files, bool play)
diff --git a/src/qmmpui/uiloader.cpp b/src/qmmpui/uiloader.cpp
index 8a3ef0c7a..4d64c23bf 100644
--- a/src/qmmpui/uiloader.cpp
+++ b/src/qmmpui/uiloader.cpp
@@ -20,6 +20,7 @@
 
 #include <QDir>
 #include <qmmp/qmmp.h>
+#include <algorithm>
 #include "qmmpuiplugincache_p.h"
 #include "uiloader.h"
 
@@ -74,12 +75,9 @@ QStringList UiLoader::names()
 QString UiLoader::file(UiFactory *factory)
 {
     loadPlugins();
-    for(const QmmpUiPluginCache *item : qAsConst(*m_cache))
-    {
-        if(item->shortName() == factory->properties().shortName)
-            return item->file();
-    }
-    return QString();
+    auto it = std::find_if(m_cache->cbegin(), m_cache->cend(),
+                           [factory](QmmpUiPluginCache *item) { return item->shortName() == factory->properties().shortName; } );
+    return it == m_cache->cend() ? QString() : (*it)->file();
 }
 
 void UiLoader::select(UiFactory* factory)
@@ -90,14 +88,10 @@ void UiLoader::select(UiFactory* factory)
 void UiLoader::select(const QString &name)
 {
     loadPlugins();
-    for(const QmmpUiPluginCache *item : qAsConst(*m_cache))
+    if(std::any_of(m_cache->cbegin(), m_cache->cend(), [name](QmmpUiPluginCache *item) { return item->shortName() == name; } ))
     {
-        if(item->shortName() == name)
-        {
-            QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
-            settings.setValue ("Ui/current_plugin", name);
-            break;
-        }
+        QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
+        settings.setValue ("Ui/current_plugin", name);
     }
 }
 
diff --git a/src/qmmpui/winfileassoc.cpp b/src/qmmpui/winfileassoc.cpp
index 99e82e7e8..1d99ea933 100644
--- a/src/qmmpui/winfileassoc.cpp
+++ b/src/qmmpui/winfileassoc.cpp
@@ -55,10 +55,8 @@
 #define SHCNE_ASSOCHANGED __MSABI_LONG(0x08000000)
 #endif
 
-WinFileAssoc::WinFileAssoc(const QString AppName)
-{
-    m_AppName = AppName;
-}
+WinFileAssoc::WinFileAssoc(const QString AppName) : m_AppName(AppName)
+{}
 
 // Associates all extensions in the fileExtensions list with current app.
 // Returns number of extensions processed successfully.
diff --git a/src/qmmpui/winfileassocpage.cpp b/src/qmmpui/winfileassocpage.cpp
index 9b1fef989..4f0484b0e 100644
--- a/src/qmmpui/winfileassocpage.cpp
+++ b/src/qmmpui/winfileassocpage.cpp
@@ -2,7 +2,7 @@
  * Based on smplayer - GUI front-end for mplayer                           *
  *                                                                         *
  * Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>    *
- * Copyright (C) 2014 Ilya Kotov forkotov02@ya.ru                          *
+ * Copyright (C) 2014-2020 Ilya Kotov forkotov02@ya.ru                     *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -98,7 +98,7 @@ void WinFileAssocPage::loadAssociations()
     }
 }
 
-int WinFileAssocPage::ProcessAssociations(QStringList& current)
+int WinFileAssocPage::ProcessAssociations(const QStringList &current)
 {
     WinFileAssoc RegAssoc;
     return RegAssoc.CreateFileAssociations(current);
diff --git a/src/qmmpui/winfileassocpage_p.h b/src/qmmpui/winfileassocpage_p.h
index b805cf1ab..3175f13ed 100644
--- a/src/qmmpui/winfileassocpage_p.h
+++ b/src/qmmpui/winfileassocpage_p.h
@@ -48,7 +48,7 @@ private slots:
 private:
     void loadAssociations();
     void saveAssociations();
-    int ProcessAssociations(QStringList& current);
+    int ProcessAssociations(const QStringList &current);
     void createHelp();
     QStringList m_extensions;
     QStringList m_regExtensions;