coding style fixes

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

43 files changed, 236 insertions, 322 deletions

diff --git a/src/plugins/Ui/qsui/equalizer.cpp b/src/plugins/Ui/qsui/equalizer.cpp
index 6777dc391..9e50cbc2c 100644
--- a/src/plugins/Ui/qsui/equalizer.cpp
+++ b/src/plugins/Ui/qsui/equalizer.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2011-2016 by Ilya Kotov                                 *
+ *   Copyright (C) 2011-2020 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -94,11 +94,11 @@ Equalizer::Equalizer(QWidget *parent) : QDialog(parent)
         slider->setRange(-20, 20);
         slider->setTickPosition(QSlider::TicksLeft);
         slider->setTickInterval(10);
-        QLabel *label = new QLabel(this);
-        label->setFrameShape(QFrame::Box);
-        label->setText(names.at(i));
+        QLabel *eqLabel = new QLabel(this);
+        eqLabel->setFrameShape(QFrame::Box);
+        eqLabel->setText(names.at(i));
         slidersLayout->addWidget(slider, 1, i, Qt::AlignHCenter);
-        slidersLayout->addWidget(label, 2, i, Qt::AlignHCenter);
+        slidersLayout->addWidget(eqLabel, 2, i, Qt::AlignHCenter);
 
         QLabel *label2 = new QLabel(this);
         label2->setText(tr("%1dB").arg(0));
diff --git a/src/plugins/Ui/qsui/filesystembrowser.cpp b/src/plugins/Ui/qsui/filesystembrowser.cpp
index 6215f9c92..1692c6568 100644
--- a/src/plugins/Ui/qsui/filesystembrowser.cpp
+++ b/src/plugins/Ui/qsui/filesystembrowser.cpp
@@ -37,7 +37,7 @@
 class FileSystemFilterProxyModel : public QSortFilterProxyModel
 {
 public:
-    FileSystemFilterProxyModel(QObject *parent) : QSortFilterProxyModel(parent) {}
+    explicit FileSystemFilterProxyModel(QObject *parent) : QSortFilterProxyModel(parent) {}
 
 protected:
     virtual bool filterAcceptsRow(
diff --git a/src/plugins/Ui/qsui/listwidget.cpp b/src/plugins/Ui/qsui/listwidget.cpp
index 823e31c1a..67771196d 100644
--- a/src/plugins/Ui/qsui/listwidget.cpp
+++ b/src/plugins/Ui/qsui/listwidget.cpp
@@ -41,33 +41,19 @@
 
 #define INVALID_INDEX -1
 
-ListWidget::ListWidget(PlayListModel *model, QWidget *parent)
-        : QWidget(parent)
+ListWidget::ListWidget(PlayListModel *model, QWidget *parent) : QWidget(parent),
+    m_pressed_index(INVALID_INDEX),
+    m_drop_index(INVALID_INDEX),
+    m_anchor_index(INVALID_INDEX),
+    m_model(model)
 {
     setFocusPolicy(Qt::StrongFocus);
-    m_popupWidget = nullptr;
-    m_ui_settings = QmmpUiSettings::instance();
-    m_menu = nullptr;
-    m_filterMode = false;
-    m_model = model;
     m_timer = new QTimer(this);
     m_timer->setInterval(50);
-
     m_header = new PlayListHeader(this);
     m_scrollBar = new QScrollBar(Qt::Vertical, this);
     m_hslider = new QScrollBar(Qt::Horizontal, this);
     m_hslider->setPageStep(50);
-    m_update = false;
-    m_drop_index = INVALID_INDEX;
-    m_scroll_direction = NONE;
-    m_prev_y = 0;
-    m_anchor_index = INVALID_INDEX;
-    m_pressed_index = INVALID_INDEX;
-    m_first = 0;
-    m_row_count = 0;
-    m_select_on_release = false;
-    m_count = 0;
-    m_firstItem = nullptr;
 
     setAcceptDrops(true);
     setMouseTracking(true);
diff --git a/src/plugins/Ui/qsui/listwidget.h b/src/plugins/Ui/qsui/listwidget.h
index 795560a9a..46c3f04d8 100644
--- a/src/plugins/Ui/qsui/listwidget.h
+++ b/src/plugins/Ui/qsui/listwidget.h
@@ -47,7 +47,7 @@ class ListWidget : public QWidget
 {
     Q_OBJECT
 public:
-    ListWidget(PlayListModel *model, QWidget *parent = nullptr);
+    explicit ListWidget(PlayListModel *model, QWidget *parent = nullptr);
 
     ~ListWidget();
 
@@ -120,24 +120,22 @@ private:
     void restoreFirstVisible();
     void updateScrollBars();
 
-    bool m_update;
-    int m_pressed_index;
-    QMenu *m_menu;
+    bool m_update = false;
+    int m_pressed_index, m_drop_index, m_anchor_index;
+    QMenu *m_menu = nullptr;
     PlayListModel *m_model;
-    int m_row_count, m_first, m_count; //visible rows, first visible index, total item count
-    PlayListItem *m_firstItem; //first visible item
-    int m_anchor_index;
+    int m_row_count = 0, m_first = 0, m_count = 0; //visible rows, first visible index, total item count
+    PlayListItem *m_firstItem = nullptr; //first visible item
     /*!
      * Scroll direction that is performing in current moment.
      */
-    ScrollDirection m_scroll_direction;
-    int m_prev_y;
-    bool m_select_on_release;
+    ScrollDirection m_scroll_direction = NONE;
+    int m_prev_y = 0;
+    bool m_select_on_release = false;
     bool m_show_protocol;
-    int m_drop_index;
     QList<ListWidgetRow *> m_rows;
     QmmpUiSettings *m_ui_settings;
-    PlayListPopup::PopupWidget *m_popupWidget;
+    PlayListPopup::PopupWidget *m_popupWidget = nullptr;
     QTimer *m_timer;
     QScrollBar *m_scrollBar;
     ListWidgetDrawer m_drawer;
@@ -145,7 +143,7 @@ private:
     QScrollBar *m_hslider;
 
     QString m_filterString;
-    bool m_filterMode;
+    bool m_filterMode = false;
     QList<PlayListItem *> m_filteredItems;
 
 };
diff --git a/src/plugins/Ui/qsui/listwidgetdrawer.cpp b/src/plugins/Ui/qsui/listwidgetdrawer.cpp
index 706887f07..cae080b8a 100644
--- a/src/plugins/Ui/qsui/listwidgetdrawer.cpp
+++ b/src/plugins/Ui/qsui/listwidgetdrawer.cpp
@@ -229,7 +229,6 @@ void ListWidgetDrawer::prepareRow(ListWidgetRow *row)
         {
             row->titles[i] = metrics->elidedText (row->titles[i], Qt::ElideRight, size - 2 * m_padding);
         }
-        visible_width -= size;
     }
 }
 
@@ -303,7 +302,7 @@ void ListWidgetDrawer::drawSeparator(QPainter *painter, ListWidgetRow *row, bool
     int sy =  row->rect.y() + m_metrics->overlinePos() - 1;
 
     painter->setFont(m_font);
-    painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_group_text);
+    painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : m_group_text);
 
     if(rtl)
         sx = row->rect.right() - sx - m_metrics->horizontalAdvance(row->titles[0]);
@@ -321,7 +320,7 @@ void ListWidgetDrawer::drawSeparator(QPainter *painter, ListWidgetRow *row, bool
                 row->rect.right() - row->numberColumnWidth - m_padding, sy);
         if(m_show_splitters && row->numberColumnWidth)
         {
-            painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_splitter);
+            painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : m_splitter);
             painter->drawLine(row->rect.right() - row->numberColumnWidth, row->rect.top(),
                               row->rect.right() - row->numberColumnWidth, row->rect.bottom() + 1);
         }
@@ -333,7 +332,7 @@ void ListWidgetDrawer::drawSeparator(QPainter *painter, ListWidgetRow *row, bool
                 row->rect.width(), sy);
         if(m_show_splitters && row->numberColumnWidth)
         {
-            painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_splitter);
+            painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : m_splitter);
             painter->drawLine(row->rect.left() + row->numberColumnWidth, row->rect.top(),
                               row->rect.left() + row->numberColumnWidth, row->rect.bottom() + 1);
         }
