added playlists auto-save feauture (patch by Ferdinand Vesely) (Closes

issue 536), changed playlist api


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

7 files changed, 16 insertions, 16 deletions

diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
index eb86f57a7..8e8f12c7e 100644
--- a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
+++ b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
@@ -84,7 +84,7 @@ QString PlayListOption::executeCommand(const QString& opt_str, const QStringList
         for(int i = 0; i < model->count(); ++i)
         {
             out += QString("%1. %2").arg(i+1).arg(formatter.parse(model->item(i)));
-            if(i == model->currentRow())
+            if(i == model->currentIndex())
                 out += " [*]";
             out += "\n";
         }
diff --git a/src/plugins/General/fileops/fileops.cpp b/src/plugins/General/fileops/fileops.cpp
index e14c208f7..245c4fe20 100644
--- a/src/plugins/General/fileops/fileops.cpp
+++ b/src/plugins/General/fileops/fileops.cpp
@@ -194,7 +194,7 @@ void FileOps::execAction(int n)
         foreach(PlayListItem *item, items)
         {
             if (QFile::exists(item->url()) && QFile::remove(item->url()))
-                model->removeAt (model->row(item));
+                model->removeAt (model->indexOf(item));
         }
     }
 }
diff --git a/src/plugins/General/mpris/mpris1/tracklistobject.cpp b/src/plugins/General/mpris/mpris1/tracklistobject.cpp
index 5b31fe725..9576a902a 100644
--- a/src/plugins/General/mpris/mpris1/tracklistobject.cpp
+++ b/src/plugins/General/mpris/mpris1/tracklistobject.cpp
@@ -71,7 +71,7 @@ void TrackListObject::DelTrack(int in0)
 
 int TrackListObject::GetCurrentTrack()
 {
-    return m_model->currentRow();
+    return m_model->currentIndex();
 }
 
 int TrackListObject::GetLength()
diff --git a/src/plugins/General/mpris/mpris2/player2object.cpp b/src/plugins/General/mpris/mpris2/player2object.cpp
index 78c77997b..d3dc81171 100644
--- a/src/plugins/General/mpris/mpris2/player2object.cpp
+++ b/src/plugins/General/mpris/mpris2/player2object.cpp
@@ -64,7 +64,7 @@ bool Player2Object::canGoNext() const
 
 bool Player2Object::canGoPrevious() const
 {
-    return m_pl_manager->currentPlayList()->currentRow() > 0;
+    return m_pl_manager->currentPlayList()->currentIndex() > 0;
 }
 
 bool Player2Object::canPause() const
diff --git a/src/plugins/Ui/skinned/keyboardmanager.cpp b/src/plugins/Ui/skinned/keyboardmanager.cpp
index 88bd8dc0d..1576ea6db 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()->selectedRows();
+    QList<int> rows = m_playlist->listWidget()->model()->selectedIndexes();
     ListWidget* list_widget = m_playlist->listWidget();
 
     if (rows.count() > 0)
@@ -134,7 +134,7 @@ void KeyboardManager::keyUp (QKeyEvent * ke)
             list_widget->setAnchorRow(list_widget->firstVisibleRow());
         }
 
-        rows = m_playlist->listWidget()->model()->selectedRows();
+        rows = m_playlist->listWidget()->model()->selectedIndexes();
 
         if (rows.first()  < list_widget->firstVisibleRow() && list_widget->firstVisibleRow() > 0)
         {
@@ -155,7 +155,7 @@ void KeyboardManager::keyUp (QKeyEvent * ke)
 
 void KeyboardManager::keyDown (QKeyEvent * ke)
 {
-    QList<int> rows = m_playlist->listWidget()->model()->selectedRows();
+    QList<int> rows = m_playlist->listWidget()->model()->selectedIndexes();
     ListWidget* list_widget = m_playlist->listWidget();
     //qWarning("count: %d",rows.count());
     if (rows.count() > 0)
@@ -214,7 +214,7 @@ void KeyboardManager::keyDown (QKeyEvent * ke)
             list_widget->setAnchorRow(list_widget->firstVisibleRow());
         }
 
-        rows = m_playlist->listWidget()->model()->selectedRows();
+        rows = m_playlist->listWidget()->model()->selectedIndexes();
 
         if (!rows.isEmpty() && rows.last() >= list_widget->visibleRows() + list_widget->firstVisibleRow())
         {
@@ -253,7 +253,7 @@ void KeyboardManager::keyPgDown (QKeyEvent *)
 
 void KeyboardManager::keyEnter (QKeyEvent *)
 {
-    QList<int> rows = m_playlist->listWidget()->model()->selectedRows();
+    QList<int> rows = m_playlist->listWidget()->model()->selectedIndexes();
     MainWindow* mw = qobject_cast<MainWindow*> (m_playlist->parentWidget());
     if (mw && rows.count() > 0)
     {
diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp
index a296ac53c..a327cc127 100644
--- a/src/plugins/Ui/skinned/listwidget.cpp
+++ b/src/plugins/Ui/skinned/listwidget.cpp
@@ -148,7 +148,7 @@ void ListWidget::paintEvent(QPaintEvent *)
             }
         }
 
-        if (m_model->currentRow() == i + m_first)
+        if (m_model->currentIndex() == i + m_first)
             m_painter.setPen(m_current);
         else
             m_painter.setPen(m_normal);  //243,58
@@ -459,7 +459,7 @@ const QString ListWidget::getExtraString(int i)
         extra_string += "|"+QString::number(index + 1)+"|";
     }
 
-    if(m_model->currentRow() == i && m_player->isRepeatable())
+    if(m_model->currentIndex() == i && m_player->isRepeatable())
         extra_string += "|R|";
     else if(m_model->isStopAfter(m_model->item(i)))
         extra_string += "|S|";
@@ -557,10 +557,10 @@ void ListWidget::recenterCurrent()
 {
     if (!m_scroll && m_rows)
     {
-        if (m_first + m_rows < m_model->currentRow() + 1)
+        if (m_first + m_rows < m_model->currentIndex() + 1)
             m_first = qMin(m_model->count() - m_rows,
-                           m_model->currentRow() - m_rows/2);
-        else if (m_first > m_model->currentRow())
-            m_first = qMax (m_model->currentRow() - m_rows/2, 0);
+                           m_model->currentIndex() - m_rows/2);
+        else if (m_first > m_model->currentIndex())
+            m_first = qMax (m_model->currentIndex() - m_rows/2, 0);
     }
 }
diff --git a/src/plugins/Ui/skinned/playlisttitlebar.cpp b/src/plugins/Ui/skinned/playlisttitlebar.cpp
index 85e993215..4682cd7c7 100644
--- a/src/plugins/Ui/skinned/playlisttitlebar.cpp
+++ b/src/plugins/Ui/skinned/playlisttitlebar.cpp
@@ -261,7 +261,7 @@ void PlayListTitleBar::showCurrent()
         PlayListItem* info = m_model->currentItem();
         if (info)
         {
-            m_text = QString("%1. ").arg(m_model->currentRow()+1);
+            m_text = QString("%1. ").arg(m_model->currentIndex()+1);
             m_text.append(info->text());
             m_text.append(QString("  (%1:%2)").arg(info->length()/60)
                           .arg(info->length()%60, 2, 10, QChar('0')));