skinned: refactoring

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

4 files changed, 12 insertions, 12 deletions

diff --git a/src/plugins/Ui/skinned/keyboardmanager.cpp b/src/plugins/Ui/skinned/keyboardmanager.cpp
index aef054584..dc78b9119 100644
--- a/src/plugins/Ui/skinned/keyboardmanager.cpp
+++ b/src/plugins/Ui/skinned/keyboardmanager.cpp
@@ -139,7 +139,7 @@ void KeyboardManager::keyUp (QKeyEvent * ke)
 
     if(m_listWidget->anchorIndex() < first_visible)
     {
-        m_listWidget->scroll (m_listWidget->firstVisibleIndex() - 1);
+        m_listWidget->setViewPosition (m_listWidget->firstVisibleIndex() - 1);
     }
 }
 
@@ -214,7 +214,7 @@ void KeyboardManager::keyDown (QKeyEvent * ke)
 
     if(m_listWidget->anchorIndex() > last_visible)
     {
-        m_listWidget->scroll (m_listWidget->firstVisibleIndex() + 1);
+        m_listWidget->setViewPosition (m_listWidget->firstVisibleIndex() + 1);
     }
 }
 
@@ -223,7 +223,7 @@ void KeyboardManager::keyPgUp (QKeyEvent *)
     int page_size = m_listWidget->visibleRows();
     int first = m_listWidget->firstVisibleIndex();
     int offset = qMax(first - page_size, 0);
-    m_listWidget->scroll (offset);
+    m_listWidget->setViewPosition (offset);
 
     m_listWidget->model()->clearSelection();
     if(m_listWidget->firstVisibleIndex() == first)
@@ -238,7 +238,7 @@ void KeyboardManager::keyPgDown (QKeyEvent *)
     int page_size = m_listWidget->visibleRows();
     int first = m_listWidget->firstVisibleIndex();
     int offset = qMin(first + page_size, m_listWidget->model()->count() - 1);
-    m_listWidget->scroll (offset);
+    m_listWidget->setViewPosition (offset);
 
     m_listWidget->model()->clearSelection();
     if(m_listWidget->firstVisibleIndex() == first)
@@ -262,7 +262,7 @@ void KeyboardManager::keyEnter (QKeyEvent *)
 
 void KeyboardManager::keyHome(QKeyEvent *ke)
 {
-    m_listWidget->scroll (0);
+    m_listWidget->setViewPosition (0);
     if(ke->modifiers() & Qt::ShiftModifier)
     {
         m_listWidget->model()->setSelected (0, m_listWidget->anchorIndex(), true);
@@ -278,7 +278,7 @@ void KeyboardManager::keyHome(QKeyEvent *ke)
 void KeyboardManager::keyEnd(QKeyEvent *ke)
 {
    int scroll_to = qMax(m_listWidget->model()->count() - m_listWidget->visibleRows(), 0);
-   m_listWidget->scroll(scroll_to);
+   m_listWidget->setViewPosition(scroll_to);
    if(ke->modifiers() & Qt::ShiftModifier)
    {
        m_listWidget->model()->setSelected (m_listWidget->anchorIndex(), m_listWidget->model()->count() - 1, true);
diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp
index a1a46de95..23f92e576 100644
--- a/src/plugins/Ui/skinned/listwidget.cpp
+++ b/src/plugins/Ui/skinned/listwidget.cpp
@@ -72,7 +72,7 @@ ListWidget::ListWidget(QWidget *parent)
     connect(m_skin, SIGNAL(skinChanged()), SLOT(updateSkin()));
     connect(m_ui_settings, SIGNAL(repeatableTrackChanged(bool)), SLOT(updateRepeatIndicator()));
     connect(m_timer, SIGNAL(timeout()), SLOT(autoscroll()));
-    connect(m_hslider, SIGNAL(sliderMoved(int)), m_header, SLOT(scroll(int)));
+    connect(m_hslider, SIGNAL(sliderMoved(int)), m_header, SLOT(setViewPosition(int)));
     connect(m_hslider, SIGNAL(sliderMoved(int)), this, SLOT(update()));
     SET_ACTION(ActionManager::PL_SHOW_HEADER, this, SLOT(readSettings()));
 }
@@ -184,7 +184,7 @@ void ListWidget::mouseDoubleClickEvent (QMouseEvent *e)
     if (INVALID_INDEX != index)
     {
         m_model->setCurrent(index);
-        emit selectionChanged();
+        emit doubleClicked();
         update();
     }
 }
@@ -463,7 +463,7 @@ void ListWidget::setModel(PlayListModel *selected, PlayListModel *previous)
     connect (m_model, SIGNAL(sortingByColumnFinished(int,bool)), m_header, SLOT(showSortIndicator(int,bool)));
 }
 
-void ListWidget::scroll(int sc)
+void ListWidget::setViewPosition(int sc)
 {
     if (m_model->count() <= m_row_count)
         return;
diff --git a/src/plugins/Ui/skinned/listwidget.h b/src/plugins/Ui/skinned/listwidget.h
index 42157dbb8..30fb59091 100644
--- a/src/plugins/Ui/skinned/listwidget.h
+++ b/src/plugins/Ui/skinned/listwidget.h
@@ -69,11 +69,11 @@ public:
 public slots:
     void readSettings();
     void updateList(int flags);
-    void scroll(int);
+    void setViewPosition(int);
     void setModel(PlayListModel *selected, PlayListModel *previous = 0);
 
 signals:
-    void selectionChanged();
+    void doubleClicked();
     void positionChanged(int, int); //current position, maximum value
 
 protected:
diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp
index 93b15e6ac..a8b6b83f3 100644
--- a/src/plugins/Ui/skinned/playlist.cpp
+++ b/src/plugins/Ui/skinned/playlist.cpp
@@ -105,7 +105,7 @@ PlayList::PlayList (PlayListManager *manager, QWidget *parent)
     m_current_time = new SymbolDisplay (this,6);
     m_keyboardManager = new KeyboardManager (m_listWidget);
 
-    connect (m_listWidget, SIGNAL (selectionChanged()), parent, SLOT (replay()));
+    connect (m_listWidget, SIGNAL (doubleClicked()), parent, SLOT (replay()));
 
     connect (m_plslider, SIGNAL (sliderMoved (int)), m_listWidget, SLOT (scroll (int)));
     connect (m_listWidget, SIGNAL (positionChanged (int, int)), m_plslider,