@@ -362,7 +361,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
     else
         metrics = m_metrics;
 
-    painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : textColor);
+    painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : textColor);
 
     if(rtl)
     {
@@ -376,9 +375,9 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
                 painter->drawText(sx + m_padding, sy, number);
                 if(m_show_splitters)
                 {
-                    painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_splitter);
+                    painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : m_splitter);
                     painter->drawLine(sx, row->rect.top(), sx, row->rect.bottom() + 1);
-                    painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : textColor);
+                    painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : textColor);
                 }
             }
 
@@ -403,7 +402,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
         {
             for(int i = 0; i < row->sizes.count(); i++)
             {
-                painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : textColor);
+                painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : textColor);
                 draw_extra = (i == row->trackStateColumn && !row->extraString.isEmpty());
 
                 if(row->alignment[i] == ListWidgetRow::ALIGN_LEFT)
@@ -437,7 +436,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
 
                 if(m_show_splitters && (!row->autoResize || i < row->sizes.count() - 1)) //do not draw last vertical line
                 {
-                    painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_splitter);
+                    painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : m_splitter);
                     painter->drawLine(sx - 1, row->rect.top(), sx - 1, row->rect.bottom() + 1);
                 }
             }
@@ -455,9 +454,9 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
                 painter->drawText(sx - m_padding - metrics->horizontalAdvance(number), sy, number);
                 if(m_show_splitters)
                 {
-                    painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_splitter);
+                    painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : m_splitter);
                     painter->drawLine(sx, row->rect.top(), sx, row->rect.bottom() + 1);
-                    painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : textColor);
+                    painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : textColor);
                 }
             }
 
@@ -482,7 +481,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
         {
             for(int i = 0; i < row->sizes.count(); i++)
             {
-                painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : textColor);
+                painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : textColor);
                 draw_extra = (i == row->trackStateColumn && !row->extraString.isEmpty());
 
                 if(row->alignment[i] == ListWidgetRow::ALIGN_LEFT)
@@ -516,7 +515,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
 
                 if(m_show_splitters && (!row->autoResize || i < row->sizes.count() - 1)) //do not draw last vertical line
                 {
-                    painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_splitter);
+                    painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_highlighted : m_splitter);
                     painter->drawLine(sx - 1, row->rect.top(), sx - 1, row->rect.bottom() + 1);
                 }
             }
diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
index a1347faa0..710d7fa42 100644
--- a/src/plugins/Ui/qsui/mainwindow.cpp
+++ b/src/plugins/Ui/qsui/mainwindow.cpp
@@ -675,7 +675,7 @@ void MainWindow::readSettings()
                 toolBars.erase(it);
                 break;
             }
-            it++;
+            ++it;
         }
 
         if(!found)
diff --git a/src/plugins/Ui/qsui/playlistbrowser.cpp b/src/plugins/Ui/qsui/playlistbrowser.cpp
index 9d831e400..15d54b4cf 100644
--- a/src/plugins/Ui/qsui/playlistbrowser.cpp
+++ b/src/plugins/Ui/qsui/playlistbrowser.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009-2013 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  *
@@ -31,7 +31,8 @@
 #include "actionmanager.h"
 #include "playlistbrowser.h"
 
-PlayListBrowser::PlayListBrowser(PlayListManager *manager, QWidget *parent) : QWidget(parent)
+PlayListBrowser::PlayListBrowser(PlayListManager *manager, QWidget *parent) : QWidget(parent),
+    m_pl_manager(manager)
 {
     m_lineEdit = new QLineEdit(this);
     m_lineEdit->installEventFilter(this);
@@ -47,7 +48,6 @@ PlayListBrowser::PlayListBrowser(PlayListManager *manager, QWidget *parent) : QW
     layout->addWidget(m_listView);
     setLayout(layout);
 
-    m_pl_manager = manager;
     connect(m_pl_manager, SIGNAL(playListsChanged()), SLOT(updateList()));
     //actions
     m_listView->setContextMenuPolicy(Qt::ActionsContextMenu);
diff --git a/src/plugins/Ui/qsui/playlistbrowser.h b/src/plugins/Ui/qsui/playlistbrowser.h
index 98d613a13..69aae90bd 100644
--- a/src/plugins/Ui/qsui/playlistbrowser.h
+++ b/src/plugins/Ui/qsui/playlistbrowser.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  *
@@ -38,7 +38,7 @@ class PlayListBrowser : public QWidget
 {
 Q_OBJECT
 public:
-    PlayListBrowser(PlayListManager *manager, QWidget *parent = nullptr);
+    explicit PlayListBrowser(PlayListManager *manager, QWidget *parent = nullptr);
     ~PlayListBrowser();
 
 private slots:
@@ -52,8 +52,8 @@ private:
     QLineEdit *m_lineEdit;
     QListView *m_listView;
     PlayListManager *m_pl_manager;
-    QStandardItemModel* m_listModel;
-    QSortFilterProxyModel* m_proxyModel;
+    QStandardItemModel *m_listModel;
+    QSortFilterProxyModel *m_proxyModel;
 };
 
 #endif // PLAYLISTBROWSER_H
diff --git a/src/plugins/Ui/qsui/playlistheader.cpp b/src/plugins/Ui/qsui/playlistheader.cpp
index 2c4bdb9a9..ac12bc69c 100644
--- a/src/plugins/Ui/qsui/playlistheader.cpp
+++ b/src/plugins/Ui/qsui/playlistheader.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2015-2016 by Ilya Kotov                                 *
+ *   Copyright (C) 2015-2020 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -32,6 +32,7 @@
 #include <QIcon>
 #include <QStyleOptionHeader>
 #include <QActionGroup>
+#include <algorithm>
 #include <qmmp/qmmp.h>
 #include <qmmpui/playlistmanager.h>
 #include <qmmpui/playlistheadermodel.h>
@@ -141,7 +142,7 @@ void PlayListHeader::readSettings()
         {
             m_model->setData(i, SIZE, INITAL_SIZE);
             m_model->setData(i, ALIGNMENT, (layoutDirection() == Qt::RightToLeft) ?
-                                 ListWidgetRow::ALIGN_LEFT : ListWidgetRow::ALIGN_LEFT);
+                                 ListWidgetRow::ALIGN_RIGHT : ListWidgetRow::ALIGN_LEFT);
 
             if(i < sizes.count())
                 m_model->setData(i, SIZE, sizes.at(i).toInt());
@@ -274,11 +275,8 @@ int PlayListHeader::maxScrollValue() const
     if(m_model->count() == 1)
         return 0;
 
-    int row_width = 0;
-    for(int size : sizes())
-    {
-        row_width += size;
-    }
+    const QList<int> sizeList = sizes();
+    int row_width = std::accumulate(sizeList.cbegin(), sizeList.cend(), 0);
     return qMax(0, row_width - width() + m_scrollbar_width + 10);
 }
 
