(q)sin -> std::sin

Author: nyalldawson

src/analysis/raster/qgshillshadefilter.cpp

@@ -49,5 +49,5 @@ float QgsHillshadeFilter::processNineCellWindow( float *x11, float *x21, float *
   {
     aspect_rad = M_PI + std::atan2( derX, derY );
   }
-  return qMax( 0.0, 255.0 * ( ( std::cos( zenith_rad ) * std::cos( slope_rad ) ) + ( sin( zenith_rad ) * sin( slope_rad ) * std::cos( azimuth_rad - aspect_rad ) ) ) );
+  return qMax( 0.0, 255.0 * ( ( std::cos( zenith_rad ) * std::cos( slope_rad ) ) + ( std::sin( zenith_rad ) * std::sin( slope_rad ) * std::cos( azimuth_rad - aspect_rad ) ) ) );
 }

src/analysis/raster/qgsrastermatrix.cpp

@@ -220,7 +220,7 @@ bool QgsRasterMatrix::oneArgumentOperation( OneArgOperator op )
           }
           break;
         case opSIN:
-          mData[i] = sin( value );
+          mData[i] = std::sin( value );
           break;
         case opCOS:
           mData[i] = std::cos( value );

src/analysis/raster/qgsrastermatrix.h

@@ -124,7 +124,7 @@ class ANALYSIS_EXPORT QgsRasterMatrix
     bool twoArgumentOperation( TwoArgOperator op, const QgsRasterMatrix &other );
     double calculateTwoArgumentOp( TwoArgOperator op, double arg1, double arg2 ) const;
 
-    /*sqrt, sin, std::cos, tan, asin, acos, atan*/
+    /*sqrt, std::sin, std::cos, tan, asin, acos, atan*/
     bool oneArgumentOperation( OneArgOperator op );
     bool testPowerValidity( double base, double power ) const;
 };

src/app/dwg/libdxfrw/drw_entities.cpp

@@ -959,7 +959,7 @@ void DRW_Ellipse::toPolyline( DRW_Polyline *pol, int parts ) const
   //calculate sin & std::cos of included angle
   double incAngle = std::atan2( secPoint.y, secPoint.x );
   double cosRot = std::cos( incAngle );
-  double sinRot = sin( incAngle );
+  double sinRot = std::sin( incAngle );
 
   incAngle = M_PIx2 / parts;
   double curAngle = staparam;
