From 6cf6bc2f667ea229d3864a8767982bdecab7b146 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Thu, 13 Aug 2020 10:46:51 +0000 Subject: coding style fixes git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9472 90c681e8-e032-0410-971d-27865f9a5e38 --- src/qmmpui/playlistmodel.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'src/qmmpui/playlistmodel.cpp') diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp index 3b5ae17ed..9c44acc3b 100644 --- a/src/qmmpui/playlistmodel.cpp +++ b/src/qmmpui/playlistmodel.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include "metadatahelper_p.h" @@ -39,14 +40,11 @@ #define INVALID_INDEX -1 PlayListModel::PlayListModel(const QString &name, QObject *parent) - : QObject(parent) , m_selection() + : QObject(parent) , m_name(name) { qsrand(time(nullptr)); m_ui_settings = QmmpUiSettings::instance(); - m_total_duration = 0; - m_current = 0; - m_stop_track = nullptr; - m_name = name; + m_loader = new FileLoader(this); m_task = new PlayListTask(this); if(m_ui_settings->isGroupsEnabled()) @@ -728,11 +726,8 @@ void PlayListModel::moveItems(int from, int to) if(selected_indexes.isEmpty()) return; - for(const int &i : qAsConst(selected_indexes)) //do no move groups - { - if(!isTrack(i)) - return; - } + if(std::any_of(selected_indexes.cbegin(), selected_indexes.cend(), [this](int i){ return !isTrack(i); })) + return; if (bottommostInSelection(from) == INVALID_INDEX || from == INVALID_INDEX || @@ -959,7 +954,7 @@ void PlayListModel::onTaskFinished() || m_task->type() == PlayListTask::REFRESH) { PlayListTrack *prev_current_track = m_current_track; - bool prev_count = m_container->count(); + int prev_count = m_container->count(); m_container->replaceTracks(m_task->takeResults(&m_current_track)); -- cgit v1.2.3-13-gbd6f