diff --git a/src/plugins/Ui/qsui/qsuivisualization.h b/src/plugins/Ui/qsui/qsuivisualization.h
index 2de6d01dd..f905ec966 100644
--- a/src/plugins/Ui/qsui/qsuivisualization.h
+++ b/src/plugins/Ui/qsui/qsuivisualization.h
@@ -36,7 +36,7 @@ class QSUIVisualization : public Visual
 {
     Q_OBJECT
 public:
-    QSUIVisualization(QWidget *parent = nullptr);
+    explicit QSUIVisualization(QWidget *parent = nullptr);
     virtual ~QSUIVisualization();
 
     void setCover(const QPixmap &pixmap);
@@ -140,8 +140,8 @@ private:
     QColor m_peakColor;
     QSize m_cell_size;
     QBrush m_brush;
-    double m_peaks_falloff;
-    double m_analyzer_falloff;
+    double m_peaks_falloff = 0;
+    double m_analyzer_falloff = 0;
     bool m_show_peaks = false;
     double *m_intern_vis_data = nullptr;
     double *m_peaks = nullptr;
diff --git a/src/plugins/Ui/qsui/qsuiwaveformseekbar.cpp b/src/plugins/Ui/qsui/qsuiwaveformseekbar.cpp
index 540b04be9..d32bb211e 100644
--- a/src/plugins/Ui/qsui/qsuiwaveformseekbar.cpp
+++ b/src/plugins/Ui/qsui/qsuiwaveformseekbar.cpp
@@ -463,7 +463,7 @@ void QSUiWaveformScanner::run()
                 if(counter >= samplesPerValue)
                 {
                     m_mutex.lock();
-                    for(int ch = 0; ch < channels; ++ch)
+                    for(ch = 0; ch < channels; ++ch)
                     {
                         m_data << max[ch] * 1000;
                         m_data << min[ch] * 1000;
diff --git a/src/plugins/Ui/qsui/shortcutdialog.h b/src/plugins/Ui/qsui/shortcutdialog.h
index f270b93d6..b390be0c2 100644
--- a/src/plugins/Ui/qsui/shortcutdialog.h
+++ b/src/plugins/Ui/qsui/shortcutdialog.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2010-2013 by Ilya Kotov                                 *
+ *   Copyright (C) 2010-2020 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -32,7 +32,7 @@ class ShortcutDialog : public QDialog
 {
     Q_OBJECT
 public:
-    ShortcutDialog(const QString &key, QWidget *parent = nullptr);
+    explicit ShortcutDialog(const QString &key, QWidget *parent = nullptr);
 
     ~ShortcutDialog();
 
diff --git a/src/plugins/Ui/qsui/visualmenu.cpp b/src/plugins/Ui/qsui/visualmenu.cpp
index b8f56dc39..4201142e2 100644
--- a/src/plugins/Ui/qsui/visualmenu.cpp
+++ b/src/plugins/Ui/qsui/visualmenu.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2012 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  *
@@ -19,7 +19,6 @@
  ***************************************************************************/
 
 #include <QAction>
-
 #include <qmmp/visual.h>
 #include <qmmp/visualfactory.h>
 #include "visualmenu.h"
@@ -45,12 +44,11 @@ void VisualMenu::updateActions()
     }
 }
 
-VisualAction::VisualAction(VisualFactory *factory, QWidget *parent) :
-        QAction(factory->properties().name, parent)
+VisualAction::VisualAction(VisualFactory *factory, QWidget *parent) : QAction(factory->properties().name, parent),
+    m_factory(factory)
 {
     setCheckable (true);
     setChecked (Visual::isEnabled(factory));
-    m_factory = factory;
     connect(this, SIGNAL(triggered(bool)), SLOT(select(bool)));
 }
 
diff --git a/src/plugins/Ui/qsui/visualmenu.h b/src/plugins/Ui/qsui/visualmenu.h
index 2994e40dd..24d8e5e9a 100644
--- a/src/plugins/Ui/qsui/visualmenu.h
+++ b/src/plugins/Ui/qsui/visualmenu.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2012 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  *
@@ -32,7 +32,7 @@ class VisualMenu : public QMenu
 {
     Q_OBJECT
 public:
-    VisualMenu(QWidget *parent = nullptr);
+    explicit VisualMenu(QWidget *parent = nullptr);
 
     ~VisualMenu();
 
@@ -44,7 +44,7 @@ class VisualAction : public QAction
 {
     Q_OBJECT
 public:
-    VisualAction(VisualFactory *factory, QWidget *parent = nullptr);
+    explicit VisualAction(VisualFactory *factory, QWidget *parent = nullptr);
 
 private slots:
     void select(bool);
diff --git a/src/plugins/Ui/skinned/button.cpp b/src/plugins/Ui/skinned/button.cpp
index e8474ff0f..c565fa7ed 100644
--- a/src/plugins/Ui/skinned/button.cpp
+++ b/src/plugins/Ui/skinned/button.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2020 by Ilya Kotov                                 *
+ *   Copyright(C) 2007-2020 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   Based on Promoe, an XMMS2 Client                                      *
@@ -25,57 +25,56 @@
 #include "skin.h"
 #include <QMouseEvent>
 
-Button::Button (QWidget *parent, uint normal, uint pressed, uint cursor)
-        : PixmapWidget (parent)
+Button::Button(QWidget *parent, uint normal, uint pressed, uint cursor)
+        : PixmapWidget(parent),
+          m_name_normal(normal),
+          m_name_pressed(pressed),
+          m_name_cursor(cursor)
 {
-    name_normal = normal;
-    name_pressed = pressed;
-    name_cursor = cursor;
     m_skin = Skin::instance();
     setON (false);
-    setCursor (m_skin->getCursor (name_cursor));
-    connect (m_skin, SIGNAL (skinChanged()), this, SLOT (updateSkin()));
+    setCursor(m_skin->getCursor (m_name_cursor));
+    connect(m_skin, SIGNAL (skinChanged()), SLOT(updateSkin()));
 }
 
-
 Button::~Button()
 {}
 
 void Button::updateSkin()
 {
-    setPixmap (m_skin->getButton (name_normal));
-    setCursor (m_skin->getCursor (name_cursor));
+    setPixmap (m_skin->getButton(m_name_normal));
+    setCursor (m_skin->getCursor(m_name_cursor));
 }
 
-void Button::setON (bool on)
+void Button::setON(bool on)
 {
     if (on)
-        setPixmap (m_skin->getButton (name_pressed));
+        setPixmap(m_skin->getButton(m_name_pressed));
     else
-        setPixmap (m_skin->getButton (name_normal));
+        setPixmap(m_skin->getButton(m_name_normal));
 }
-void Button::mousePressEvent (QMouseEvent *e)
+void Button::mousePressEvent(QMouseEvent *e)
 {
     if(e->button() != Qt::LeftButton)
         return;
-    setON (true);
+    setON(true);
     m_pressed = true;
     QWidget::mousePressEvent(e);
 }
 
-void Button::mouseReleaseEvent (QMouseEvent *e)
+void Button::mouseReleaseEvent(QMouseEvent *e)
 {
-    if (!m_pressed)
+    if(!m_pressed)
         return;
     m_pressed = false;
     if(rect().contains(e->pos()))
     {
-        setON (false);
+        setON(false);
         emit clicked();
     }
 }
 
-void Button::mouseMoveEvent (QMouseEvent *e)
+void Button::mouseMoveEvent(QMouseEvent *e)
 {
-    setON (m_pressed && rect().contains(e->pos()));
+    setON(m_pressed && rect().contains(e->pos()));
 }
diff --git a/src/plugins/Ui/skinned/button.h b/src/plugins/Ui/skinned/button.h
index 5848c03dd..d47009930 100644
--- a/src/plugins/Ui/skinned/button.h
+++ b/src/plugins/Ui/skinned/button.h
@@ -45,8 +45,7 @@ private:
     //bool m_cursorin;
     bool m_pressed = false;
     void setON(bool);
-    uint name_normal, name_pressed;
-    uint name_cursor;
+    uint m_name_normal, m_name_pressed, m_name_cursor;
 
 protected:
     void mousePressEvent(QMouseEvent*) override;
diff --git a/src/plugins/Ui/skinned/eqgraph.cpp b/src/plugins/Ui/skinned/eqgraph.cpp
index 50522bf9b..a8c203a6a 100644
--- a/src/plugins/Ui/skinned/eqgraph.cpp
+++ b/src/plugins/Ui/skinned/eqgraph.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2009 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  *
@@ -56,17 +56,15 @@ void EQGraph::clear ()
 
 void EQGraph::init_spline (double * x, double * y, int n, double * y2)
 {
-    int i, k;
-    double p, qn, sig, un, *u;
-
-    u = new double[n];
+    double qn, un;
+    double *u = new double[n];
 
     y2[0] = u[0] = 0.0;
 
-    for (i = 1; i < n - 1; i++)
+    for(int i = 1; i < n - 1; i++)
     {
-        sig = ((double) x[i] - x[i - 1]) / ((double) x[i + 1] - x[i - 1]);
-        p = sig * y2[i - 1] + 2.0;
+        double sig = ((double) x[i] - x[i - 1]) / ((double) x[i + 1] - x[i - 1]);
+        double p = sig * y2[i - 1] + 2.0;
         y2[i] = (sig - 1.0) / p;
         u[i] =
             (((double) y[i + 1] - y[i]) / (x[i + 1] - x[i])) -
@@ -76,29 +74,25 @@ void EQGraph::init_spline (double * x, double * y, int n, double * y2)
     qn = un = 0.0;
 
     y2[n - 1] = (un - qn * u[n - 2]) / (qn * y2[n - 2] + 1.0);
-    for (k = n - 2; k >= 0; k--)
+    for(int k = n - 2; k >= 0; k--)
         y2[k] = y2[k] * y2[k + 1] + u[k];
     delete[] u;
 }
 
 double EQGraph::eval_spline (double xa[], double ya[], double y2a[], int n, double x)
 {
-    int klo, khi, k;
-    double h, b, a;
-
-    klo = 0;
-    khi = n - 1;
+    int klo = 0, khi = n - 1;
     while (khi - klo > 1)
     {
-        k = (khi + klo) >> 1;
+        int k = (khi + klo) >> 1;
         if (xa[k] > x)
             khi = k;
         else
             klo = k;
     }
-    h = xa[khi] - xa[klo];
-    a = (xa[khi] - x) / h;
-    b = (x - xa[klo]) / h;
+    double h = xa[khi] - xa[klo];
+    double a = (xa[khi] - x) / h;
+    double b = (x - xa[klo]) / h;
     return (a * ya[klo] + b * ya[khi] +
             ((a * a * a - a) * y2a[klo] +
              (b * b * b - b) * y2a[khi]) * (h * h) / 6.0);
@@ -116,7 +110,6 @@ void EQGraph::draw()
         return;
     }
 
-    int i, y;
     double x[] = { 0, 11, 23, 35, 47, 59, 71, 83, 97, 109 }, yf[10];
     double *bands = new double[10];
 
@@ -126,13 +119,10 @@ void EQGraph::draw()
     }
 
     init_spline (x, bands, 10, yf);
-    for (i = 0; i < 113; i++)
+    for (int i = 0; i < 113; i++)
     {
-        y = 9 - (int) ((eval_spline (x, bands, yf, 10, i) * 9.0) / 20.0);
-        if (y < 0)
-            y = 0;
-        if (y > 18)
-            y = 18;
+        int y = 9 - (int) ((eval_spline (x, bands, yf, 10, i) * 9.0) / 20.0);
+        y = qBound(0, y, 18);
 
         QPainter paint (&pixmap);
         paint.drawPixmap (i*m_ratio, y*m_ratio, m_skin->getEqSpline (y));
diff --git a/src/plugins/Ui/skinned/eqgraph.h b/src/plugins/Ui/skinned/eqgraph.h
index 6373243ba..dd17732da 100644
--- a/src/plugins/Ui/skinned/eqgraph.h
+++ b/src/plugins/Ui/skinned/eqgraph.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2009 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  *
@@ -30,7 +30,7 @@ class EQGraph : public PixmapWidget
 {
    Q_OBJECT
 public:
-    EQGraph (QWidget *parent = nullptr);
+    explicit EQGraph (QWidget *parent = nullptr);
 
    ~EQGraph();
 
diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp
index 891b4ee55..7e148784a 100644
--- a/src/plugins/Ui/skinned/eqwidget.cpp
+++ b/src/plugins/Ui/skinned/eqwidget.cpp
@@ -24,6 +24,7 @@
 #include <QCloseEvent>
 #include <QFile>
 #include <QScreen>
+#include <algorithm>
 #include <qmmpui/filedialog.h>
 #include <qmmpui/playlistmanager.h>
 #include <qmmp/soundcore.h>
@@ -146,19 +147,15 @@ void EqWidget::setMimimalMode(bool b)
 void EqWidget::readSettings()
 {
     QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
-    QScreen *screen = QGuiApplication::primaryScreen();
-    QRect availableGeometry = screen->availableGeometry();
+    QScreen *primaryScreen = QGuiApplication::primaryScreen();
+    QRect availableGeometry = primaryScreen->availableGeometry();
     QPoint pos = settings.value("Skinned/eq_pos", QPoint(100, 216)).toPoint();
     int r = m_skin->ratio();
     //TODO QGuiApplication::screenAt
-    for(const QScreen *screen : QGuiApplication::screens())
-    {
-        if(screen->availableGeometry().contains(pos))
-        {
-           availableGeometry = screen->availableGeometry();
-           break;
-        }
-    }
+    const QList<QScreen *> screens = QGuiApplication::screens();
+    auto it = std::find_if(screens.cbegin(), screens.cend(), [pos](QScreen *screen){ return screen->availableGeometry().contains(pos); });
+    if(it != screens.cend())
+        availableGeometry = (*it)->availableGeometry();
     pos.setX(qBound(availableGeometry.left(), pos.x(), availableGeometry.right() - r*275));
     pos.setY(qBound(availableGeometry.top(), pos.y(), availableGeometry.bottom() - r*116));
     move(pos); //geometry
@@ -396,19 +393,14 @@ void EqWidget::loadPreset(const QString &name)
 
 EQPreset *EqWidget::findPreset(const QString &name)
 {
-    for(EQPreset *preset : qAsConst(m_autoPresets))
-    {
-        if (preset->text() == name)
-            return preset;
-    }
-    return nullptr;
+    auto it = std::find_if(m_autoPresets.cbegin(), m_autoPresets.cend(), [name](EQPreset *preset){ return preset->text() == name; });
+    return it == m_autoPresets.cend() ? nullptr : *it;
 }
 
 void EqWidget::importWinampEQF()
 {
     char header[31];
-    char name[257];
-    char bands[11];
+
     QString path = FileDialog::getOpenFileName(this, tr("Import Preset"),
                    QDir::homePath(),
                    QString("Winamp EQF (*.q1)"));
@@ -418,6 +410,8 @@ void EqWidget::importWinampEQF()
     file.read (header, 31);
     if (QString::fromLatin1(header).contains("Winamp EQ library file v1.1"))
     {
+        char name[257];
+        char bands[11];
         while (file.read (name, 257))
         {
             EQPreset* preset = new EQPreset;
diff --git a/src/plugins/Ui/skinned/eqwidget.h b/src/plugins/Ui/skinned/eqwidget.h
index 0fe79b895..9ee6b0aaf 100644
--- a/src/plugins/Ui/skinned/eqwidget.h
+++ b/src/plugins/Ui/skinned/eqwidget.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,7 +42,7 @@ class EqWidget : public PixmapWidget
 {
     Q_OBJECT
 public:
-    EqWidget(QWidget *parent = nullptr);
+    explicit EqWidget(QWidget *parent = nullptr);
 
     ~EqWidget();
 
diff --git a/src/plugins/Ui/skinned/keyboardmanager.h b/src/plugins/Ui/skinned/keyboardmanager.h
index 29f5004b5..7238fd5ef 100644
--- a/src/plugins/Ui/skinned/keyboardmanager.h
+++ b/src/plugins/Ui/skinned/keyboardmanager.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2013 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  *
@@ -37,7 +37,7 @@ public:
     /*!
      * Constructor. Takes \b PlayList object as an argument.
      */
-    KeyboardManager (ListWidget *l);
+    explicit KeyboardManager (ListWidget *l);
     /*!
      * Handles key press events from \b PlayList object. Returns \b true
      * if the key was handled, otherwise \b false.
diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp
index bb5fff5f7..4ee378b04 100644
--- a/src/plugins/Ui/skinned/listwidget.cpp
+++ b/src/plugins/Ui/skinned/listwidget.cpp
@@ -43,8 +43,10 @@
 
 #define INVALID_INDEX -1
 
-ListWidget::ListWidget(QWidget *parent)
-        : QWidget(parent)
+ListWidget::ListWidget(QWidget *parent) : QWidget(parent),
+    m_pressed_index(INVALID_INDEX),
+    m_anchor_index(INVALID_INDEX),
+    m_drop_index(INVALID_INDEX)
 {
     m_popupWidget = nullptr;
 
@@ -56,17 +58,6 @@ ListWidget::ListWidget(QWidget *parent)
 
     m_header = new PlayListHeader(this);
     m_hslider = new HorizontalSlider(this);
-    m_update = false;
-    m_drop_index = INVALID_INDEX;
-    m_scroll_direction = NONE;
-    m_prev_y = 0;
-    m_anchor_index = INVALID_INDEX;
-    m_pressed_index = INVALID_INDEX;
-    m_first = 0;
-    m_row_count = 0;
-    m_count = 0;
-    m_firstItem = nullptr;
-    m_select_on_release = false;
 
     setAcceptDrops(true);
     setMouseTracking(true);
diff --git a/src/plugins/Ui/skinned/listwidget.h b/src/plugins/Ui/skinned/listwidget.h
index 378b5a04d..7f95c84a4 100644
--- a/src/plugins/Ui/skinned/listwidget.h
+++ b/src/plugins/Ui/skinned/listwidget.h
@@ -112,22 +112,20 @@ private:
     bool updateRowCount();
     void restoreFirstVisible();
 
-    bool m_update;
-    int m_pressed_index;
+    bool m_update = false;
+    int m_pressed_index, m_anchor_index, m_drop_index;
     QMenu *m_menu;
     PlayListModel *m_model;
-    int m_row_count, m_first, m_count; //visible rows, first visible index, total item count
-    PlayListItem *m_firstItem; //first visible item
+    int m_row_count = 0, m_first = 0, m_count = 0; //visible rows, first visible index, total item count
+    PlayListItem *m_firstItem = nullptr; //first visible item
     Skin *m_skin;
-    int m_anchor_index;
     /*!
      * Scroll direction that is performing in current moment.
      */
-    ScrollDirection m_scroll_direction;
-    int m_prev_y;
-    bool m_select_on_release;
-    bool m_show_protocol;
-    int m_drop_index;
+    ScrollDirection m_scroll_direction = NONE;
+    int m_prev_y = 0;
+    bool m_select_on_release = false;
+    bool m_show_protocol = false;
     QList<ListWidgetRow *> m_rows;
     QmmpUiSettings *m_ui_settings;
     PlayListPopup::PopupWidget *m_popupWidget;
diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.cpp b/src/plugins/Ui/skinned/listwidgetdrawer.cpp
index 301bf7b61..ebd6283cc 100644
--- a/src/plugins/Ui/skinned/listwidgetdrawer.cpp
+++ b/src/plugins/Ui/skinned/listwidgetdrawer.cpp
@@ -203,7 +203,6 @@ void ListWidgetDrawer::prepareRow(ListWidgetRow *row)
         {
             row->titles[i] = m_metrics->elidedText (row->titles[i], Qt::ElideRight, size - 2 * m_padding);
         }
-        visible_width -= size;
     }
 }
 
@@ -277,7 +276,7 @@ void ListWidgetDrawer::drawSeparator(QPainter *painter, ListWidgetRow *row, bool
     int sy = row->rect.y() + m_metrics->overlinePos() - 1;
 
     painter->setFont(m_font);
-    painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_selected_text : m_group_text);
+    painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_selected_text : m_group_text);
 
     if(rtl)
         sx = row->rect.right() - sx - m_metrics->horizontalAdvance(row->titles[0]);
@@ -343,7 +342,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
                 painter->drawText(sx + m_padding, sy, number);
                 if(m_show_splitters)
                 {
-                    painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_selected_text : m_splitter);
+                    painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_selected_text : m_splitter);
                     painter->drawLine(sx, row->rect.top(), sx, row->rect.bottom() + 1);
                     painter->setPen(textColor);
                 }
@@ -405,7 +404,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
 
                 if(m_show_splitters && (!row->autoResize || i < row->sizes.count() - 1)) //do not draw last vertical line
                 {
-                    painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_selected_text : m_splitter);
+                    painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_selected_text : m_splitter);
                     painter->drawLine(sx, row->rect.top(), sx, row->rect.bottom() + 1);
                 }
             }
@@ -419,12 +418,12 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
             if(row->numberColumnWidth)
             {
                 sx += row->numberColumnWidth;
-                painter->setPen(row->flags & ListWidgetRow::CURRENT ? m_current : m_normal);
+                painter->setPen((row->flags & ListWidgetRow::CURRENT) ? m_current : m_normal);
                 QString number = QString("%1").arg(row->number);
                 painter->drawText(sx - m_padding - m_metrics->horizontalAdvance(number), sy, number);
                 if(m_show_splitters)
                 {
-                    painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_selected_text : m_splitter);
+                    painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_selected_text : m_splitter);
                     painter->drawLine(sx, row->rect.top(), sx, row->rect.bottom() + 1);
                     painter->setPen(textColor);
                 }
@@ -486,7 +485,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
 
                 if(m_show_splitters && (!row->autoResize || i < row->sizes.count() - 1)) //do not draw last vertical line
                 {
-                    painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_selected_text : m_splitter);
+                    painter->setPen((row->flags & ListWidgetRow::SELECTED) ? m_selected_text : m_splitter);
                     painter->drawLine(sx, row->rect.top(), sx, row->rect.bottom() + 1);
                 }
             }
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index 5bef7a1c0..56ec1d2f1 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -23,6 +23,7 @@
 #include <QAction>
 #include <QMenu>
 #include <QScreen>
