5 files changed, 19 insertions, 21 deletions

diff --git a/src/plugins/Ui/skinned/button.h b/src/plugins/Ui/skinned/button.h
index e00bd7dc7..e4c0b38b2 100644
--- a/src/plugins/Ui/skinned/button.h
+++ b/src/plugins/Ui/skinned/button.h
@@ -32,7 +32,6 @@ class Button : public PixmapWidget
 Q_OBJECT
 public:
     Button(QWidget *parent, uint normal, uint pressed, uint cursor);
-
     ~Button();
 
 signals:
diff --git a/src/plugins/Ui/skinned/display.cpp b/src/plugins/Ui/skinned/display.cpp
index 612de33ef..265736788 100644
--- a/src/plugins/Ui/skinned/display.cpp
+++ b/src/plugins/Ui/skinned/display.cpp
@@ -249,7 +249,7 @@ void MainDisplay::setSampleRate(quint32 rate)
 void MainDisplay::setEQ (QWidget* w)
 {
     m_equlizer = w;
-    m_eqButton->setON (m_equlizer->isVisible());
+    m_eqButton->setChecked (m_equlizer->isVisible());
     ACTION(ActionManager::SHOW_EQUALIZER)->setChecked(m_equlizer->isVisible());
 
     connect (ACTION(ActionManager::SHOW_EQUALIZER), SIGNAL(triggered(bool)),
@@ -266,7 +266,7 @@ void MainDisplay::setEQ (QWidget* w)
 void MainDisplay::setPL (QWidget* w)
 {
     m_playlist = w;
-    m_plButton->setON (m_playlist->isVisible());
+    m_plButton->setChecked (m_playlist->isVisible());
     ACTION(ActionManager::SHOW_PLAYLIST)->setChecked(m_playlist->isVisible());
 
     connect (ACTION(ActionManager::SHOW_PLAYLIST), SIGNAL(triggered(bool)),
@@ -338,12 +338,12 @@ bool MainDisplay::isShuffle() const
 
 void MainDisplay::setIsRepeatable(bool yes)
 {
-    m_repeatButton->setON(yes);
+    m_repeatButton->setChecked(yes);
 }
 
 void MainDisplay::setIsShuffle(bool yes)
 {
-    m_shuffleButton->setON(yes);
+    m_shuffleButton->setChecked(yes);
 }
 
 void MainDisplay::mousePressEvent(QMouseEvent *e)
diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp
index 1a11fd473..ff223eee2 100644
--- a/src/plugins/Ui/skinned/eqwidget.cpp
+++ b/src/plugins/Ui/skinned/eqwidget.cpp
@@ -235,7 +235,7 @@ void EqWidget::readEq()
     EqSettings eqSettings = SoundCore::instance()->eqSettings();
     if(eqSettings.bands() != 10)
     {
-        m_on->setON(false);
+        m_on->setChecked(false);
         return;
     }
     m_preamp->setValue(eqSettings.preamp());
@@ -244,7 +244,7 @@ void EqWidget::readEq()
         m_sliders.at(i)->setValue(eqSettings.gain(i));
         m_eqg->addValue(m_sliders.at(i)->value());
     }
-    m_on->setON(eqSettings.isEnabled());
+    m_on->setChecked(eqSettings.isEnabled());
 }
 
 void EqWidget::writeEq()
diff --git a/src/plugins/Ui/skinned/togglebutton.cpp b/src/plugins/Ui/skinned/togglebutton.cpp
index 994ac9f20..1530268a9 100644
--- a/src/plugins/Ui/skinned/togglebutton.cpp
+++ b/src/plugins/Ui/skinned/togglebutton.cpp
@@ -34,7 +34,7 @@ ToggleButton::ToggleButton ( QWidget *parent,uint on_n,uint on_p,uint off_n,uint
    m_off_p = off_p;
    m_on = false;
    skin = Skin::instance();
-   setON ( false );
+   setChecked ( false );
    connect ( skin, SIGNAL ( skinChanged() ), this, SLOT ( updateSkin() ) );
 }
 
@@ -50,17 +50,17 @@ bool ToggleButton::isChecked()
 void ToggleButton::updateSkin()
 {
    //setPixmap ( skin->getButton ( name_normal ) );
-   setON ( m_on );
+   setChecked ( m_on );
 }
 
 void ToggleButton::click()
 {
     m_on = !m_on;
-    setON (m_on);
+    setChecked (m_on);
     emit clicked(m_on);
 }
 
-void ToggleButton::setON ( bool on )
+void ToggleButton::setChecked ( bool on )
 {
    m_on = on;
    if ( on )
@@ -82,11 +82,11 @@ void ToggleButton::mouseReleaseEvent ( QMouseEvent* )
 {
    if ( m_cursorin ) {
        m_on = !m_old_on;
-       setON ( m_on );
+       setChecked ( m_on );
        emit clicked( m_on );
    } else {
        m_on = m_old_on;
-       setON ( m_on );
+       setChecked ( m_on );
    }
 }
 
diff --git a/src/plugins/Ui/skinned/togglebutton.h b/src/plugins/Ui/skinned/togglebutton.h
index 220d427cc..ddc1bbc00 100644
--- a/src/plugins/Ui/skinned/togglebutton.h
+++ b/src/plugins/Ui/skinned/togglebutton.h
@@ -23,7 +23,7 @@
 #include "pixmapwidget.h"
 
 /**
-	@author Ilya Kotov <forkotov02@hotmail.ru>
+    @author Ilya Kotov <forkotov02@hotmail.ru>
 */
 class Skin;
 
@@ -31,19 +31,18 @@ class ToggleButton : public PixmapWidget
 {
 Q_OBJECT
 public:
-  ToggleButton( QWidget *parent, uint on_n, uint on_p, uint off_n, uint off_p );
-
-    ~ToggleButton();
+   ToggleButton( QWidget *parent, uint on_n, uint on_p, uint off_n, uint off_p );
+   ~ToggleButton();
 
     bool isChecked();
 
-signals:
-    void clicked(bool);
-
 public slots:
-    void setON(bool);
+    void setChecked(bool);
     void click();
 
+signals:
+    void clicked(bool);
+
 private slots:
     void updateSkin();