anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename a var "sort" to not mask std::sort()

Browse Source 
This allows us to use sort() without the "std" prefix.
This commit is contained in:
Scott Kostyshak 2020-03-05 12:16:26 -05:00
parent 14f369b47f
commit 27ca2bd950
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/frontends/qt/GuiRef.cpp
View File

@ -495,14 +495,14 @@ void GuiRef::redoRefs()
if (noprefix) if (noprefix)
refsCategories.insert(0, qt_("<No prefix>")); refsCategories.insert(0, qt_("<No prefix>"));
QString const sort = sortingCO->isEnabled() ? QString const sort_method = sortingCO->isEnabled() ?
sortingCO->itemData(sortingCO->currentIndex()).toString() sortingCO->itemData(sortingCO->currentIndex()).toString()
: QString(); : QString();
if (sort == "nocase") if (sort_method == "nocase")
std::sort(refsStrings.begin(), refsStrings.end(), sort(refsStrings.begin(), refsStrings.end(),
caseInsensitiveLessThan /*defined above*/); caseInsensitiveLessThan /*defined above*/);
else if (sort == "case") else if (sort_method == "case")
std::sort(refsStrings.begin(), refsStrings.end()); sort(refsStrings.begin(), refsStrings.end());
if (groupCB->isChecked()) { if (groupCB->isChecked()) {
QList<QTreeWidgetItem *> refsCats; QList<QTreeWidgetItem *> refsCats;