+#include <algorithm>
 #include <math.h>
 #include <qmmp/soundcore.h>
 #include <qmmp/visual.h>
@@ -275,18 +276,14 @@ void MainWindow::readSettings()
     }
     else
     {
-        QScreen *screen = QGuiApplication::primaryScreen();
-        QRect availableGeometry = screen->availableGeometry();
+        QScreen *primaryScreen = QGuiApplication::primaryScreen();
+        QRect availableGeometry = primaryScreen->availableGeometry();
         QPoint pos = settings.value("mw_pos", QPoint(100, 100)).toPoint();
         int r = m_skin->ratio();
-        for(const QScreen *screen : QGuiApplication::screens())
-        {
-            if(screen->availableGeometry().contains(pos))
-            {
-               availableGeometry = screen->availableGeometry();
-               break;
-            }
-        }
+        const QList<QScreen *> screens = QGuiApplication::screens();
+        auto it = std::find_if(screens.cbegin(), screens.cend(), [pos](QScreen *screen){ return screen->availableGeometry().contains(pos); });
+        if(it != screens.cend())
+            availableGeometry = (*it)->availableGeometry();
         pos.setX(qBound(availableGeometry.left(), pos.x(), availableGeometry.right() - r*275));
         pos.setY(qBound(availableGeometry.top(), pos.y(), availableGeometry.bottom() - r*116));
         move(pos); //geometry
diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp
index bcedd034e..3f3b0a716 100644
--- a/src/plugins/Ui/skinned/playlist.cpp
+++ b/src/plugins/Ui/skinned/playlist.cpp
@@ -25,6 +25,7 @@
 #include <QCloseEvent>
 #include <QInputDialog>
 #include <QScreen>
+#include <algorithm>
 #include <qmmpui/playlistitem.h>
 #include <qmmpui/playlistmodel.h>
 #include <qmmpui/playlistmanager.h>
@@ -55,11 +56,8 @@ PlayList::PlayList (PlayListManager *manager, QWidget *parent)
     setWindowTitle(tr("Playlist"));
     m_pl_manager = manager;
     m_ui_settings = QmmpUiSettings::instance();
-    m_update = false;
-    m_resize = false;
     m_skin = Skin::instance();
     m_ratio = m_skin->ratio();
-    m_shaded = false;
     m_pl_browser = nullptr;
     m_pl_selector = nullptr;
 
@@ -470,19 +468,15 @@ void PlayList::readSettings()
     }
     else
     {
-        QScreen *screen = QGuiApplication::primaryScreen();
-        QRect availableGeometry = screen->availableGeometry();
+        QScreen *primaryScreen = QGuiApplication::primaryScreen();
+        QRect availableGeometry = primaryScreen->availableGeometry();
         QPoint pos = settings.value ("Skinned/pl_pos", QPoint (100, 332)).toPoint();
         m_ratio = m_skin->ratio();
         //TODO QGuiApplication::screenAt
-        for(const QScreen *screen : QGuiApplication::screens())
-        {
-            if(screen->availableGeometry().contains(pos))
-            {
-               availableGeometry = screen->availableGeometry();
-               break;
-            }
-        }
+        const QList<QScreen *> screens = QGuiApplication::screens();
+        auto it = std::find_if(screens.cbegin(), screens.cend(), [pos](QScreen *screen){ return screen->availableGeometry().contains(pos); });
+        if(it != screens.cend())
+            availableGeometry = (*it)->availableGeometry();
         pos.setX(qBound(availableGeometry.left(), pos.x(), availableGeometry.right() - m_ratio*275));
         pos.setY(qBound(availableGeometry.top(), pos.y(), availableGeometry.bottom() - m_ratio*116));
         move(pos); //position
diff --git a/src/plugins/Ui/skinned/playlist.h b/src/plugins/Ui/skinned/playlist.h
index 44a854d27..31b0aa8af 100644
--- a/src/plugins/Ui/skinned/playlist.h
+++ b/src/plugins/Ui/skinned/playlist.h
@@ -49,7 +49,7 @@ class PlayList : public QWidget
 {
         Q_OBJECT
     public:
-        PlayList (PlayListManager *manager, QWidget *parent = nullptr);
+        explicit PlayList(PlayListManager *manager, QWidget *parent = nullptr);
         virtual ~PlayList();
 
         void readSettings();
@@ -126,16 +126,16 @@ class PlayList : public QWidget
         ListWidget *m_listWidget;
         PlayListTitleBar *m_titleBar;
         PlayListSlider *m_plslider;
-        bool m_resize;
-        bool m_update;
+        bool m_resize = false;
+        bool m_update = false;
         int m_ratio;
         int m_height;
-        bool m_shaded;
+        bool m_shaded = false;
         PlayListManager *m_pl_manager;
         QmmpUiSettings *m_ui_settings;
         KeyboardManager* m_keyboardManager;
         QPointer <PlayListBrowser> m_pl_browser;
-        PlayListSelector *m_pl_selector;
+        PlayListSelector *m_pl_selector = nullptr;
 #ifdef QMMP_WS_X11
         bool m_compiz;
 #endif
diff --git a/src/plugins/Ui/skinned/playlistbrowser.h b/src/plugins/Ui/skinned/playlistbrowser.h
index d0a3b2ff0..f445b4bc0 100644
--- a/src/plugins/Ui/skinned/playlistbrowser.h
+++ b/src/plugins/Ui/skinned/playlistbrowser.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009-2013 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 PlayListBrowser : public QDialog
 {
 Q_OBJECT
 public:
-    PlayListBrowser(PlayListManager *manager, QWidget *parent = nullptr);
+    explicit PlayListBrowser(PlayListManager *manager, QWidget *parent = nullptr);
     ~PlayListBrowser();
 
 private slots:
diff --git a/src/plugins/Ui/skinned/playlistheader.cpp b/src/plugins/Ui/skinned/playlistheader.cpp
index 0c858e0a7..ce59725ed 100644
--- a/src/plugins/Ui/skinned/playlistheader.cpp
+++ b/src/plugins/Ui/skinned/playlistheader.cpp
@@ -32,6 +32,7 @@
 #include <QIcon>
 #include <QHash>
 #include <QActionGroup>
+#include <algorithm>
 #include <qmmp/qmmp.h>
 #include <qmmpui/playlistmanager.h>
 #include <qmmpui/playlistheadermodel.h>
@@ -144,7 +145,7 @@ void PlayListHeader::readSettings()
         {
             m_model->setData(i, SIZE, INITAL_SIZE);
             m_model->setData(i, ALIGNMENT, (layoutDirection() == Qt::RightToLeft) ?
-                                 ListWidgetRow::ALIGN_LEFT : ListWidgetRow::ALIGN_LEFT);
+                                 ListWidgetRow::ALIGN_RIGHT : ListWidgetRow::ALIGN_LEFT);
 
             if(i < sizes.count())
                 m_model->setData(i, SIZE, sizes.at(i).toInt());
@@ -286,11 +287,8 @@ int PlayListHeader::maxScrollValue() const
     if(m_model->count() == 1)
         return 0;
 
-    int row_width = 0;
-    for(int size : sizes())
-    {
-        row_width += size;
-    }
+    const QList<int> sizeList = sizes();
+    int row_width = std::accumulate(sizeList.cbegin(), sizeList.cend(), 0);
     return qMax(0, row_width - width() + 10);
 }
 
diff --git a/src/plugins/Ui/skinned/playlistselector.h b/src/plugins/Ui/skinned/playlistselector.h
index be3082c9d..3fd0411ca 100644
--- a/src/plugins/Ui/skinned/playlistselector.h
+++ b/src/plugins/Ui/skinned/playlistselector.h
@@ -39,7 +39,7 @@ class PlayListSelector : public QWidget
 {
 Q_OBJECT
 public:
-    PlayListSelector(PlayListManager *manager, QWidget *parent = nullptr);
+    explicit PlayListSelector(PlayListManager *manager, QWidget *parent = nullptr);
     ~PlayListSelector();
     void readSettings();
 
diff --git a/src/plugins/Ui/skinned/preseteditor.cpp b/src/plugins/Ui/skinned/preseteditor.cpp
index 42de31de3..75ae9f6b8 100644
--- a/src/plugins/Ui/skinned/preseteditor.cpp
+++ b/src/plugins/Ui/skinned/preseteditor.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2012 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  *
@@ -28,29 +28,29 @@
 PresetEditor::PresetEditor(QWidget *parent)
         : QDialog(parent)
 {
-    ui.setupUi(this);
+    m_ui.setupUi(this);
     setAttribute(Qt::WA_DeleteOnClose);
-    connect(ui.loadButton,SIGNAL(clicked()),SLOT(loadPreset()));
-    connect(ui.deleteButton,SIGNAL(clicked()),SLOT(deletePreset()));
-    ui.loadButton->setIcon(QIcon::fromTheme("document-open"));
-    ui.deleteButton->setIcon(QIcon::fromTheme("edit-delete"));
+    connect(m_ui.loadButton,SIGNAL(clicked()),SLOT(loadPreset()));
+    connect(m_ui.deleteButton,SIGNAL(clicked()),SLOT(deletePreset()));
+    m_ui.loadButton->setIcon(QIcon::fromTheme("document-open"));
+    m_ui.deleteButton->setIcon(QIcon::fromTheme("edit-delete"));
 }
 
 
 PresetEditor::~PresetEditor()
 {
-    while (ui.presetListWidget->count () !=0)
-        ui.presetListWidget->takeItem (0);
+    while (m_ui.presetListWidget->count () !=0)
+        m_ui.presetListWidget->takeItem (0);
 
-    while (ui.autoPresetListWidget->count () !=0)
-        ui.autoPresetListWidget->takeItem (0);
+    while (m_ui.autoPresetListWidget->count () !=0)
+        m_ui.autoPresetListWidget->takeItem (0);
 }
 
 void PresetEditor::addPresets(const QList<EQPreset*> &presets)
 {
     for(QListWidgetItem *item : qAsConst(presets))
     {
-        ui.presetListWidget->addItem(item);
+        m_ui.presetListWidget->addItem(item);
     }
 }
 
@@ -58,17 +58,17 @@ void PresetEditor::addAutoPresets(const QList<EQPreset*> &presets)
 {
     for(QListWidgetItem *item : qAsConst(presets))
     {
-        ui.autoPresetListWidget->addItem(item);
+        m_ui.autoPresetListWidget->addItem(item);
     }
 }
 
 void PresetEditor::loadPreset()
 {
     EQPreset* preset = nullptr;
-    if (ui.tabWidget->currentIndex () == 0)
-        preset = (EQPreset *) ui.presetListWidget->currentItem ();
-    if (ui.tabWidget->currentIndex () == 1)
-        preset = (EQPreset *) ui.autoPresetListWidget->currentItem ();
+    if (m_ui.tabWidget->currentIndex () == 0)
+        preset = static_cast<EQPreset *>(m_ui.presetListWidget->currentItem());
+    if (m_ui.tabWidget->currentIndex () == 1)
+        preset = static_cast<EQPreset *>(m_ui.autoPresetListWidget->currentItem());
     if (preset)
         emit presetLoaded(preset);
 }
@@ -76,10 +76,10 @@ void PresetEditor::loadPreset()
 void PresetEditor::deletePreset()
 {
     EQPreset* preset = nullptr;
-    if (ui.tabWidget->currentIndex () == 0)
-        preset = (EQPreset *) ui.presetListWidget->currentItem ();
-    if (ui.tabWidget->currentIndex () == 1)
-        preset = (EQPreset *) ui.autoPresetListWidget->currentItem ();
+    if (m_ui.tabWidget->currentIndex () == 0)
+        preset = static_cast<EQPreset *>(m_ui.presetListWidget->currentItem());
+    if (m_ui.tabWidget->currentIndex () == 1)
+        preset = static_cast<EQPreset *>(m_ui.autoPresetListWidget->currentItem());
     if (preset)
         emit presetDeleted(preset);
 }
diff --git a/src/plugins/Ui/skinned/preseteditor.h b/src/plugins/Ui/skinned/preseteditor.h
index 842122506..5529ce8f3 100644
--- a/src/plugins/Ui/skinned/preseteditor.h
+++ b/src/plugins/Ui/skinned/preseteditor.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006 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  *
@@ -50,7 +50,7 @@ private slots:
     void deletePreset();
 
 private:
-    Ui::PresetEditor ui;
+    Ui::PresetEditor m_ui;
 
 };
 
diff --git a/src/plugins/Ui/skinned/shadedbar.cpp b/src/plugins/Ui/skinned/shadedbar.cpp
index b97dee3ae..9bc10125a 100644
--- a/src/plugins/Ui/skinned/shadedbar.cpp
+++ b/src/plugins/Ui/skinned/shadedbar.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2009 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  *
@@ -25,12 +25,11 @@
 #include "skin.h"
 #include "shadedbar.h"
 
-ShadedBar::ShadedBar(QWidget *parent, uint slider1, uint slider2, uint slider3)
- : QWidget(parent)
+ShadedBar::ShadedBar(QWidget *parent, uint slider1, uint slider2, uint slider3) : QWidget(parent),
+    m_slider1(slider1),
+    m_slider2(slider2),
+    m_slider3(slider3)
 {
-    m_slider1 = slider1;
-    m_slider2 = slider2;
-    m_slider3 = slider3;
     m_skin = Skin::instance();
     m_ratio = m_skin->ratio();
     if(slider1 == Skin::EQ_VOLUME1)
@@ -38,14 +37,9 @@ ShadedBar::ShadedBar(QWidget *parent, uint slider1, uint slider2, uint slider3)
     else
         resize(m_ratio*42,m_ratio*7);
     connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin()));
-    m_moving = false;
-    m_min = 0;
-    m_max = 100;
-    m_old = m_value = 0;
     draw();
 }
 
