fixed possible regressions

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

6 files changed, 56 insertions, 37 deletions

diff --git a/src/qmmpui/fileloader.cpp b/src/qmmpui/fileloader.cpp
index e4f557ac6..a03bb18c7 100644
--- a/src/qmmpui/fileloader.cpp
+++ b/src/qmmpui/fileloader.cpp
@@ -45,7 +45,7 @@ FileLoader::~FileLoader()
 QList<PlayListTrack *> FileLoader::processFile(const QString &path, QStringList *ignoredPaths)
 {
     QList<PlayListTrack *> tracks;
-    QList <TrackInfo *> infoList = MetaDataManager::instance()->createPlayList(path, m_parts, ignoredPaths);
+    const QList<TrackInfo *> infoList = MetaDataManager::instance()->createPlayList(path, m_parts, ignoredPaths);
 
     for(TrackInfo *info : qAsConst(infoList))
     {
@@ -132,27 +132,25 @@ void FileLoader::insertPlayList(const QString &path, PlayListItem *before)
             filters << QRegExp(pattern, Qt::CaseInsensitive, QRegExp::Wildcard);
 
 
-        for(PlayListTrack *t : qAsConst(tracks))
+        QList<PlayListTrack *>::iterator it = tracks.begin();
+        while(it != tracks.end())
         {
-            if(t->path().contains("://"))
+            if((*it)->path().contains("://") && !protocols.contains((*it)->path().section("://", 0, 0)))
             {
-                if(!protocols.contains(t->path().section("://",0,0)))
-                {
-                    tracks.removeAll(t);
-                    delete t;
-                }
+                delete (*it);
+                it = tracks.erase(it);
             }
-            else if(!QFile::exists(t->path()))
+            else if(!QFile::exists((*it)->path()))
             {
-                tracks.removeAll(t);
-                delete t;
+                delete (*it);
+                it = tracks.erase(it);
             }
             else
             {
                 bool found = false;
                 for(const QRegExp &filter : qAsConst(filters))
                 {
-                    if(filter.exactMatch(t->path()))
+                    if(filter.exactMatch((*it)->path()))
                     {
                         found = true;
                         break;
@@ -160,8 +158,12 @@ void FileLoader::insertPlayList(const QString &path, PlayListItem *before)
                 }
                 if(!found)
                 {
-                    tracks.removeAll(t);
-                    delete t;
+                    delete (*it);
+                    it = tracks.erase(it);
+                }
+                else
+                {
+                    ++it;
                 }
             }
         }
@@ -384,12 +386,17 @@ void FileLoader::removeIgnoredTracks(QList<PlayListTrack *> *tracks, const QStri
     if(ignoredPaths.isEmpty())
         return;
 
-    for(PlayListTrack *track : qAsConst(*tracks))
+    QList<PlayListTrack *>::iterator it = tracks->begin();
+    while(it != tracks->end())
     {
-        if(ignoredPaths.contains(track->path()))
+        if(ignoredPaths.contains((*it)->path()))
+        {
+            delete (*it);
+            it = tracks->erase(it);
+        }
+        else
         {
-            tracks->removeAll(track);
-            delete track;
+            ++it;
         }
     }
 }
diff --git a/src/qmmpui/groupedcontainer.cpp b/src/qmmpui/groupedcontainer.cpp
index 32e096221..f460c6309 100644
--- a/src/qmmpui/groupedcontainer.cpp
+++ b/src/qmmpui/groupedcontainer.cpp
@@ -268,20 +268,22 @@ PlayListTrack *GroupedContainer::findTrack(int number) const
 
 void GroupedContainer::removeTrack(PlayListTrack *track)
 {
-    for(PlayListGroup *group : qAsConst(m_groups))
+    QList<PlayListGroup *>::iterator it = m_groups.begin();
+    while(it != m_groups.end())
     {
-        if(group->contains(track))
+        if((*it)->contains(track))
         {
-            group->trackList.removeAll(track);
+            (*it)->trackList.removeAll(track);
             m_items.removeAll(track);
-            if(group->isEmpty())
+            if((*it)->isEmpty())
             {
-                m_groups.removeAll(group);
-                m_items.removeAll(group);
-                delete group;
+                m_groups.removeAll(*it);
+                m_items.removeAll(*it);
+                delete *it;
             }
             return;
         }
+        ++it;
     }
 }
 
@@ -320,7 +322,7 @@ bool GroupedContainer::move(QList<int> indexes, int from, int to)
     if(!group)
         return false;
 
-    for(const int &i : qAsConst(indexes))
+    for(int i : qAsConst(indexes))
     {
         if(i <= firstIndex || i > lastIndex)
             return false;
diff --git a/src/qmmpui/playlistmanager.cpp b/src/qmmpui/playlistmanager.cpp
index d04c6de15..dc6145480 100644
--- a/src/qmmpui/playlistmanager.cpp
+++ b/src/qmmpui/playlistmanager.cpp
@@ -349,7 +349,7 @@ void PlayListManager::writePlayLists()
         plFile.write(QString("playlist=%1\n").arg(model->name()).toUtf8());
         if(model->isEmpty())
             continue;
-        QList<PlayListItem *> items = model->items();
+        const QList<PlayListItem *> items = model->items();
         plFile.write(QString("current=%1\n").arg(model->indexOfTrack(model->currentIndex())).toUtf8());
         for(PlayListItem *m : qAsConst(items))
         {
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index 876c42e84..4d3cb040d 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -815,7 +815,7 @@ QList<PlayListItem *> PlayListModel::items() const
 
 void PlayListModel::addToQueue()
 {
-    QList<PlayListTrack*> selected_tracks = selectedTracks();
+    const QList<PlayListTrack*> selected_tracks = selectedTracks();
     blockSignals(true);
     for(PlayListTrack *track : qAsConst(selected_tracks))
         setQueued(track);
@@ -976,12 +976,17 @@ void PlayListModel::onTaskFinished()
                 flags |= STOP_AFTER;
             }
 
-            for(PlayListTrack *t : qAsConst(m_queued_songs))
+            QList<PlayListTrack *>::iterator it = m_queued_songs.begin();
+            while(it != m_queued_songs.end())
             {
-                if(!m_container->contains(t))
+                if(!m_container->contains(*it))
                 {
                     flags |= QUEUE;
-                    m_queued_songs.removeAll(t);
+                    it = m_queued_songs.erase(it);
+                }
+                else
+                {
+                    ++it;
                 }
             }
 
diff --git a/src/qmmpui/playlistparser.cpp b/src/qmmpui/playlistparser.cpp
index 656000245..da2e64eec 100644
--- a/src/qmmpui/playlistparser.cpp
+++ b/src/qmmpui/playlistparser.cpp
@@ -121,7 +121,7 @@ QList<PlayListTrack *> PlayListParser::loadPlaylist(const QString &f_name)
         return QList<PlayListTrack *>();
     }
 
-    QList <PlayListTrack*> tracks = prs->decode(file.readAll());
+    const QList<PlayListTrack*> tracks = prs->decode(file.readAll());
 
     if(tracks.isEmpty())
     {
diff --git a/src/qmmpui/playlisttask.cpp b/src/qmmpui/playlisttask.cpp
index ab40c9e76..d326536f6 100644
--- a/src/qmmpui/playlisttask.cpp
+++ b/src/qmmpui/playlisttask.cpp
@@ -475,13 +475,18 @@ void PlayListTask::run()
         }
         //remove dublicate URLs and ignored files
         //this code prevents re-addition of cue tracks
-        for(PlayListTrack *t : qAsConst(m_new_tracks))
+        QList<PlayListTrack *>::iterator it = m_new_tracks.begin();
+        while(it != m_new_tracks.end())
         {
-            if((t->path().contains("://") && urls.contains(t->path())) ||
-                    ignoredFiles.contains(t->path()))
+            if(((*it)->path().contains("://") && urls.contains((*it)->path())) ||
+                    ignoredFiles.contains((*it)->path()))
             {
-                m_new_tracks.removeAll(t);
-                delete t;
+                delete (*it);
+                it = m_new_tracks.erase(it);
+            }
+            else
+            {
+                ++it;
             }
         }
     }