changed playlist api

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

7 files changed, 20 insertions, 20 deletions

diff --git a/src/plugins/General/covermanager/covermanager.cpp b/src/plugins/General/covermanager/covermanager.cpp
index 60ef2ef6a..7f578da28 100644
--- a/src/plugins/General/covermanager/covermanager.cpp
+++ b/src/plugins/General/covermanager/covermanager.cpp
@@ -40,7 +40,7 @@ CoverManager::CoverManager(QObject *parent) : QObject(parent)
 
 void CoverManager::showWindow()
 {
-    QList <PlayListItem *> items = MediaPlayer::instance()->playListManager()->selectedPlayList()->getSelectedItems();
+    QList <PlayListItem *> items = MediaPlayer::instance()->playListManager()->selectedPlayList()->selectedItems();
     if (!items.isEmpty())
     {
         CoverWidget *w = new CoverWidget(qApp->activeWindow ());
diff --git a/src/plugins/General/fileops/fileops.cpp b/src/plugins/General/fileops/fileops.cpp
index 83896e6b5..535159720 100644
--- a/src/plugins/General/fileops/fileops.cpp
+++ b/src/plugins/General/fileops/fileops.cpp
@@ -85,7 +85,7 @@ void FileOps::execAction(int n)
     QString destination = m_destinations.at(n);
 
     PlayListModel *model = MediaPlayer::instance()->playListManager()->selectedPlayList();
-    QList<PlayListItem*> items = model->getSelectedItems();
+    QList<PlayListItem*> items = model->selectedItems();
 
     switch (type)
     {
diff --git a/src/plugins/General/lyrics/lyrics.cpp b/src/plugins/General/lyrics/lyrics.cpp
index f38787ded..5b2632a42 100644
--- a/src/plugins/General/lyrics/lyrics.cpp
+++ b/src/plugins/General/lyrics/lyrics.cpp
@@ -42,7 +42,7 @@ Lyrics::~Lyrics()
 void Lyrics::showLyrics()
 {
     PlayListManager *pl_manager = MediaPlayer::instance()->playListManager();
-    QList <PlayListItem *> items = pl_manager->selectedPlayList()->getSelectedItems();
+    QList <PlayListItem *> items = pl_manager->selectedPlayList()->selectedItems();
     if (!items.isEmpty())
     {
         if (items.at(0)->value(Qmmp::ARTIST).isEmpty() || items.at(0)->value(Qmmp::TITLE).isEmpty())
diff --git a/src/plugins/Ui/skinned/keyboardmanager.cpp b/src/plugins/Ui/skinned/keyboardmanager.cpp
index cbdc70c33..5a9a7e55d 100644
--- a/src/plugins/Ui/skinned/keyboardmanager.cpp
+++ b/src/plugins/Ui/skinned/keyboardmanager.cpp
@@ -72,7 +72,7 @@ bool KeyboardManager::handleKeyRelease (QKeyEvent*)
 
 void KeyboardManager::keyUp (QKeyEvent * ke)
 {
-    QList<int> rows = m_playlist->listWidget()->model()->getSelectedRows();
+    QList<int> rows = m_playlist->listWidget()->model()->selectedRows();
     ListWidget* list_widget = m_playlist->listWidget();
 
     if (rows.count() > 0)
@@ -132,7 +132,7 @@ void KeyboardManager::keyUp (QKeyEvent * ke)
             list_widget->setAnchorRow(list_widget->firstVisibleRow());
         }
 
-        rows = m_playlist->listWidget()->model()->getSelectedRows();
+        rows = m_playlist->listWidget()->model()->selectedRows();
 
         if (rows[0]  < list_widget->firstVisibleRow() && list_widget->firstVisibleRow() > 0)
         {
@@ -153,7 +153,7 @@ void KeyboardManager::keyUp (QKeyEvent * ke)
 
 void KeyboardManager::keyDown (QKeyEvent * ke)
 {
-    QList<int> rows = m_playlist->listWidget()->model()->getSelectedRows();
+    QList<int> rows = m_playlist->listWidget()->model()->selectedRows();
     ListWidget* list_widget = m_playlist->listWidget();
     //qWarning("count: %d",rows.count());
     if (rows.count() > 0)
@@ -210,7 +210,7 @@ void KeyboardManager::keyDown (QKeyEvent * ke)
             list_widget->setAnchorRow(list_widget->firstVisibleRow());
         }
 
-        rows = m_playlist->listWidget()->model()->getSelectedRows();
+        rows = m_playlist->listWidget()->model()->selectedRows();
 
         if (!rows.isEmpty() && rows.last() >= list_widget->visibleRows() + list_widget->firstVisibleRow())
         {
@@ -249,7 +249,7 @@ void KeyboardManager::keyPgDown (QKeyEvent *)
 
 void KeyboardManager::keyEnter (QKeyEvent *)
 {
-    QList<int> rows = m_playlist->listWidget()->model()->getSelectedRows();
+    QList<int> rows = m_playlist->listWidget()->model()->selectedRows();
     MainWindow* mw = qobject_cast<MainWindow*> (m_playlist->parentWidget());
     if (mw && rows.count() > 0)
     {
diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp
index be55b093e..292b14b22 100644
--- a/src/plugins/Ui/skinned/playlist.cpp
+++ b/src/plugins/Ui/skinned/playlist.cpp
@@ -582,7 +582,7 @@ void PlayList::copySelectedMenuActionTriggered( QAction * action)
         return;
     }
     QList <PlayListItem *> theCopy;
-    foreach(PlayListItem *item, m_pl_manager->selectedPlayList()->getSelectedItems())
+    foreach(PlayListItem *item, m_pl_manager->selectedPlayList()->selectedItems())
     {
         PlayListItem *newItem = new PlayListItem(*item);
         theCopy << newItem;
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index a71aef5b6..e99cd835e 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -465,7 +465,7 @@ void PlayListModel::moveItems(int from, int to)
     if (from == to)
         return;
 
-    QList<int> selected_rows = getSelectedRows();
+    QList<int> selected_rows = selectedRows();
 
     if (!(bottommostInSelection(from) == INVALID_ROW ||
             from == INVALID_ROW ||
@@ -526,11 +526,11 @@ const SimpleSelection& PlayListModel::getSelection(int row)
     m_selection.m_top = topmostInSelection(row);
     m_selection.m_anchor = row;
     m_selection.m_bottom = bottommostInSelection(row);
-    m_selection.m_selected_rows = getSelectedRows();
+    m_selection.m_selected_rows = selectedRows();
     return m_selection;
 }
 
-QList<int> PlayListModel::getSelectedRows() const
+QList<int> PlayListModel::selectedRows() const
 {
     QList<int>selected_rows;
     for (int i = 0;i<m_items.count();i++)
@@ -543,7 +543,7 @@ QList<int> PlayListModel::getSelectedRows() const
     return selected_rows;
 }
 
-QList< PlayListItem * > PlayListModel::getSelectedItems() const
+QList< PlayListItem * > PlayListModel::selectedItems() const
 {
     QList<PlayListItem*>selected_items;
     for (int i = 0;i<m_items.count();i++)
@@ -558,7 +558,7 @@ QList< PlayListItem * > PlayListModel::getSelectedItems() const
 
 void PlayListModel::addToQueue()
 {
-    QList<PlayListItem*> selected_items = getSelectedItems();
+    QList<PlayListItem*> selected_items = selectedItems();
     foreach(PlayListItem* file,selected_items)
         setQueued(file);
     emit listChanged();
@@ -766,8 +766,8 @@ void PlayListModel::doSort(int sort_mode,QList<PlayListItem*>& list_to_sort)
 
 void PlayListModel::sortSelection(int mode)
 {
-    QList<PlayListItem*>selected_items = getSelectedItems();
-    QList<int>selected_rows = getSelectedRows();
+    QList<PlayListItem*>selected_items = selectedItems();
+    QList<int>selected_rows = selectedRows();
 
     doSort(mode,selected_items);
 
@@ -919,7 +919,7 @@ void PlayListModel::clearQueue()
 
 void PlayListModel::stopAfterSelected()
 {
-    QList<PlayListItem*> selected_items = getSelectedItems();
+    QList<PlayListItem*> selected_items = selectedItems();
     if(!m_queued_songs.isEmpty())
     {
         m_stop_item = m_stop_item != m_queued_songs.last() ? m_queued_songs.last() : 0;
diff --git a/src/qmmpui/playlistmodel.h b/src/qmmpui/playlistmodel.h
index fcfefca83..190a0c78a 100644
--- a/src/qmmpui/playlistmodel.h
+++ b/src/qmmpui/playlistmodel.h
@@ -183,7 +183,7 @@ public:
      */
     QStringList getTitles(int first,int last);
     /*!
-     * Returns a list of the formated durations.
+     * Returns a list of the formatted durations.
      * @param first First item.
      * @param last Last item.
      */
@@ -224,11 +224,11 @@ public:
     /*!
      * Returns list with selected rows indexes.
      */
-    QList<int> getSelectedRows() const;
+    QList<int> selectedRows() const;
     /*!
      * Returns list of \b PlayListItem pointers that are selected.
      */
-    QList<PlayListItem*> getSelectedItems() const;
+    QList<PlayListItem*> selectedItems() const;
     /*!
      * Returns list of all \b PlayListItem pointers.
      */