min -> qMin
authorsheepluva
Fri, 31 Aug 2012 13:36:00 +0200
changeset 7636 10caa79d4a80
parent 7635 7a8b2f04c7dd
child 7637 60b213e5ded3
min -> qMin
QTfrontend/hwform.cpp
--- a/QTfrontend/hwform.cpp	Fri Aug 31 12:06:48 2012 +0200
+++ b/QTfrontend/hwform.cpp	Fri Aug 31 13:36:00 2012 +0200
@@ -1613,7 +1613,7 @@
     unsigned int n = missionEntries.count();
     unsigned int m = getCampProgress(tName, campaignName);
 
-    for (unsigned int i = min(m + 1, n); i > 0; i--)
+    for (unsigned int i = qMin(m + 1, n); i > 0; i--)
     {
         ui.pageCampaign->CBMission->addItem(QString("Mission %1: ").arg(i) + QString(missionEntries[i-1]), QString(missionEntries[i-1]));
     }