w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-06-04 15:04:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace deprecated Qt algorithms with C++ Standard Library equivalents

Browse Source
This commit is contained in:
Bill Somerville
2018-11-25 22:13:15 +00:00
parent 86fb68f305
commit 314d8a645b
4 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
models/FrequencyList.cpp
+5 -9
View File
@@ -3,6 +3,7 @@
#include <cstdlib>
#include <utility>
#include <limits>
#include <algorithm>
#include <QMetaType>
#include <QAbstractTableModel>
@@ -350,14 +351,6 @@ bool FrequencyList_v2::remove (Item f)
return m_->removeRow (row);
}
namespace
{
bool row_is_higher (QModelIndex const& lhs, QModelIndex const& rhs)
{
return lhs.row () > rhs.row ();
}
}
bool FrequencyList_v2::removeDisjointRows (QModelIndexList rows)
{
bool result {true};
@@ -371,7 +364,10 @@ bool FrequencyList_v2::removeDisjointRows (QModelIndexList rows)
}
// reverse sort by row
qSort (rows.begin (), rows.end (), row_is_higher);
std::sort (rows.begin (), rows.end (), [] (QModelIndex const& lhs, QModelIndex const& rhs)
{
return rhs.row () < lhs.row (); // reverse row ordering
});
Q_FOREACH (auto index, rows)
{
if (result && !m_->removeRow (index.row ()))