Mercurial > ldforge / file diff

--- a/src/primitives.cpp	Sun Aug 30 05:30:17 2015 +0300
+++ b/src/primitives.cpp	Sun Aug 30 15:01:10 2015 +0300
@@ -131,7 +131,7 @@
 //
 void PrimitiveScanner::work()
 {
-	int j = Min (m_i + 100, m_files.size());
+	int j = qMin (m_i + 100, m_files.size());
 
 	for (; m_i < j; ++m_i)
 	{
@@ -582,7 +582,7 @@
 	// Truncate the root if necessary (7-16rin4.dat for instance).
 	// However, always keep the root at least 2 characters.
 	int extra = (frac.length() + numstr.length() + root.length()) - 8;
-	root.chop (Clamp (extra, 0, 2));
+	root.chop (qBound (0, extra, 2));
 
 	// Stick them all together and return the result.
 	return prefix + frac + root + numstr + ".dat";