libtaskmanager: Port to `std::accumulate`

Fixes "Consider using std::accumulate algorithm instead of a raw loop."
wilder-5.25
Fushan Wen 4 years ago
parent ff834fc965
commit 2a8670abc3
No known key found for this signature in database
GPG Key ID: 2E48D1487C91DCAA
  1. 21
      libtaskmanager/tasksmodel.cpp

@ -893,24 +893,15 @@ bool TasksModel::Private::lessThan(const QModelIndex &left, const QModelIndex &r
// activity. This will sort tasks by comparing a cumulative score made // activity. This will sort tasks by comparing a cumulative score made
// up of the task counts for each activity a task is assigned to, and // up of the task counts for each activity a task is assigned to, and
// otherwise fall through to alphabetical sorting. // otherwise fall through to alphabetical sorting.
int leftScore = -1;
int rightScore = -1;
const QStringList &leftActivities = left.data(AbstractTasksModel::Activities).toStringList(); const QStringList &leftActivities = left.data(AbstractTasksModel::Activities).toStringList();
int leftScore = std::accumulate(leftActivities.cbegin(), leftActivities.cend(), -1, [this](int a, const QString &activity) {
if (!leftActivities.isEmpty()) { return a + activityTaskCounts[activity];
foreach (const QString &activity, leftActivities) { });
leftScore += activityTaskCounts[activity];
}
}
const QStringList &rightActivities = right.data(AbstractTasksModel::Activities).toStringList(); const QStringList &rightActivities = right.data(AbstractTasksModel::Activities).toStringList();
int rightScore = std::accumulate(rightActivities.cbegin(), rightActivities.cend(), -1, [this](int a, const QString &activity) {
if (!rightActivities.isEmpty()) { return a + activityTaskCounts[activity];
foreach (const QString &activity, rightActivities) { });
rightScore += activityTaskCounts[activity];
}
}
if (leftScore == -1 || rightScore == -1) { if (leftScore == -1 || rightScore == -1) {
const int sumScore = std::accumulate(activityTaskCounts.constBegin(), activityTaskCounts.constEnd(), 0); const int sumScore = std::accumulate(activityTaskCounts.constBegin(), activityTaskCounts.constEnd(), 0);

Loading…
Cancel
Save