use qRound() fro round() (followup ad437bf)

jef-n · jef-n · commit 88bc309c637f · 2012-08-29T14:32:04.000+02:00
diff --git a/src/app/qgsdecorationgrid.cpp b/src/app/qgsdecorationgrid.cpp
@@ -51,10 +51,6 @@
 #include <cmath>
 
 
-#ifdef _MSC_VER
-#define round(x)  ((x) >= 0 ? floor((x)+0.5) : floor((x)-0.5))
-#endif
-
 #define FONT_WORKAROUND_SCALE 10 //scale factor for upscaling fontsize and downscaling painter
 
 
@@ -808,7 +804,7 @@ bool QgsDecorationGrid::getIntervalFromExtent( double* values, bool useXAxis )
     int factor =  pow( 10, floor( log10( interval ) ) );
     if ( factor != 0 )
     {
-      interval2 = round( interval / factor ) * factor;
+      interval2 = qRound( interval / factor ) * factor;
       QgsDebugMsg( QString( "interval2: %1" ).arg( interval2 ) );
       if ( interval2 != 0 )
         interval = interval2;
diff --git a/src/app/qgsdecorationnortharrow.cpp b/src/app/qgsdecorationnortharrow.cpp
@@ -43,10 +43,6 @@ email                : tim@linfiniti.com
 #include <cassert>
 
 
-#ifdef _MSC_VER
-#define round(x)  ((x) >= 0 ? floor((x)+0.5) : floor((x)-0.5))
-#endif
-
 const double QgsDecorationNorthArrow::PI = 3.14159265358979323846;
 //  const double QgsNorthArrowPlugin::DEG2RAD = 0.0174532925199433;
 const double QgsDecorationNorthArrow::TOL = 1e-8;
@@ -298,7 +294,7 @@ bool QgsDecorationNorthArrow::calculateNorthDirection()
       }
       // And set the angle of the north arrow. Perhaps do something
       // different if goodDirn = false.
