coding style fixes

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

10 files changed, 65 insertions, 85 deletions

diff --git a/src/plugins/Ui/skinned/skin.cpp b/src/plugins/Ui/skinned/skin.cpp
index 979484495..33d3e1018 100644
--- a/src/plugins/Ui/skinned/skin.cpp
+++ b/src/plugins/Ui/skinned/skin.cpp
@@ -918,7 +918,7 @@ QRegion Skin::createRegion(const QString &path, const QString &group)
         for (int j = 0; j < numPoints.at(i).toInt() * 2 && n != numbers.constEnd(); j++)
         {
             lp << n->toInt();
-            n ++;
+            ++n;
         }
         QVector<QPoint> points;
 
diff --git a/src/plugins/Ui/skinned/skinnedsettings.cpp b/src/plugins/Ui/skinned/skinnedsettings.cpp
index 12fb7c52d..1da0b8718 100644
--- a/src/plugins/Ui/skinned/skinnedsettings.cpp
+++ b/src/plugins/Ui/skinned/skinnedsettings.cpp
@@ -201,7 +201,7 @@ void SkinnedSettings::loadSkins()
 #endif
     for(const QString &path : m_reader->skins())
     {
-        QListWidgetItem *item = new QListWidgetItem (path.section('/', -1));
+        item = new QListWidgetItem (path.section('/', -1));
         item->setIcon (m_reader->getPreview(path));
         item->setToolTip(tr("Archived skin") + " " + path);
         m_ui.listWidget->addItem (item);
diff --git a/src/plugins/Ui/skinned/skinreader.cpp b/src/plugins/Ui/skinned/skinreader.cpp
index b3b63d898..52127c7e0 100644
--- a/src/plugins/Ui/skinned/skinreader.cpp
+++ b/src/plugins/Ui/skinned/skinreader.cpp
@@ -25,6 +25,7 @@
 #include <QByteArray>
 #include <QApplication>
 #include <QFile>
+#include <algorithm>
 #include <qmmp/qmmp.h>
 #include "skinreader.h"
 
@@ -62,15 +63,9 @@ void SkinReader::generateThumbs()
     //clear removed skins from cache
     for(const QFileInfo &thumbFile : qAsConst(d))
     {
-        bool del = true;
-        for(const QFileInfo &fileInfo : qAsConst(f))
-        {
-            if (fileInfo.baseName () == thumbFile.baseName ())
-            {
-                del = false;
-                break;
-            }
-        }
+        bool del = std::none_of(f.cbegin(), f.cend(),
+                                [thumbFile](const QFileInfo &fileInfo){ return fileInfo.baseName() == thumbFile.baseName(); });
+
         if (del)
         {
             qDebug("SkinReader: deleting %s from cache",
@@ -82,15 +77,9 @@ void SkinReader::generateThumbs()
     //add new skins to cache
     for(const QFileInfo &fileInfo : qAsConst(f))
     {
-        bool create = true;
-        for(const QFileInfo &thumbInfo : qAsConst(d))
-        {
-            if (fileInfo.baseName () == thumbInfo.baseName ())
-            {
-                create = false;
-                break;
-            }
-        }
+        bool create = std::none_of(d.cbegin(), d.cend(),
+                                   [fileInfo](const QFileInfo &thumbInfo){ return fileInfo.baseName() == thumbInfo.baseName(); });
+
         if (create)
         {
             qDebug("SkinReader: adding %s to cache",
@@ -108,15 +97,13 @@ void SkinReader::generateThumbs()
     d = cache_dir.entryInfoList();
     for(const QFileInfo &fileInfo : qAsConst(f))
     {
-         for(const QFileInfo &thumbInfo : qAsConst(d))
-         {
-            if (fileInfo.baseName () == thumbInfo.baseName ())
-            {
-                m_previewMap.insert(fileInfo.absoluteFilePath (),
-                                    thumbInfo.absoluteFilePath ());
-                break;
-            }
-         }
+        auto it = std::find_if(d.cbegin(), d.cend(),
+                               [fileInfo](const QFileInfo &thumbInfo){ return fileInfo.baseName() == thumbInfo.baseName(); });
+
+        if(it != d.cend())
+        {
+            m_previewMap.insert(fileInfo.absoluteFilePath (), (*it).absoluteFilePath());
+        }
     }
 }
 
@@ -153,8 +140,7 @@ void SkinReader::untar(const QString &from, const QString &to, bool preview)
     m_process->start("tar", args);
     m_process->waitForFinished();
     array = m_process->readAllStandardOutput ();
-    QString str = QString(array);
-    const QStringList outputList = str.split("\n", QString::SkipEmptyParts);
+    const QStringList outputList = QString(array).split("\n", QString::SkipEmptyParts);
     for(QString str : qAsConst(outputList))
     {
         str = str.trimmed();
diff --git a/src/plugins/Ui/skinned/skinreader.h b/src/plugins/Ui/skinned/skinreader.h
index cebda0cb7..e74f1afb4 100644
--- a/src/plugins/Ui/skinned/skinreader.h
+++ b/src/plugins/Ui/skinned/skinreader.h
@@ -33,7 +33,7 @@ class SkinReader : public QObject
 {
     Q_OBJECT
 public:
-    SkinReader(QObject *parent = nullptr);
+    explicit SkinReader(QObject *parent = nullptr);
 
     ~SkinReader();
 
diff --git a/src/plugins/Ui/skinned/symboldisplay.cpp b/src/plugins/Ui/skinned/symboldisplay.cpp
index 28608b9de..a3f1436d4 100644
--- a/src/plugins/Ui/skinned/symboldisplay.cpp
+++ b/src/plugins/Ui/skinned/symboldisplay.cpp
@@ -22,13 +22,10 @@
 #include "skin.h"
 #include "symboldisplay.h"
 
-SymbolDisplay::SymbolDisplay (QWidget *parent, int digits)
-        : PixmapWidget (parent)
+SymbolDisplay::SymbolDisplay (QWidget *parent, int digits) : PixmapWidget (parent),
+    m_digits(digits)
 {
-    m_alignment = Qt::AlignRight;
     m_skin = Skin::instance();
-    m_digits  = digits;
-    m_max = 0;
     connect (m_skin, SIGNAL (skinChanged()), this, SLOT (draw()));
     draw();
     for (int i = 0; i < m_digits; ++i)
diff --git a/src/plugins/Ui/skinned/symboldisplay.h b/src/plugins/Ui/skinned/symboldisplay.h
index 4f232ae01..34dc7cac8 100644
--- a/src/plugins/Ui/skinned/symboldisplay.h
+++ b/src/plugins/Ui/skinned/symboldisplay.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  *
@@ -32,7 +32,7 @@ class SymbolDisplay : public PixmapWidget
 {
     Q_OBJECT
 public:
-    SymbolDisplay(QWidget *parent = nullptr, int digits = 3);
+    explicit SymbolDisplay(QWidget *parent = nullptr, int digits = 3);
 
     virtual ~SymbolDisplay();
 
@@ -49,9 +49,9 @@ private slots:
 private:
     Skin* m_skin;
     QString m_text;
-    Qt::Alignment m_alignment;
+    Qt::Alignment m_alignment = Qt::AlignRight;
     int m_digits;
-    int m_max;
+    int m_max = 0;
 };
 
 #endif
diff --git a/src/plugins/Ui/skinned/textscroller.cpp b/src/plugins/Ui/skinned/textscroller.cpp
index f2fb7cbda..ec479bb1b 100644
--- a/src/plugins/Ui/skinned/textscroller.cpp
+++ b/src/plugins/Ui/skinned/textscroller.cpp
@@ -42,9 +42,9 @@
 #define SCROLL_SEP "   *** "
 #define TITLE_FORMAT "%p%if(%p&%t, - ,)%t%if(%p,,%if(%t,,%f))%if(%l, - %l,)"
 
-TextScroller::TextScroller (QWidget *parent) : QWidget (parent)
+TextScroller::TextScroller (QWidget *parent) : QWidget (parent),
+    m_defautText(QString("Qmmp ") + Qmmp::strVersion())
 {
-    m_defautText = QString("Qmmp ") + Qmmp::strVersion();
     m_formater.setPattern(TITLE_FORMAT);
     m_core = SoundCore::instance();
     m_skin = Skin::instance();
diff --git a/src/plugins/Ui/skinned/textscroller.h b/src/plugins/Ui/skinned/textscroller.h
index 9b46adafd..d0bd7092b 100644
--- a/src/plugins/Ui/skinned/textscroller.h
+++ b/src/plugins/Ui/skinned/textscroller.h
@@ -37,7 +37,7 @@ class TextScroller : public QWidget
 {
 Q_OBJECT
 public:
-    TextScroller(QWidget *parent = nullptr);
+    explicit TextScroller(QWidget *parent = nullptr);
     virtual ~TextScroller();
 
     void setText(const QString &text);
diff --git a/src/plugins/Ui/skinned/togglebutton.cpp b/src/plugins/Ui/skinned/togglebutton.cpp
index 3e20cf18b..805a8319a 100644
--- a/src/plugins/Ui/skinned/togglebutton.cpp
+++ b/src/plugins/Ui/skinned/togglebutton.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2008 by Ilya Kotov                                 *
+ *   Copyright (C) 2007-2020 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   Based on Promoe, an XMMS2 Client                                      *
@@ -25,32 +25,29 @@
 #include "togglebutton.h"
 #include <QMouseEvent>
 
-ToggleButton::ToggleButton ( QWidget *parent,uint on_n,uint on_p,uint off_n,uint off_p )
-      : PixmapWidget ( parent )
+ToggleButton::ToggleButton(QWidget *parent,uint on_n,uint on_p,uint off_n,uint off_p) : PixmapWidget(parent),
+    m_on_n(on_n),
+    m_on_p(on_p),
+    m_off_n(off_n),
+    m_off_p(off_p)
 {
-   m_on_n = on_n;
-   m_on_p = on_p;
-   m_off_n = off_n;
-   m_off_p = off_p;
-   m_on = false;
-   skin = Skin::instance();
-   setChecked ( false );
-   connect ( skin, SIGNAL ( skinChanged() ), this, SLOT ( updateSkin() ) );
+   m_skin = Skin::instance();
+   setChecked(false);
+   connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin()));
 }
 
-
 ToggleButton::~ToggleButton()
 {}
 
-bool ToggleButton::isChecked()
+bool ToggleButton::isChecked() const
 {
    return m_on;
 }
 
 void ToggleButton::updateSkin()
 {
-   //setPixmap ( skin->getButton ( name_normal ) );
-   setChecked ( m_on );
+   //setPixmap(skin->getButton(name_normal));
+   setChecked(m_on);
 }
 
 void ToggleButton::click()
@@ -60,49 +57,49 @@ void ToggleButton::click()
     emit clicked(m_on);
 }
 
-void ToggleButton::setChecked ( bool on )
+void ToggleButton::setChecked(bool on)
 {
    m_on = on;
-   if ( on )
-      setPixmap ( skin->getButton ( m_on_n ) );
+   if(on)
+      setPixmap(m_skin->getButton(m_on_n));
    else
-      setPixmap ( skin->getButton ( m_off_n ) );
+      setPixmap(m_skin->getButton(m_off_n));
 }
-void ToggleButton::mousePressEvent ( QMouseEvent* )
+void ToggleButton::mousePressEvent(QMouseEvent*)
 {
    m_cursorin = true;
    m_old_on = m_on;
-   if ( m_on )
-      setPixmap ( skin->getButton ( m_off_p ) );
+   if(m_on)
+      setPixmap(m_skin->getButton(m_off_p));
    else
-      setPixmap ( skin->getButton ( m_on_p ) );
+      setPixmap(m_skin->getButton(m_on_p));
 }
 
-void ToggleButton::mouseReleaseEvent ( QMouseEvent* )
+void ToggleButton::mouseReleaseEvent(QMouseEvent*)
 {
-   if ( m_cursorin ) {
+   if(m_cursorin) {
        m_on = !m_old_on;
-       setChecked ( m_on );
-       emit clicked( m_on );
+       setChecked(m_on);
+       emit clicked( m_on);
    } else {
        m_on = m_old_on;
-       setChecked ( m_on );
+       setChecked(m_on);
    }
 }
 
 void ToggleButton::mouseMoveEvent (QMouseEvent *e)
 {
-    if ( !m_cursorin && rect().contains(e->pos()) ) {
+    if(!m_cursorin && rect().contains(e->pos())) {
         m_cursorin = true;
-        if ( m_old_on )
-            setPixmap ( skin->getButton ( m_off_p ) );
+        if(m_old_on)
+            setPixmap(m_skin->getButton(m_off_p));
         else
-            setPixmap ( skin->getButton ( m_on_p ) );            
-    } else if ( m_cursorin && !rect().contains(e->pos()) ) {
+            setPixmap(m_skin->getButton(m_on_p));
+    } else if(m_cursorin && !rect().contains(e->pos())) {
         m_cursorin = false;
-        if ( m_old_on )
-            setPixmap ( skin->getButton ( m_on_n ) );
+        if(m_old_on)
+            setPixmap(m_skin->getButton(m_on_n));
         else
-            setPixmap ( skin->getButton ( m_off_n ) );
+            setPixmap(m_skin->getButton(m_off_n));
     }
 }
diff --git a/src/plugins/Ui/skinned/togglebutton.h b/src/plugins/Ui/skinned/togglebutton.h
index b46fd4fbc..0ddca9308 100644
--- a/src/plugins/Ui/skinned/togglebutton.h
+++ b/src/plugins/Ui/skinned/togglebutton.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  *
@@ -31,10 +31,10 @@ class ToggleButton : public PixmapWidget
 {
 Q_OBJECT
 public:
-   ToggleButton( QWidget *parent, uint on_n, uint on_p, uint off_n, uint off_p );
+   ToggleButton(QWidget *parent, uint on_n, uint on_p, uint off_n, uint off_p);
    ~ToggleButton();
 
-    bool isChecked();
+    bool isChecked() const;
 
 public slots:
     void setChecked(bool);
@@ -47,10 +47,10 @@ private slots:
     void updateSkin();
 
 private:
-    Skin *skin;
+    Skin *m_skin;
     bool m_cursorin, m_old_on;
     uint m_on_n, m_on_p, m_off_n, m_off_p;
-    bool m_on;
+    bool m_on = false;
 
 protected:
     void mousePressEvent(QMouseEvent*) override;