Author: mir3x
Date: Sun Jan 29 21:18:09 2017
New Revision: 34901

URL: http://svn.gna.org/viewcvs/freeciv?rev=34901&view=rev
Log:
Qt client - replace deprecated qSort with std::sort

See patch #8091


Modified:
    trunk/client/gui-qt/repodlgs.cpp
    trunk/client/gui-qt/sidebar.cpp

Modified: trunk/client/gui-qt/repodlgs.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/repodlgs.cpp?rev=34901&r1=34900&r2=34901&view=diff
==============================================================================
--- trunk/client/gui-qt/repodlgs.cpp    (original)
+++ trunk/client/gui-qt/repodlgs.cpp    Sun Jan 29 21:18:09 2017
@@ -552,8 +552,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: trunk/client/gui-qt/sidebar.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/sidebar.cpp?rev=34901&r1=34900&r2=34901&view=diff
==============================================================================
--- trunk/client/gui-qt/sidebar.cpp     (original)
+++ trunk/client/gui-qt/sidebar.cpp     Sun Jan 29 21:18:09 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

Reply via email to