From cb00190c3e104d4c7998b6f80183202a15534bd3 Mon Sep 17 00:00:00 2001 From: scribam Date: Sat, 26 Aug 2017 07:36:06 +0200 Subject: [PATCH] [Qt] Replace deprecated qSort function by std::sort --- rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp | 2 +- rpcs3/rpcs3qt/settings_dialog.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp b/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp index 056c1804b4..51b1665fdb 100644 --- a/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp @@ -177,7 +177,7 @@ void auto_pause_settings_dialog::ShowContextMenu(const QPoint &pos) void auto_pause_settings_dialog::OnRemove() { 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--) { m_entries.erase(m_entries.begin() + selection.at(i).row()); diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index bd558edf9a..5a7549cd54 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -280,28 +280,28 @@ settings_dialog::settings_dialog(std::shared_ptr xSettings, const auto l_OnSearchBoxTextChanged = [=](QString text) { QString searchTerm = text.toLower(); - QList list; + std::vector 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++) { - list.append(ui->lleList->item(i)->clone()); + items.push_back(ui->lleList->item(i)->clone()); } - // sort list - qSort(list.begin(), list.end(), [](QListWidgetItem *i1, QListWidgetItem *i2) { + // sort items: checked items first then alphabetical order + std::sort(items.begin(), items.end(), [](QListWidgetItem *i1, QListWidgetItem *i2) { return (i1->checkState() != i2->checkState()) ? (i1->checkState() > i2->checkState()) : (i1->text() < i2->text()); }); // refill library list 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 - ui->lleList->setRowHidden(i, !list.at(i)->text().contains(searchTerm)); + ui->lleList->setRowHidden(i, !items[i]->text().contains(searchTerm)); } };