@@ -970,7 +970,7 @@ void DRW_Ellipse::toPolyline( DRW_Polyline *pol, int parts ) const
   while ( curAngle < endAngle )
   {
     double cosCurr = std::cos( curAngle );
-    double sinCurr = sin( curAngle );
+    double sinCurr = std::sin( curAngle );
     double x = basePoint.x + cosCurr * cosRot * radMajor - sinCurr * sinRot * radMinor;
     double y = basePoint.y + cosCurr * sinRot * radMajor + sinCurr * cosRot * radMinor;
     pol->addVertex( DRW_Vertex( x, y, 0.0, 0.0 ) );

src/app/dwg/qgsdwgimporter.cpp

@@ -1341,9 +1341,9 @@ void QgsDwgImporter::addArc( const DRW_Arc &data )
 
   QgsCircularString c;
   c.setPoints( QgsPointSequence()
-               << QgsPoint( QgsWkbTypes::PointZ, data.basePoint.x + std::cos( a0 ) * data.mRadius, data.basePoint.y + sin( a0 ) * data.mRadius )
-               << QgsPoint( QgsWkbTypes::PointZ, data.basePoint.x + std::cos( a1 ) * data.mRadius, data.basePoint.y + sin( a1 ) * data.mRadius )
-               << QgsPoint( QgsWkbTypes::PointZ, data.basePoint.x + std::cos( a2 ) * data.mRadius, data.basePoint.y + sin( a2 ) * data.mRadius )
+               << QgsPoint( QgsWkbTypes::PointZ, data.basePoint.x + std::cos( a0 ) * data.mRadius, data.basePoint.y + std::sin( a0 ) * data.mRadius )
+               << QgsPoint( QgsWkbTypes::PointZ, data.basePoint.x + std::cos( a1 ) * data.mRadius, data.basePoint.y + std::sin( a1 ) * data.mRadius )
+               << QgsPoint( QgsWkbTypes::PointZ, data.basePoint.x + std::cos( a2 ) * data.mRadius, data.basePoint.y + std::sin( a2 ) * data.mRadius )
              );
 
   if ( !createFeature( layer, f, c ) )
@@ -1445,7 +1445,7 @@ bool QgsDwgImporter::curveFromLWPolyline( const DRW_LWPolyline &data, QgsCompoun
       double dx = data.vertlist[i1]->x - data.vertlist[i0]->x;
       double dy = data.vertlist[i1]->y - data.vertlist[i0]->y;
       double c = sqrt( dx * dx + dy * dy );
-      double r = c / 2.0 / sin( a );
+      double r = c / 2.0 / std::sin( a );
       double h = r * ( 1 - std::cos( a ) );
 
       s << QgsPoint( QgsWkbTypes::PointZ,
@@ -1556,7 +1556,7 @@ void QgsDwgImporter::addLWPolyline( const DRW_LWPolyline &data )
         double dx = p1.x() - p0.x();
         double dy = p1.y() - p0.y();
         double c = sqrt( dx * dx + dy * dy );
-        double r = c / 2.0 / sin( a );
+        double r = c / 2.0 / std::sin( a );
         double h = r * ( 1 - std::cos( a ) );
 
         s << QgsPoint( QgsWkbTypes::PointZ,
@@ -1758,7 +1758,7 @@ void QgsDwgImporter::addPolyline( const DRW_Polyline &data )
         double dy = p1.y() - p0.y();
         double dz = p1.z() - p0.z();
         double c = sqrt( dx * dx + dy * dy );
-        double r = c / 2.0 / sin( a );
+        double r = c / 2.0 / std::sin( a );
         double h = r * ( 1 - std::cos( a ) );
 
         s << QgsPoint( QgsWkbTypes::PointZ,

src/app/nodetool/qgsnodetool.cpp

@@ -683,7 +683,7 @@ QgsPointXY QgsNodeTool::positionForEndpointMarker( const QgsPointLocator::Match
   double dist = 15 * canvas()->mapSettings().mapUnitsPerPixel();
   double angle = std::atan2( dy, dx );  // to the top: angle=0, to the right: angle=90, to the left: angle=-90
   double x = pt1.x() + std::cos( angle ) * dist;
-  double y = pt1.y() + sin( angle ) * dist;
+  double y = pt1.y() + std::sin( angle ) * dist;
   return QgsPointXY( x, y );
 }
 

src/app/qgsdecorationnortharrow.cpp

@@ -138,10 +138,10 @@ void QgsDecorationNorthArrow::render( const QgsMapSettings &mapSettings, QgsRend
       double myRadiansDouble = mRotationInt * M_PI / 180.0;
       int xShift = static_cast<int>( (
                                        ( centerXDouble * std::cos( myRadiansDouble ) ) +
-                                       ( centerYDouble * sin( myRadiansDouble ) )
+                                       ( centerYDouble * std::sin( myRadiansDouble ) )
                                      ) - centerXDouble );
       int yShift = static_cast<int>( (
-                                       ( -centerXDouble * sin( myRadiansDouble ) ) +
+                                       ( -centerXDouble * std::sin( myRadiansDouble ) ) +
                                        ( centerYDouble * std::cos( myRadiansDouble ) )
                                      ) - centerYDouble );
 

src/app/qgsdecorationnortharrowdialog.cpp

@@ -156,10 +156,10 @@ void QgsDecorationNorthArrowDialog::drawNorthArrow()
     double myRadiansDouble = ( PI / 180 ) * rotation;
     int xShift = static_cast<int>( (
                                      ( centerXDouble * std::cos( myRadiansDouble ) ) +
-                                     ( centerYDouble * sin( myRadiansDouble ) )
+                                     ( centerYDouble * std::sin( myRadiansDouble ) )
                                    ) - centerXDouble );
     int yShift = static_cast<int>( (
-                                     ( -centerXDouble * sin( myRadiansDouble ) ) +
+                                     ( -centerXDouble * std::sin( myRadiansDouble ) ) +
                                      ( centerYDouble * std::cos( myRadiansDouble ) )
                                    ) - centerYDouble );
 

src/app/qgsmaptoollabel.cpp

@@ -376,8 +376,8 @@ bool QgsMapToolLabel::currentLabelRotationPoint( QgsPointXY &pos, bool ignoreUps
   }
 
   double angle = mCurrentLabel.pos.rotation;
-  double xd = xdiff * std::cos( angle ) - ydiff * sin( angle );
-  double yd = xdiff * sin( angle ) + ydiff * std::cos( angle );
+  double xd = xdiff * std::cos( angle ) - ydiff * std::sin( angle );
+  double yd = xdiff * std::sin( angle ) + ydiff * std::cos( angle );
   if ( mCurrentLabel.pos.upsideDown && !ignoreUpsideDown )
   {
     pos.setX( pos.x() - xd );

src/app/qgsmaptooloffsetpointsymbol.cpp

@@ -270,7 +270,7 @@ QPointF QgsMapToolOffsetPointSymbol::calculateOffset( const QgsPointXY &startPoi
 QPointF QgsMapToolOffsetPointSymbol::rotatedOffset( QPointF offset, double angle ) const
 {
   angle = DEG2RAD( 360 - angle );
-  double c = std::cos( angle ), s = sin( angle );
+  double c = std::cos( angle ), s = std::sin( angle );
   return QPointF( offset.x() * c - offset.y() * s, offset.x() * s + offset.y() * c );
 }