mirror of https://github.com/RPCS3/rpcs3.git
[Qt] Replace deprecated qSort function by std::sort
This commit is contained in:
parent
8fdf1b23a3
commit
cb00190c3e
|
@ -177,7 +177,7 @@ void auto_pause_settings_dialog::ShowContextMenu(const QPoint &pos)
|
||||||
void auto_pause_settings_dialog::OnRemove()
|
void auto_pause_settings_dialog::OnRemove()
|
||||||
{
|
{
|
||||||
QModelIndexList selection = pauseList->selectionModel()->selectedRows();
|
QModelIndexList selection = pauseList->selectionModel()->selectedRows();
|
||||||
qSort(selection.begin(), selection.end()); // crash on unordered
|
std::sort(selection.begin(), selection.end());
|
||||||
for (int i = selection.count() - 1; i >= 0; i--)
|
for (int i = selection.count() - 1; i >= 0; i--)
|
||||||
{
|
{
|
||||||
m_entries.erase(m_entries.begin() + selection.at(i).row());
|
m_entries.erase(m_entries.begin() + selection.at(i).row());
|
||||||
|
|
|
@ -280,28 +280,28 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
|
||||||
auto l_OnSearchBoxTextChanged = [=](QString text)
|
auto l_OnSearchBoxTextChanged = [=](QString text)
|
||||||
{
|
{
|
||||||
QString searchTerm = text.toLower();
|
QString searchTerm = text.toLower();
|
||||||
QList<QListWidgetItem*> list;
|
std::vector<QListWidgetItem*> items;
|
||||||
|
|
||||||
// create list. we need clones to preserve checkstates
|
// duplicate current items, we need clones to preserve checkstates
|
||||||
for (int i = 0; i < ui->lleList->count(); i++)
|
for (int i = 0; i < ui->lleList->count(); i++)
|
||||||
{
|
{
|
||||||
list.append(ui->lleList->item(i)->clone());
|
items.push_back(ui->lleList->item(i)->clone());
|
||||||
}
|
}
|
||||||
|
|
||||||
// sort list
|
// sort items: checked items first then alphabetical order
|
||||||
qSort(list.begin(), list.end(), [](QListWidgetItem *i1, QListWidgetItem *i2) {
|
std::sort(items.begin(), items.end(), [](QListWidgetItem *i1, QListWidgetItem *i2) {
|
||||||
return (i1->checkState() != i2->checkState()) ? (i1->checkState() > i2->checkState()) : (i1->text() < i2->text());
|
return (i1->checkState() != i2->checkState()) ? (i1->checkState() > i2->checkState()) : (i1->text() < i2->text());
|
||||||
});
|
});
|
||||||
|
|
||||||
// refill library list
|
// refill library list
|
||||||
ui->lleList->clear();
|
ui->lleList->clear();
|
||||||
|
|
||||||
for (int i = 0; i < list.count(); i++)
|
for (uint i = 0; i < items.size(); i++)
|
||||||
{
|
{
|
||||||
ui->lleList->addItem(list.at(i));
|
ui->lleList->addItem(items[i]);
|
||||||
|
|
||||||
// only show items filtered for search text
|
// only show items filtered for search text
|
||||||
ui->lleList->setRowHidden(i, !list.at(i)->text().contains(searchTerm));
|
ui->lleList->setRowHidden(i, !items[i]->text().contains(searchTerm));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue