ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Qt] Replace deprecated qSort function by std::sort

This commit is contained in:
scribam 2017-08-26 07:36:06 +02:00 committed by Ani
parent 8fdf1b23a3
commit cb00190c3e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp
View File

@ -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());

16
rpcs3/rpcs3qt/settings_dialog.cpp
View File

@ -280,28 +280,28 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
auto l_OnSearchBoxTextChanged = [=](QString text)
{
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++)
{
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));
}
};