Author: mir3x
Date: Sun Jan 29 21:17:43 2017
New Revision: 34899
URL: http://svn.gna.org/viewcvs/freeciv?rev=34899&view=rev
Log:
Qt client - replace deprecated qSort with std::sort
See patch #8091
Modified:
branches/S2_6/client/gui-qt/repodlgs.cpp
branches/S2_6/client/gui-qt/sidebar.cpp
Modified: branches/S2_6/client/gui-qt/repodlgs.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/repodlgs.cpp?rev=34899&r1=34898&r2=34899&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/repodlgs.cpp (original)
+++ branches/S2_6/client/gui-qt/repodlgs.cpp Sun Jan 29 21:17:43 2017
@@ -553,8 +553,8 @@
} advance_index_iterate_end;
/** sort both lists */
- qSort(goal_list->begin(), goal_list->end(), comp_less_than);
- qSort(curr_list->begin(), curr_list->end(), comp_less_than);
+ std::sort(goal_list->begin(), goal_list->end(), comp_less_than);
+ std::sort(curr_list->begin(), curr_list->end(), comp_less_than);
/** fill combo boxes */
researching_combo->blockSignals(true);
Modified: branches/S2_6/client/gui-qt/sidebar.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/sidebar.cpp?rev=34899&r1=34898&r2=34899&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/sidebar.cpp (original)
+++ branches/S2_6/client/gui-qt/sidebar.cpp Sun Jan 29 21:17:43 2017
@@ -717,7 +717,7 @@
if (curr_list.isEmpty()) {
return;
}
- qSort(curr_list.begin(), curr_list.end(), comp_less_than);
+ std::sort(curr_list.begin(), curr_list.end(), comp_less_than);
menu = new QMenu(gui()->central_wdg);
for (int i = 0; i < curr_list.count(); i++) {
qvar = curr_list.at(i).id;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
