From 2fe45d334cccaa911cd52bb57a261f56e9e333ee Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 19 Sep 2011 15:49:06 +0000 Subject: changed playlist api git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2356 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/covermanager/covermanager.cpp | 2 +- src/plugins/General/fileops/fileops.cpp | 2 +- src/plugins/General/lyrics/lyrics.cpp | 2 +- src/plugins/Ui/skinned/keyboardmanager.cpp | 10 +++++----- src/plugins/Ui/skinned/playlist.cpp | 2 +- src/qmmpui/playlistmodel.cpp | 16 ++++++++-------- src/qmmpui/playlistmodel.h | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src') 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 items = MediaPlayer::instance()->playListManager()->selectedPlayList()->getSelectedItems(); + QList 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 items = model->getSelectedItems(); + QList 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 items = pl_manager->selectedPlayList()->getSelectedItems(); + QList 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 rows = m_playlist->listWidget()->model()->getSelectedRows(); + QList 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 rows = m_playlist->listWidget()->model()->getSelectedRows(); + QList 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 rows = m_playlist->listWidget()->model()->getSelectedRows(); + QList rows = m_playlist->listWidget()->model()->selectedRows(); MainWindow* mw = qobject_cast (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 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 selected_rows = getSelectedRows(); + QList 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 PlayListModel::getSelectedRows() const +QList PlayListModel::selectedRows() const { QListselected_rows; for (int i = 0;i PlayListModel::getSelectedRows() const return selected_rows; } -QList< PlayListItem * > PlayListModel::getSelectedItems() const +QList< PlayListItem * > PlayListModel::selectedItems() const { QListselected_items; for (int i = 0;i PlayListModel::getSelectedItems() const void PlayListModel::addToQueue() { - QList selected_items = getSelectedItems(); + QList selected_items = selectedItems(); foreach(PlayListItem* file,selected_items) setQueued(file); emit listChanged(); @@ -766,8 +766,8 @@ void PlayListModel::doSort(int sort_mode,QList& list_to_sort) void PlayListModel::sortSelection(int mode) { - QListselected_items = getSelectedItems(); - QListselected_rows = getSelectedRows(); + QListselected_items = selectedItems(); + QListselected_rows = selectedRows(); doSort(mode,selected_items); @@ -919,7 +919,7 @@ void PlayListModel::clearQueue() void PlayListModel::stopAfterSelected() { - QList selected_items = getSelectedItems(); + QList 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 getSelectedRows() const; + QList selectedRows() const; /*! * Returns list of \b PlayListItem pointers that are selected. */ - QList getSelectedItems() const; + QList selectedItems() const; /*! * Returns list of all \b PlayListItem pointers. */ -- cgit v1.2.3-13-gbd6f