refactoring

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

3 files changed, 35 insertions, 35 deletions

diff --git a/src/plugins/Ui/skinned/keyboardmanager.cpp b/src/plugins/Ui/skinned/keyboardmanager.cpp
index a7685011b..b86c04753 100644
--- a/src/plugins/Ui/skinned/keyboardmanager.cpp
+++ b/src/plugins/Ui/skinned/keyboardmanager.cpp
@@ -75,18 +75,18 @@ void KeyboardManager::keyUp (QKeyEvent * ke)
 
     if(rows.isEmpty())
     {
-        m_listWidget->model()->setSelected(m_listWidget->firstVisibleRow(), true);
-        m_listWidget->setAnchorRow(m_listWidget->firstVisibleRow());
+        m_listWidget->model()->setSelected(m_listWidget->firstVisibleIndex(), true);
+        m_listWidget->setAnchorIndex(m_listWidget->firstVisibleIndex());
         return;
     }
 
     if (! (ke->modifiers() & Qt::ShiftModifier || ke->modifiers() & Qt::AltModifier))
     {
         m_listWidget->model()->clearSelection();
-        m_listWidget->setAnchorRow(-1);
+        m_listWidget->setAnchorIndex(-1);
     }
 
-    int first_visible = m_listWidget->firstVisibleRow();
+    int first_visible = m_listWidget->firstVisibleIndex();
     int last_visible = m_listWidget->visibleRows() + first_visible - 1;
 
     int s = SELECT_NEXT;
@@ -101,7 +101,7 @@ void KeyboardManager::keyUp (QKeyEvent * ke)
         if(rows.first() == 0)
             return;
         m_listWidget->model()->moveItems (rows.first(), rows.first() - 1);
-        m_listWidget->setAnchorRow (rows.first() - 1);
+        m_listWidget->setAnchorIndex (rows.first() - 1);
     }
 
     else
@@ -109,28 +109,28 @@ void KeyboardManager::keyUp (QKeyEvent * ke)
         if(s == SELECT_TOP)
         {
             m_listWidget->model()->setSelected (first_visible, true);
-            m_listWidget->setAnchorRow(first_visible);
+            m_listWidget->setAnchorIndex(first_visible);
         }
         else if(s == SELECT_BOTTOM)
         {
             m_listWidget->model()->setSelected (last_visible, true);
-            m_listWidget->setAnchorRow(last_visible);
+            m_listWidget->setAnchorIndex(last_visible);
         }
         else if(rows.first() == 0)
         {
             m_listWidget->model()->setSelected (rows.first(), true);
-            m_listWidget->setAnchorRow(rows.first());
+            m_listWidget->setAnchorIndex(rows.first());
         }
         else
         {
             m_listWidget->model()->setSelected (rows.first() - 1, true);
-            m_listWidget->setAnchorRow(rows.first() - 1);
+            m_listWidget->setAnchorIndex(rows.first() - 1);
         }
     }
 
-    if(m_listWidget->anchorRow() < first_visible)
+    if(m_listWidget->anchorIndex() < first_visible)
     {
-        m_listWidget->scroll (m_listWidget->firstVisibleRow() - 1);
+        m_listWidget->scroll (m_listWidget->firstVisibleIndex() - 1);
     }
 }
 
@@ -140,18 +140,18 @@ void KeyboardManager::keyDown (QKeyEvent * ke)
 
     if(rows.isEmpty())
     {
-        m_listWidget->model()->setSelected(m_listWidget->firstVisibleRow(), true);
-        m_listWidget->setAnchorRow(m_listWidget->firstVisibleRow());
+        m_listWidget->model()->setSelected(m_listWidget->firstVisibleIndex(), true);
+        m_listWidget->setAnchorIndex(m_listWidget->firstVisibleIndex());
         return;
     }
 
     if (! (ke->modifiers() & Qt::ShiftModifier || ke->modifiers() & Qt::AltModifier))
     {
         m_listWidget->model()->clearSelection();
-        m_listWidget->setAnchorRow(-1);
+        m_listWidget->setAnchorIndex(-1);
     }
 
-    int first_visible = m_listWidget->firstVisibleRow();
+    int first_visible = m_listWidget->firstVisibleIndex();
     int last_visible = m_listWidget->visibleRows() + first_visible - 1;
 
     int s = SELECT_NEXT;
@@ -166,50 +166,50 @@ void KeyboardManager::keyDown (QKeyEvent * ke)
         if(rows.last() == m_listWidget->model()->count() - 1)
             return;
         m_listWidget->model()->moveItems (rows.last(), rows.last() + 1);