-
 ShadedBar::~ShadedBar()
 {
 }
@@ -53,16 +47,16 @@ ShadedBar::~ShadedBar()
 void ShadedBar::mousePressEvent(QMouseEvent *e)
 {
     m_moving = true;
-    press_pos = e->x();
-    if(m_pos<e->x() && e->x()<m_pos+3)
+    m_press_pos = e->x();
+    if(m_pos < e->x() && e->x() < m_pos+3)
     {
-        press_pos = e->x()-m_pos;
+        m_press_pos = e->x() - m_pos;
     }
     else
     {
-        m_value = convert(qMax(qMin(width()-3,e->x()-1),0));
-        press_pos = 1;
-        if (m_value!=m_old)
+        m_value = convert(qMax(qMin(width() - 3, e->x() - 1), 0));
+        m_press_pos = 1;
+        if (m_value != m_old)
         {
             emit sliderMoved(m_value);
         }
@@ -75,9 +69,9 @@ void ShadedBar::mouseMoveEvent (QMouseEvent *e)
     if(m_moving)
     {
         int po = e->x();
-        po = po - press_pos;
+        po = po - m_press_pos;
 
-        if(0<=po && po<=width()-3)
+        if(0 <= po && po <= width() - 3)
         {
             m_value = convert(po);
             draw();
diff --git a/src/plugins/Ui/skinned/shadedbar.h b/src/plugins/Ui/skinned/shadedbar.h
index e4ebb6b7f..c11c59d3a 100644
--- a/src/plugins/Ui/skinned/shadedbar.h
+++ b/src/plugins/Ui/skinned/shadedbar.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2009 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  *
@@ -36,11 +36,11 @@ public:
     ShadedBar(QWidget *parent = nullptr, uint slider1 = 0, uint slider2 = 0, uint slider3 = 0);
 
     ~ShadedBar();
-    int value()
+    inline int value()
     {
         return m_value;
     }
-    int isPressed()
+    inline int isPressed()
     {
         return m_moving;
     }
@@ -57,9 +57,9 @@ private slots:
 
 private:
     Skin *m_skin;
-    bool m_moving;
-    int press_pos;
-    int m_max, m_min, m_pos, m_value, m_old, m_x;
+    bool m_moving = false;
+    int m_press_pos = 0;
+    int m_max = 100, m_min = 0, m_pos = 0, m_value = 0, m_old;
     QPixmap m_pixmap;
     int convert(int);   // value = convert(position);
     void draw();
diff --git a/src/plugins/Ui/skinned/shadedvisual.cpp b/src/plugins/Ui/skinned/shadedvisual.cpp
index 3a195d4e5..3016a2b0d 100644
--- a/src/plugins/Ui/skinned/shadedvisual.cpp
+++ b/src/plugins/Ui/skinned/shadedvisual.cpp
@@ -34,7 +34,6 @@ ShadedVisual::ShadedVisual(QWidget *parent) : Visual(parent)
     m_timer = new QTimer(this);
     connect(m_timer, SIGNAL (timeout()), this, SLOT (timeout()));
     connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin()));
-    m_running = false;
     m_timer->setInterval(50);
     m_timer->start();
     clear();
@@ -84,21 +83,17 @@ void ShadedVisual::process ()
     int pos = 0;
     int l = 0;
     int r = 0;
-    int j_l = 0, j_r = 0;
 
     for (int i = 0; i < 75; ++i)
     {
         pos += step;
 
-        j_l = abs(m_left_buffer[pos >> 8] * 8.0);
-
-        if (j_l > 15)
-            j_l = 15;
+        int j_l = abs(m_left_buffer[pos >> 8] * 8.0);
+        j_l = qMin(j_l, 15);
         l = qMax(l, j_l);
 
-        j_r = abs(m_right_buffer[pos >> 8] * 8.0);
-        if (j_r > 15)
-            j_r = 15;
+        int j_r = abs(m_right_buffer[pos >> 8] * 8.0);
+        j_r = qMin(j_r, 15);
         r = qMax(r, j_r);
     }
     m_l -= 0.5;
diff --git a/src/plugins/Ui/skinned/shadedvisual.h b/src/plugins/Ui/skinned/shadedvisual.h
index 7828920fe..ef2b6514f 100644
--- a/src/plugins/Ui/skinned/shadedvisual.h
+++ b/src/plugins/Ui/skinned/shadedvisual.h
@@ -35,7 +35,7 @@ class ShadedVisual : public Visual
 {
     Q_OBJECT
 public:
-    ShadedVisual(QWidget *parent = nullptr);
+    explicit ShadedVisual(QWidget *parent = nullptr);
 
     ~ShadedVisual();
 
@@ -62,7 +62,7 @@ private:
     float m_right_buffer[QMMP_VISUAL_NODE_SIZE];
     double m_l, m_r;
     int m_ratio;
-    bool m_running;
+    bool m_running = false;
 
 };
 
diff --git a/src/plugins/Ui/skinned/shortcutdialog.h b/src/plugins/Ui/skinned/shortcutdialog.h
index f270b93d6..b390be0c2 100644
--- a/src/plugins/Ui/skinned/shortcutdialog.h
+++ b/src/plugins/Ui/skinned/shortcutdialog.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2010-2013 by Ilya Kotov                                 *
+ *   Copyright (C) 2010-2020 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -32,7 +32,7 @@ class ShortcutDialog : public QDialog
 {
     Q_OBJECT
 public:
-    ShortcutDialog(const QString &key, QWidget *parent = nullptr);
+    explicit ShortcutDialog(const QString &key, QWidget *parent = nullptr);
 
     ~ShortcutDialog();
 
diff --git a/src/plugins/Ui/skinned/timeindicator.cpp b/src/plugins/Ui/skinned/timeindicator.cpp
index 34850e1e3..2cbcffa4d 100644
--- a/src/plugins/Ui/skinned/timeindicator.cpp
+++ b/src/plugins/Ui/skinned/timeindicator.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2015 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  *
@@ -26,12 +26,7 @@
 #include "timeindicator.h"
 
 
-TimeIndicatorModel::TimeIndicatorModel(QObject *parent)
-    : QObject (parent)
-    , m_position (0)
-    , m_duration (0)
-    , m_elapsed (true)
-    , m_visible (false)
+TimeIndicatorModel::TimeIndicatorModel(QObject *parent) : QObject (parent)
 {
     readSettings();
 }
diff --git a/src/plugins/Ui/skinned/timeindicator.h b/src/plugins/Ui/skinned/timeindicator.h
index 83918e9cb..54c1ba1fb 100644
--- a/src/plugins/Ui/skinned/timeindicator.h
+++ b/src/plugins/Ui/skinned/timeindicator.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2015 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  *
@@ -35,13 +35,13 @@ class Skin;
 class TimeIndicatorModel : public QObject {
     Q_OBJECT
 public:
-    TimeIndicatorModel(QObject *parent = nullptr);
+    explicit TimeIndicatorModel(QObject *parent = nullptr);
     ~TimeIndicatorModel();
 
-    int position() { return m_position; }
-    int duration() { return m_duration; }
-    bool elapsed() { return m_elapsed; }
-    bool visible() { return m_visible; }
+    inline int position() const { return m_position; }
+    inline int duration() const { return m_duration; }
+    inline bool elapsed() const { return m_elapsed; }
+    inline bool visible() const { return m_visible; }
 
     void setPosition(int position);
     void setDuration(int duration);
@@ -60,10 +60,10 @@ private:
     void readSettings();
     void writeSettings();
 
-    int m_position;
-    int m_duration;
-    bool m_elapsed;
-    bool m_visible;
+    int m_position = 0;
+    int m_duration = 0;
+    bool m_elapsed = true;
+    bool m_visible = false;
 };
 
 
@@ -77,7 +77,7 @@ class TimeIndicator : public PixmapWidget
 {
     Q_OBJECT
 public:
-    TimeIndicator(TimeIndicatorModel *model, QWidget *parent = nullptr);
+    explicit TimeIndicator(TimeIndicatorModel *model, QWidget *parent = nullptr);
     ~TimeIndicator();
 
 protected:
diff --git a/src/plugins/Ui/skinned/titlebar.cpp b/src/plugins/Ui/skinned/titlebar.cpp
index 81ba910a7..3773341ab 100644
--- a/src/plugins/Ui/skinned/titlebar.cpp
+++ b/src/plugins/Ui/skinned/titlebar.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2016 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  *
@@ -37,18 +37,12 @@
 
 // TODO skin cursor with shade mode
 TitleBar::TitleBar(TimeIndicatorModel *model, QWidget *parent)
-        : PixmapWidget(parent)
-        , m_model(model)
+        : PixmapWidget(parent),
+          m_model(model)
 {
-    m_align = false;
     m_skin = Skin::instance();
     setPixmap(m_skin->getTitleBar(Skin::TITLEBAR_A));
     m_mw = qobject_cast<MainWindow*>(parent->parent());
-    m_shaded = false;
-    m_shade2 = nullptr;
-    m_currentTime = nullptr;
-    m_control = nullptr;
-    m_visual = nullptr;
     //buttons
     m_menu = new Button(this,Skin::BT_MENU_N,Skin::BT_MENU_P, Skin::CUR_MAINMENU);
     connect(m_menu,SIGNAL(clicked()),this,SLOT(showMainMenu()));
diff --git a/src/plugins/Ui/skinned/titlebar.h b/src/plugins/Ui/skinned/titlebar.h
index 8d768a376..c6c80391d 100644
--- a/src/plugins/Ui/skinned/titlebar.h
+++ b/src/plugins/Ui/skinned/titlebar.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2016 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  *
@@ -22,7 +22,6 @@
 
 #include <QMainWindow>
 #include <QPoint>
-
 #include "pixmapwidget.h"
 #include "playlist.h"
 
@@ -42,7 +41,7 @@ class TitleBar : public PixmapWidget
 {
 Q_OBJECT
 public:
-    TitleBar(TimeIndicatorModel *model, QWidget *parent = nullptr);
+    explicit TitleBar(TimeIndicatorModel *model, QWidget *parent = nullptr);
 
     ~TitleBar();
 
@@ -61,14 +60,14 @@ private:
     Button *m_menu;
     Button *m_minimize;
     Button *m_shade;
-    Button *m_shade2;
+    Button *m_shade2 = nullptr;
     Button *m_close;
-    SymbolDisplay *m_currentTime;
+    SymbolDisplay *m_currentTime = nullptr;
     QString formatTime (int);
-    bool m_shaded;
-    bool m_align;
-    TitleBarControl *m_control;
-    ShadedVisual *m_visual;
+    bool m_shaded = false;
+    bool m_align = false;
+    TitleBarControl *m_control = nullptr;
+    ShadedVisual *m_visual = nullptr;
     TimeIndicatorModel *m_model;
     void updatePositions();
 
diff --git a/src/plugins/Ui/skinned/visualmenu.cpp b/src/plugins/Ui/skinned/visualmenu.cpp
index 6135eda10..4201142e2 100644
--- a/src/plugins/Ui/skinned/visualmenu.cpp
+++ b/src/plugins/Ui/skinned/visualmenu.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2012 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  *
@@ -44,12 +44,11 @@ void VisualMenu::updateActions()
     }
 }
 
-VisualAction::VisualAction(VisualFactory *factory, QWidget *parent) :
-        QAction(factory->properties().name, parent)
+VisualAction::VisualAction(VisualFactory *factory, QWidget *parent) : QAction(factory->properties().name, parent),
+    m_factory(factory)
 {
     setCheckable (true);
     setChecked (Visual::isEnabled(factory));
-    m_factory = factory;
     connect(this, SIGNAL(triggered(bool)), SLOT(select(bool)));
 }
 
diff --git a/src/plugins/Ui/skinned/visualmenu.h b/src/plugins/Ui/skinned/visualmenu.h
index 2994e40dd..24d8e5e9a 100644
--- a/src/plugins/Ui/skinned/visualmenu.h
+++ b/src/plugins/Ui/skinned/visualmenu.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2012 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  *
@@ -32,7 +32,7 @@ class VisualMenu : public QMenu
 {
     Q_OBJECT
 public:
-    VisualMenu(QWidget *parent = nullptr);
+    explicit VisualMenu(QWidget *parent = nullptr);
 
     ~VisualMenu();
 
@@ -44,7 +44,7 @@ class VisualAction : public QAction
 {
     Q_OBJECT
 public:
-    VisualAction(VisualFactory *factory, QWidget *parent = nullptr);
+    explicit VisualAction(VisualFactory *factory, QWidget *parent = nullptr);
 
 private slots:
     void select(bool);