optimization

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

3 files changed, 10 insertions, 11 deletions

diff --git a/src/qmmpui/groupedcontainer.cpp b/src/qmmpui/groupedcontainer.cpp
index d83cea287..cc2d662a7 100644
--- a/src/qmmpui/groupedcontainer.cpp
+++ b/src/qmmpui/groupedcontainer.cpp
@@ -220,14 +220,14 @@ PlayListTrack *GroupedContainer::track(int index) const
     PlayListItem *i = item(index);
     if(!i || i->isGroup())
         return nullptr;
-    return dynamic_cast<PlayListTrack *> (i);
+    return static_cast<PlayListTrack *> (i);
 }
 
 PlayListGroup *GroupedContainer::group(int index) const
 {
     PlayListItem *i = item(index);
     if(i && i->isGroup())
-        return dynamic_cast<PlayListGroup *> (i);
+        return static_cast<PlayListGroup *> (i);
     return nullptr;
 }
 
diff --git a/src/qmmpui/normalcontainer.cpp b/src/qmmpui/normalcontainer.cpp
index 51d8fc839..9c4d009f5 100644
--- a/src/qmmpui/normalcontainer.cpp
+++ b/src/qmmpui/normalcontainer.cpp
@@ -74,7 +74,7 @@ QList<PlayListTrack *> NormalContainer::tracks() const
 {
     QList<PlayListTrack *> trackList;
     for(int i = 0; i < m_items.count(); ++i)
-        trackList.append(dynamic_cast<PlayListTrack *>(m_items[i]));
+        trackList.append(static_cast<PlayListTrack *>(m_items[i]));
     return trackList;
 }
 
@@ -142,7 +142,7 @@ PlayListItem *NormalContainer::item(int index) const
 PlayListTrack *NormalContainer::track(int index) const
 {
     PlayListItem *i = item(index);
-    return dynamic_cast<PlayListTrack *> (i);
+    return static_cast<PlayListTrack *> (i);
 }
 
 PlayListGroup *NormalContainer::group(int index) const
@@ -167,7 +167,7 @@ PlayListTrack *NormalContainer::findTrack(int number) const
     {
         return nullptr;
     }
-    return dynamic_cast<PlayListTrack *> (m_items.at(number));
+    return static_cast<PlayListTrack *> (m_items.at(number));
 }
 
 void NormalContainer::removeTrack(PlayListTrack *track)
@@ -220,7 +220,7 @@ QList<PlayListTrack *> NormalContainer::takeAllTracks()
 {
     QList<PlayListTrack *> tracks;
     while(!m_items.isEmpty())
-        tracks.append(dynamic_cast<PlayListTrack *>(m_items.takeFirst()));
+        tracks.append(static_cast<PlayListTrack *>(m_items.takeFirst()));
     return tracks;
 }
 
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index d4f4c6a50..794cf8a2e 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -1106,26 +1106,25 @@ void PlayListModel::clearQueue()
 void PlayListModel::stopAfterSelected()
 {
     QList<PlayListTrack*> selected_tracks = selectedTracks();
-    int flags = STOP_AFTER;
+
     if(!m_queued_songs.isEmpty())
     {
         m_stop_track = m_stop_track != m_queued_songs.last() ? m_queued_songs.last() : nullptr;
+        emit listChanged(STOP_AFTER);
     }
     else if(selected_tracks.count() == 1)
     {
         m_stop_track = m_stop_track != selected_tracks.at(0) ? selected_tracks.at(0) : nullptr;
+        emit listChanged(STOP_AFTER);
     }
     else if(selected_tracks.count() > 1)
     {
         blockSignals(true);
         addToQueue();
         blockSignals(false);
-        flags |= QUEUE;
         m_stop_track = m_queued_songs.last();
+        emit listChanged(STOP_AFTER | QUEUE);
     }
-    else
-        return;
-    emit listChanged(flags);
 }
 
 void PlayListModel::rebuildGroups()