-        m_listWidget->setAnchorRow (rows.last() + 1);
+        m_listWidget->setAnchorIndex (rows.last() + 1);
     }
     else
     {
         if(s == SELECT_TOP)
         {
             m_listWidget->model()->setSelected (first_visible, true);
-            m_listWidget->setAnchorRow(first_visible);
+            m_listWidget->setAnchorIndex(first_visible);
         }
         else if(s == SELECT_BOTTOM)
         {
             m_listWidget->model()->setSelected (last_visible, true);
-            m_listWidget->setAnchorRow(last_visible);
+            m_listWidget->setAnchorIndex(last_visible);
         }
         else if(rows.last() == m_listWidget->model()->count() - 1)
         {
             m_listWidget->model()->setSelected (rows.last(), true);
-            m_listWidget->setAnchorRow(rows.last());
+            m_listWidget->setAnchorIndex(rows.last());
         }
         else
         {
             m_listWidget->model()->setSelected (rows.last() + 1, true);
-            m_listWidget->setAnchorRow(rows.last() + 1);
+            m_listWidget->setAnchorIndex(rows.last() + 1);
         }
     }
 
-    if(m_listWidget->anchorRow() > last_visible)
+    if(m_listWidget->anchorIndex() > last_visible)
     {
-        m_listWidget->scroll (m_listWidget->firstVisibleRow() + 1);
+        m_listWidget->scroll (m_listWidget->firstVisibleIndex() + 1);
     }
 }
 
 void KeyboardManager::keyPgUp (QKeyEvent *)
 {
     int page_size = m_listWidget->visibleRows();
-    int offset= (m_listWidget->firstVisibleRow()-page_size >= 0) ?m_listWidget->firstVisibleRow()-page_size:0;
+    int offset= (m_listWidget->firstVisibleIndex()-page_size >= 0) ?m_listWidget->firstVisibleIndex()-page_size:0;
     m_listWidget->scroll (offset);
 }
 
 void KeyboardManager::keyPgDown (QKeyEvent *)
 {
     int page_size = m_listWidget->visibleRows();
-    int offset = (m_listWidget->firstVisibleRow() +page_size < m_listWidget->model()->count()) ?
-                 m_listWidget->firstVisibleRow() +page_size:m_listWidget->model()->count() - 1;
+    int offset = (m_listWidget->firstVisibleIndex() +page_size < m_listWidget->model()->count()) ?
+                 m_listWidget->firstVisibleIndex() +page_size:m_listWidget->model()->count() - 1;
     m_listWidget->scroll (offset);
 }
 
@@ -230,7 +230,7 @@ void KeyboardManager::keyHome(QKeyEvent *ke)
     m_listWidget->scroll (0);
     if(ke->modifiers() & Qt::ShiftModifier)
     {
-       for(int i = 0; i <= m_listWidget->anchorRow(); ++i)
+       for(int i = 0; i <= m_listWidget->anchorIndex(); ++i)
            m_listWidget->model()->setSelected (i, true);
     }
 }
@@ -243,7 +243,7 @@ void KeyboardManager::keyEnd(QKeyEvent *ke)
        m_listWidget->scroll(scroll_to);
    if(ke->modifiers() & Qt::ShiftModifier)
    {
-       for(int i = m_listWidget->anchorRow(); i < m_listWidget->model()->count(); ++i)
+       for(int i = m_listWidget->anchorIndex(); i < m_listWidget->model()->count(); ++i)
            m_listWidget->model()->setSelected (i, true);
    }
 }
diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp
index c85a9cbf8..52b998f9c 100644
--- a/src/plugins/Ui/skinned/listwidget.cpp
+++ b/src/plugins/Ui/skinned/listwidget.cpp
@@ -119,19 +119,19 @@ int ListWidget::visibleRows() const
     return m_row_count;
 }
 
-int ListWidget::firstVisibleRow() const
+int ListWidget::firstVisibleIndex() const
 {
     return m_first;
 }
 
-int ListWidget::anchorRow() const
+int ListWidget::anchorIndex() const
 {
     return m_anchor_index;
 }
 
-void ListWidget::setAnchorRow(int r)
+void ListWidget::setAnchorIndex(int index)
 {
-    m_anchor_index = r;
+    m_anchor_index = index;
     update();
 }
 
diff --git a/src/plugins/Ui/skinned/listwidget.h b/src/plugins/Ui/skinned/listwidget.h
index e75906662..ac28cf701 100644
--- a/src/plugins/Ui/skinned/listwidget.h
+++ b/src/plugins/Ui/skinned/listwidget.h
@@ -68,12 +68,12 @@ public:
      */
     int visibleRows() const;
     /*!
-     * Returns number of first visible row.
+     * Returns index of the first visible item.
      */
-    int firstVisibleRow() const;
+    int firstVisibleIndex() const;
 
-    int anchorRow() const;
-    void setAnchorRow(int r);
+    int anchorIndex() const;
+    void setAnchorIndex(int index);
     QMenu *menu();
     PlayListModel *model();