Fix use of banned methods

nyalldawson · nyalldawson · commit 8bf3d23afa86 · 2018-06-17T11:13:41.000+10:00
diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp
@@ -4019,27 +4019,27 @@ void QgsDxfExport::clipValueToMapUnitScale( double &value, const QgsMapUnitScale
 
   double mapUnitsPerPixel = mMapSettings.mapToPixel().mapUnitsPerPixel();
 
-  double minSizeMU = -DBL_MAX;
+  double minSizeMU = std::numeric_limits<double>::lowest();
   if ( scale.minSizeMMEnabled )
   {
     minSizeMU = scale.minSizeMM * pixelToMMFactor * mapUnitsPerPixel;
   }
   if ( !qgsDoubleNear( scale.minScale, 0.0 ) )
   {
-    minSizeMU = qMax( minSizeMU, value );
+    minSizeMU = std::max( minSizeMU, value );
   }
-  value = qMax( value, minSizeMU );
+  value = std::max( value, minSizeMU );
 
-  double maxSizeMU = DBL_MAX;
+  double maxSizeMU = std::numeric_limits<double>::max();
   if ( scale.maxSizeMMEnabled )
   {
     maxSizeMU = scale.maxSizeMM * pixelToMMFactor * mapUnitsPerPixel;
   }
   if ( !qgsDoubleNear( scale.maxScale, 0.0 ) )
   {
-    maxSizeMU = qMin( maxSizeMU, value );
+    maxSizeMU = std::min( maxSizeMU, value );
   }
-  value = qMin( value, maxSizeMU );
+  value = std::min( value, maxSizeMU );
 }
 
 QList< QPair< QgsSymbolLayer *, QgsSymbol * > > QgsDxfExport::symbolLayers( QgsRenderContext &context )

Original file line number	Diff line number	Diff line change
`@@ -4019,27 +4019,27 @@ void QgsDxfExport::clipValueToMapUnitScale( double &value, const QgsMapUnitScale`
`4019`	`4019`
`4020`	`4020`	`double mapUnitsPerPixel = mMapSettings.mapToPixel().mapUnitsPerPixel();`
`4021`	`4021`
`4022`		`- double minSizeMU = -DBL_MAX;`
	`4022`	`+ double minSizeMU = std::numeric_limits<double>::lowest();`
`4023`	`4023`	`if ( scale.minSizeMMEnabled )`
`4024`	`4024`	`{`
`4025`	`4025`	`minSizeMU = scale.minSizeMM * pixelToMMFactor * mapUnitsPerPixel;`
`4026`	`4026`	`}`
`4027`	`4027`	`if ( !qgsDoubleNear( scale.minScale, 0.0 ) )`
`4028`	`4028`	`{`
`4029`		`- minSizeMU = qMax( minSizeMU, value );`
	`4029`	`+ minSizeMU = std::max( minSizeMU, value );`
`4030`	`4030`	`}`
`4031`		`- value = qMax( value, minSizeMU );`
	`4031`	`+ value = std::max( value, minSizeMU );`
`4032`	`4032`
`4033`		`- double maxSizeMU = DBL_MAX;`
	`4033`	`+ double maxSizeMU = std::numeric_limits<double>::max();`
`4034`	`4034`	`if ( scale.maxSizeMMEnabled )`
`4035`	`4035`	`{`
`4036`	`4036`	`maxSizeMU = scale.maxSizeMM * pixelToMMFactor * mapUnitsPerPixel;`
`4037`	`4037`	`}`
`4038`	`4038`	`if ( !qgsDoubleNear( scale.maxScale, 0.0 ) )`
`4039`	`4039`	`{`
`4040`		`- maxSizeMU = qMin( maxSizeMU, value );`
	`4040`	`+ maxSizeMU = std::min( maxSizeMU, value );`
`4041`	`4041`	`}`
`4042`		`- value = qMin( value, maxSizeMU );`
	`4042`	`+ value = std::min( value, maxSizeMU );`
`4043`	`4043`	`}`
`4044`	`4044`
`4045`	`4045`	`QList< QPair< QgsSymbolLayer , QgsSymbol > > QgsDxfExport::symbolLayers( QgsRenderContext &context )`