-      mRotationInt = static_cast<int>( round( fmod( 360.0 - angle * 180.0 / PI, 360.0 ) ) );
+      mRotationInt = qRound( fmod( 360.0 - angle * 180.0 / PI, 360.0 ) );
     }
     else
     {
diff --git a/src/app/qgsdecorationscalebar.cpp b/src/app/qgsdecorationscalebar.cpp
@@ -48,11 +48,6 @@ email                : sbr00pwb@users.sourceforge.net
 #include <cmath>
 
 
-#ifdef _MSC_VER
-#define round(x)  ((x) >= 0 ? floor((x)+0.5) : floor((x)-0.5))
-#endif
-
-
 QgsDecorationScaleBar::QgsDecorationScaleBar( QObject* parent )
     : QgsDecorationItem( parent )
 {
@@ -164,7 +159,7 @@ void QgsDecorationScaleBar::render( QPainter * theQPainter )
     if ( mSnapping )
     {
       double scaler = pow( 10.0, myPowerOf10 );
-      myActualSize = round( myActualSize / scaler ) * scaler;
+      myActualSize = qRound( myActualSize / scaler ) * scaler;
       myScaleBarWidth = myActualSize / myMapUnitsPerPixelDouble;
     }
 
diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -214,7 +214,7 @@ int QgsComposition::pixelFontSize( double pointSize ) const
 {
   //in QgsComposition, one unit = one mm
   double sizeMillimeters = pointSize * 0.3527;
-  return ( sizeMillimeters + 0.5 ); //round to nearest mm
+  return qRound( sizeMillimeters ); //round to nearest mm
 }
 
 double QgsComposition::pointFontSize( int pixelSize ) const
diff --git a/src/gui/qgsmaptool.cpp b/src/gui/qgsmaptool.cpp
@@ -64,7 +64,7 @@ QPoint QgsMapTool::toCanvasCoordinates( const QgsPoint& point )
 {
   double x = point.x(), y = point.y();
   mCanvas->getCoordinateTransform()->transformInPlace( x, y );
-  return QPoint(( int )( x + 0.5 ), ( int )( y + 0.5 ) ); // round the values
+  return QPoint( qRound( x ), qRound( y ) );
 }
 
 
diff --git a/src/gui/qgsquickprint.cpp b/src/gui/qgsquickprint.cpp
@@ -50,10 +50,6 @@
 //other includes
 #include <cmath>
 
-#ifdef _MSC_VER
-#define round(x)  ((x) >= 0 ? floor((x)+0.5) : floor((x)-0.5))
-#endif
-
 QgsQuickPrint::QgsQuickPrint()
 {
   mPageSize = QPrinter::A4;
@@ -813,7 +809,7 @@ void QgsQuickPrint::renderPrintScaleBar( QPainter * thepPainter,
   if ( mySnappingFlag )
   {
     double scaler = pow( 10.0, myPowerOf10 );
-    myActualSize = round( myActualSize / scaler ) * scaler;
+    myActualSize = qRound( myActualSize / scaler ) * scaler;
     myScaleBarWidth = myActualSize / myMapUnitsPerPixelDouble;
   }
 
diff --git a/src/plugins/grass/qgsgrassedit.cpp b/src/plugins/grass/qgsgrassedit.cpp
@@ -50,11 +50,6 @@ extern "C"
 #include <grass/Vect.h>
 }
 
-#ifdef _MSC_VER
-#define round(x)  ((x) >= 0 ? floor((x)+0.5) : floor((x)-0.5))
-#endif
-
-
 class QgsGrassEditLayer : public QgsMapCanvasItem
 {
   public:
@@ -1718,8 +1713,7 @@ void QgsGrassEdit::displayElement( int line, const QPen & pen, int size, QPainte
       point.setX( mPoints->x[i] );
       point.setY( mPoints->y[i] );
       point = transformLayerToCanvas( point );
-      pointArray.setPoint( i, static_cast<int>( round( point.x() ) ),
-                           static_cast<int>( round( point.y() ) ) );
+      pointArray.setPoint( i, qRound( point.x() ), qRound( point.y() ) );
     }
 
     myPainter->setPen( pen );
@@ -1846,8 +1840,8 @@ void QgsGrassEdit::displayIcon( double x, double y, const QPen & pen,
 
   point = transformLayerToCanvas( point );
 
-  int px = static_cast<int>( round( point.x() ) );
-  int py = static_cast<int>( round( point.y() ) );
+  int px = qRound( point.x() );
+  int py = qRound( point.y() );
   int m = ( size - 1 ) / 2;
 
   QPainter *myPainter;

Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,6 @@ email : tim@linfiniti.com`
`43`	`43`	`#include <cassert>`
`44`	`44`
`45`	`45`
`46`		`-#ifdef _MSC_VER`
`47`		`-#define round(x) ((x) >= 0 ? floor((x)+0.5) : floor((x)-0.5))`
`48`		`-#endif`
`49`		`-`
`50`	`46`	`const double QgsDecorationNorthArrow::PI = 3.14159265358979323846;`
`51`	`47`	`// const double QgsNorthArrowPlugin::DEG2RAD = 0.0174532925199433;`
`52`	`48`	`const double QgsDecorationNorthArrow::TOL = 1e-8;`
`@@ -298,7 +294,7 @@ bool QgsDecorationNorthArrow::calculateNorthDirection()`
`298`	`294`	`}`
`299`	`295`	`// And set the angle of the north arrow. Perhaps do something`
`300`	`296`	`// different if goodDirn = false.`
`301`		`- mRotationInt = static_cast<int>( round( fmod( 360.0 - angle * 180.0 / PI, 360.0 ) ) );`
	`297`	`+ mRotationInt = qRound( fmod( 360.0 - angle * 180.0 / PI, 360.0 ) );`
`302`	`298`	`}`
`303`	`299`	`else`
`304`	`300`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,6 @@ email : sbr00pwb@users.sourceforge.net`
`48`	`48`	`#include <cmath>`
`49`	`49`
`50`	`50`
`51`		`-#ifdef _MSC_VER`
`52`		`-#define round(x) ((x) >= 0 ? floor((x)+0.5) : floor((x)-0.5))`
`53`		`-#endif`
`54`		`-`
`55`		`-`
`56`	`51`	`QgsDecorationScaleBar::QgsDecorationScaleBar( QObject* parent )`
`57`	`52`	`: QgsDecorationItem( parent )`
`58`	`53`	`{`
`@@ -164,7 +159,7 @@ void QgsDecorationScaleBar::render( QPainter * theQPainter )`
`164`	`159`	`if ( mSnapping )`
`165`	`160`	`{`
`166`	`161`	`double scaler = pow( 10.0, myPowerOf10 );`
`167`		`- myActualSize = round( myActualSize / scaler ) * scaler;`
	`162`	`+ myActualSize = qRound( myActualSize / scaler ) * scaler;`
`168`	`163`	`myScaleBarWidth = myActualSize / myMapUnitsPerPixelDouble;`
`169`	`164`	`}`
`170`	`165`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ int QgsComposition::pixelFontSize( double pointSize ) const`
`214`	`214`	`{`
`215`	`215`	`//in QgsComposition, one unit = one mm`
`216`	`216`	`double sizeMillimeters = pointSize * 0.3527;`
`217`		`- return ( sizeMillimeters + 0.5 ); //round to nearest mm`
	`217`	`+ return qRound( sizeMillimeters ); //round to nearest mm`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`double QgsComposition::pointFontSize( int pixelSize ) const`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ QPoint QgsMapTool::toCanvasCoordinates( const QgsPoint& point )`
`64`	`64`	`{`
`65`	`65`	`double x = point.x(), y = point.y();`
`66`	`66`	`mCanvas->getCoordinateTransform()->transformInPlace( x, y );`
`67`		`- return QPoint(( int )( x + 0.5 ), ( int )( y + 0.5 ) ); // round the values`
	`67`	`+ return QPoint( qRound( x ), qRound( y ) );`
`68`	`68`	`}`
`69`	`69`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,6 @@`
`50`	`50`	`//other includes`
`51`	`51`	`#include <cmath>`
`52`	`52`
`53`		`-#ifdef _MSC_VER`
`54`		`-#define round(x) ((x) >= 0 ? floor((x)+0.5) : floor((x)-0.5))`
`55`		`-#endif`
`56`		`-`
`57`	`53`	`QgsQuickPrint::QgsQuickPrint()`
`58`	`54`	`{`
`59`	`55`	`mPageSize = QPrinter::A4;`
`@@ -813,7 +809,7 @@ void QgsQuickPrint::renderPrintScaleBar( QPainter * thepPainter,`
`813`	`809`	`if ( mySnappingFlag )`
`814`	`810`	`{`
`815`	`811`	`double scaler = pow( 10.0, myPowerOf10 );`
`816`		`- myActualSize = round( myActualSize / scaler ) * scaler;`
	`812`	`+ myActualSize = qRound( myActualSize / scaler ) * scaler;`
`817`	`813`	`myScaleBarWidth = myActualSize / myMapUnitsPerPixelDouble;`
`818`	`814`	`}`
`819`	`815`