refactoring

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

8 files changed, 18 insertions, 30 deletions

diff --git a/src/plugins/Ui/skinned/balancebar.cpp b/src/plugins/Ui/skinned/balancebar.cpp
index 496464afb..e87065681 100644
--- a/src/plugins/Ui/skinned/balancebar.cpp
+++ b/src/plugins/Ui/skinned/balancebar.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2012 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2019 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -32,14 +32,9 @@ BalanceBar::BalanceBar(QWidget *parent)
     m_skin = Skin::instance();
     connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin()));
     setPixmap(m_skin->getBalanceBar(0));
-    m_moving = false;
-    m_min = -100;
-    m_max = 100;
-    m_old = m_value = 0;
     draw(false);
 }
 
-
 BalanceBar::~BalanceBar()
 {}
 
diff --git a/src/plugins/Ui/skinned/balancebar.h b/src/plugins/Ui/skinned/balancebar.h
index 8ee130ebd..8672d12c0 100644
--- a/src/plugins/Ui/skinned/balancebar.h
+++ b/src/plugins/Ui/skinned/balancebar.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2012 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2019 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -51,9 +51,9 @@ private slots:
 
 private:
     Skin *m_skin;
-    bool m_moving;
+    bool m_moving = false;
     int press_pos;
-    int m_max, m_min, m_pos, m_value, m_old;
+    int m_max = 100, m_min = -100, m_pos, m_value = 0, m_old = 0;
     QPixmap m_pixmap;
     int convert(int);   // value = convert(position);
     void draw(bool pressed = true);
diff --git a/src/plugins/Ui/skinned/button.cpp b/src/plugins/Ui/skinned/button.cpp
index d38346ad6..bb4b8b2e3 100644
--- a/src/plugins/Ui/skinned/button.cpp
+++ b/src/plugins/Ui/skinned/button.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2012 by Ilya Kotov                                 *
+ *   Copyright (C) 2007-2019 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   Based on Promoe, an XMMS2 Client                                      *
@@ -31,11 +31,10 @@ Button::Button (QWidget *parent, uint normal, uint pressed, uint cursor)
     name_normal = normal;
     name_pressed = pressed;
     name_cursor = cursor;
-    m_pressed = false;
-    skin = Skin::instance();
+    m_skin = Skin::instance();
     setON (false);
-    setCursor (skin->getCursor (name_cursor));
-    connect (skin, SIGNAL (skinChanged()), this, SLOT (updateSkin()));
+    setCursor (m_skin->getCursor (name_cursor));
+    connect (m_skin, SIGNAL (skinChanged()), this, SLOT (updateSkin()));
 }
 
 
@@ -44,16 +43,16 @@ Button::~Button()
 
 void Button::updateSkin()
 {
-    setPixmap (skin->getButton (name_normal));
-    setCursor (skin->getCursor (name_cursor));
+    setPixmap (m_skin->getButton (name_normal));
+    setCursor (m_skin->getCursor (name_cursor));
 }
 
 void Button::setON (bool on)
 {
     if (on)
-        setPixmap (skin->getButton (name_pressed));
+        setPixmap (m_skin->getButton (name_pressed));
     else
-        setPixmap (skin->getButton (name_normal));
+        setPixmap (m_skin->getButton (name_normal));
 }
 void Button::mousePressEvent (QMouseEvent *e)
 {
diff --git a/src/plugins/Ui/skinned/button.h b/src/plugins/Ui/skinned/button.h
index 5d687c2fb..d6c877962 100644
--- a/src/plugins/Ui/skinned/button.h
+++ b/src/plugins/Ui/skinned/button.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2012 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2019 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -41,9 +41,9 @@ private slots:
     void updateSkin();
 
 private:
-    Skin *skin;
+    Skin *m_skin;
     //bool m_cursorin;
-    bool m_pressed;
+    bool m_pressed = false;
     void setON(bool);
     uint name_normal, name_pressed;
     uint name_cursor;
diff --git a/src/plugins/Ui/skinned/display.cpp b/src/plugins/Ui/skinned/display.cpp
index 2ae37d308..c013ed5c6 100644
--- a/src/plugins/Ui/skinned/display.cpp
+++ b/src/plugins/Ui/skinned/display.cpp
@@ -46,7 +46,6 @@
 MainDisplay::MainDisplay (MainWindow *parent)
         : PixmapWidget (parent)
 {
-    m_shaded = false;
     m_skin = Skin::instance();
     setPixmap (m_skin->getMain());
     setCursor(m_skin->getCursor(Skin::CUR_NORMAL));
diff --git a/src/plugins/Ui/skinned/display.h b/src/plugins/Ui/skinned/display.h
index 25c7bdc83..a3f141e0e 100644
--- a/src/plugins/Ui/skinned/display.h
+++ b/src/plugins/Ui/skinned/display.h
@@ -91,7 +91,7 @@ private:
     void updateMask();
     QWidget* m_equlizer;
     QWidget* m_playlist;
-    bool m_shaded;
+    bool m_shaded = false;
     Skin *m_skin;
     PositionBar *m_posbar;
     Button *m_previous;
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index 57b0f9bde..01429c5e3 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -57,11 +57,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 {
 #ifdef QMMP_WS_X11
     qDebug("MainWindow: detected wm: %s", qPrintable(WindowSystem::netWindowManagerName()));
-#endif
-    m_vis = nullptr;
-    m_update = false;
-
-#ifdef QMMP_WS_X11
     QString wm_name = WindowSystem::netWindowManagerName();
     if(wm_name.contains("Marco", Qt::CaseInsensitive) ||
             wm_name.contains("Metacity", Qt::CaseInsensitive) ||
diff --git a/src/plugins/Ui/skinned/mainwindow.h b/src/plugins/Ui/skinned/mainwindow.h
index 176009958..018657ac9 100644
--- a/src/plugins/Ui/skinned/mainwindow.h
+++ b/src/plugins/Ui/skinned/mainwindow.h
@@ -106,8 +106,8 @@ private:
     PlayList *m_playlist;
     PlayListManager *m_pl_manager;
     EqWidget *m_equalizer;
-    MainVisual *m_vis;
-    bool m_update;
+    MainVisual *m_vis = nullptr;
+    bool m_update = false;
     Skin *m_skin;
     bool m_hideOnClose, m_startHidden;
     VisualMenu *m_visMenu;