qMin/qMax -> std::min/max

qgis · Aug 25, 2017 · 2d19279 · 2d19279
1 parent 641d78b
commit 2d19279
Show file tree

Hide file tree

Showing 151 changed files with 452 additions and 452 deletions.
diff --git a/src/analysis/interpolation/DualEdgeTriangulation.cc b/src/analysis/interpolation/DualEdgeTriangulation.cc
@@ -387,7 +387,7 @@ int DualEdgeTriangulation::addPoint( QgsPoint *p )
         //Take the higher z-Value in case of two equal points
         QgsPoint *newPoint = mPointVector[mPointVector.count() - 1];
         QgsPoint *existingPoint = mPointVector[mTwiceInsPoint];
-        existingPoint->setZ( qMax( newPoint->z(), existingPoint->z() ) );
+        existingPoint->setZ( std::max( newPoint->z(), existingPoint->z() ) );
 
         mPointVector.remove( mPointVector.count() - 1 );
         delete newPoint;

diff --git a/src/analysis/interpolation/MathUtils.cc b/src/analysis/interpolation/MathUtils.cc
@@ -253,8 +253,8 @@ bool MathUtils::inCircle( QgsPoint *testp, QgsPoint *p1, QgsPoint *p2, QgsPoint
     double px = testp->x();
     double py = testp->y();
 
-    double xmin = qMin( qMin( ax, px ), qMin( bx, cx ) );
-    double ymin = qMin( qMin( ay, py ), qMin( by, cy ) );
+    double xmin = std::min( std::min( ax, px ), std::min( bx, cx ) );
+    double ymin = std::min( std::min( ay, py ), std::min( by, cy ) );
     ax -= xmin;
     bx -= xmin;
     cx -= xmin;

diff --git a/src/analysis/raster/qgshillshadefilter.cpp b/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 ) ) + ( std::sin( zenith_rad ) * std::sin( slope_rad ) * std::cos( azimuth_rad - aspect_rad ) ) ) );
+  return std::max( 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 ) ) ) );
 }
diff --git a/src/analysis/raster/qgskde.cpp b/src/analysis/raster/qgskde.cpp
@@ -87,8 +87,8 @@ QgsKernelDensityEstimation::Result QgsKernelDensityEstimation::prepare()
   if ( mBounds.isNull() )
     return InvalidParameters;
 
-  int rows = qMax( std::ceil( mBounds.height() / mPixelSize ) + 1, 1.0 );
-  int cols = qMax( std::ceil( mBounds.width() / mPixelSize ) + 1, 1.0 );
+  int rows = std::max( std::ceil( mBounds.height() / mPixelSize ) + 1, 1.0 );
+  int cols = std::max( std::ceil( mBounds.width() / mPixelSize ) + 1, 1.0 );
 
   if ( !createEmptyLayer( driver, mBounds, rows, cols ) )
     return FileCreationError;

diff --git a/src/analysis/vector/qgsgeometrysnapper.cpp b/src/analysis/vector/qgsgeometrysnapper.cpp
@@ -233,8 +233,8 @@ const QgsSnapIndex::Cell *QgsSnapIndex::GridRow::getCell( int col ) const
 
 QList<QgsSnapIndex::SnapItem *> QgsSnapIndex::GridRow::getSnapItems( int colStart, int colEnd ) const
 {
-  colStart = qMax( colStart, mColStartIdx );
-  colEnd = qMin( colEnd, mColStartIdx + mCells.size() - 1 );
+  colStart = std::max( colStart, mColStartIdx );
+  colEnd = std::min( colEnd, mColStartIdx + mCells.size() - 1 );
 
   QList<SnapItem *> items;
 
@@ -403,8 +403,8 @@ QgsSnapIndex::SnapItem *QgsSnapIndex::getSnapItem( const QgsPoint &pos, double t
   int colEnd = std::floor( ( pos.x() + tol - mOrigin.x() ) / mCellSize );
   int rowEnd = std::floor( ( pos.y() + tol - mOrigin.y() ) / mCellSize );
 
-  rowStart = qMax( rowStart, mRowsStartIdx );
-  rowEnd = qMin( rowEnd, mRowsStartIdx + mGridRows.size() - 1 );
+  rowStart = std::max( rowStart, mRowsStartIdx );
+  rowEnd = std::min( rowEnd, mRowsStartIdx + mGridRows.size() - 1 );
 
   QList<SnapItem *> items;
   for ( int row = rowStart; row <= rowEnd; ++row )

diff --git a/src/analysis/vector/qgszonalstatistics.h b/src/analysis/vector/qgszonalstatistics.h
@@ -98,8 +98,8 @@ class ANALYSIS_EXPORT QgsZonalStatistics
             sum += value;
             ++count;
           }
-          min = qMin( min, value );
-          max = qMax( max, value );
+          min = std::min( min, value );
+          max = std::max( max, value );
           if ( mStoreValueCounts )
             valueCount.insert( value, valueCount.value( value, 0 ) + 1 );
           if ( mStoreValues )

diff --git a/src/app/nodetool/qgsnodetool.cpp b/src/app/nodetool/qgsnodetool.cpp
@@ -976,7 +976,7 @@ void QgsNodeTool::deleteNodeEditorSelection()
     if ( mSelectedFeature->geometry()->type() == QgsWkbTypes::LineGeometry )
     {
       // for lines we don't wrap around vertex selection when deleting nodes from end of line
-      nextVertexToSelect = qMin( nextVertexToSelect, mSelectedFeature->geometry()->geometry()->nCoordinates() - 1 );
+      nextVertexToSelect = std::min( nextVertexToSelect, mSelectedFeature->geometry()->geometry()->nCoordinates() - 1 );
     }
 
     _safeSelectVertex( *mSelectedFeature, nextVertexToSelect );

diff --git a/src/app/qgsaddattrdialog.cpp b/src/app/qgsaddattrdialog.cpp
@@ -86,7 +86,7 @@ void QgsAddAttrDialog::setPrecisionMinMax()
   mPrec->setVisible( minPrecType < maxPrecType );
   mPrecLabel->setVisible( minPrecType < maxPrecType );
   mPrec->setMinimum( minPrecType );
-  mPrec->setMaximum( qMax( minPrecType, qMin( maxPrecType, mLength->value() ) ) );
+  mPrec->setMaximum( std::max( minPrecType, std::min( maxPrecType, mLength->value() ) ) );
 }
 
 void QgsAddAttrDialog::accept()

diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -344,7 +344,7 @@ void QgsAttributeTableDialog::updateTitle()
   QWidget *w = mDock ? qobject_cast<QWidget *>( mDock ) : qobject_cast<QWidget *>( this );
   w->setWindowTitle( tr( " %1 :: Features Total: %2, Filtered: %3, Selected: %4" )
                      .arg( mLayer->name() )
-                     .arg( qMax( static_cast< long >( mMainView->featureCount() ), mLayer->featureCount() ) ) // layer count may be estimated, so use larger of the two
+                     .arg( std::max( static_cast< long >( mMainView->featureCount() ), mLayer->featureCount() ) ) // layer count may be estimated, so use larger of the two
                      .arg( mMainView->filteredFeatureCount() )
                      .arg( mLayer->selectedFeatureCount() )
                    );

diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
@@ -593,7 +593,7 @@ void QgsDiagramProperties::on_mFindMaximumValueButton_clicked()
       while ( features.nextFeature( *&feature ) )
       {
         context.setFeature( feature );
-        maxValue = qMax( maxValue, exp.evaluate( &context ).toFloat() );
+        maxValue = std::max( maxValue, exp.evaluate( &context ).toFloat() );
       }
     }
     else
@@ -689,7 +689,7 @@ void QgsDiagramProperties::apply()
             bool ok = false;
             double val = provider->maximumValue( fld ).toDouble( &ok );
             if ( ok )
-              maxVal = qMax( maxVal, val );
+              maxVal = std::max( maxVal, val );
           }
         }
       }

diff --git a/src/app/qgsfieldcalculator.cpp b/src/app/qgsfieldcalculator.cpp
@@ -481,7 +481,7 @@ void QgsFieldCalculator::setPrecisionMinMax()
   int maxPrecType = mOutputFieldTypeComboBox->itemData( idx, Qt::UserRole + 5 ).toInt();
   mOutputFieldPrecisionSpinBox->setEnabled( minPrecType < maxPrecType );
   mOutputFieldPrecisionSpinBox->setMinimum( minPrecType );
-  mOutputFieldPrecisionSpinBox->setMaximum( qMax( minPrecType, qMin( maxPrecType, mOutputFieldWidthSpinBox->value() ) ) );
+  mOutputFieldPrecisionSpinBox->setMaximum( std::max( minPrecType, std::min( maxPrecType, mOutputFieldWidthSpinBox->value() ) ) );
 }
 
 void QgsFieldCalculator::showHelp()

diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp
@@ -234,7 +234,7 @@ QSize QgsIdentifyResultsWebView::sizeHint() const
     // correct size, see #9377.
     int max = widget->size().height() * 0.9;
     QgsDebugMsg( QString( "parent widget height = %1 max height = %2" ).arg( widget->size().height() ).arg( max ) );
-    height = qMin( height, max );
+    height = std::min( height, max );
   }
   else
   {
@@ -243,7 +243,7 @@ QSize QgsIdentifyResultsWebView::sizeHint() const
 
   // Always keep some minimum size, e.g. if page is not yet loaded
   // or parent has wrong size
-  height = qMax( height, 100 );
+  height = std::max( height, 100 );
 
   s = QSize( size().width(), height );
   QgsDebugMsg( QString( "size: %1 x %2" ).arg( s.width() ).arg( s.height() ) );

diff --git a/src/app/qgsmeasuredialog.cpp b/src/app/qgsmeasuredialog.cpp
@@ -281,7 +281,7 @@ QString QgsMeasureDialog::formatDistance( double distance, bool convertUnits ) c
     // special handling for degrees - because we can't use smaller units (eg m->mm), we need to make sure there's
     // enough decimal places to show a usable measurement value
     int minPlaces = std::round( std::log10( 1.0 / distance ) ) + 1;
-    decimals = qMax( decimals, minPlaces );
+    decimals = std::max( decimals, minPlaces );
   }
   return QgsDistanceArea::formatDistance( distance, decimals, mDistanceUnits, baseUnit );
 }

diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
@@ -1281,8 +1281,8 @@ void QgsRasterLayerProperties::adjustTransparencyCellWidth( int row, int column
   QLineEdit *lineEdit = dynamic_cast<QLineEdit *>( tableTransparency->cellWidget( row, column ) );
   if ( !lineEdit ) return;
 
-  int width = qMax( lineEdit->fontMetrics().width( lineEdit->text() ) + 10, 100 );
-  width = qMax( width, tableTransparency->columnWidth( column ) );
+  int width = std::max( lineEdit->fontMetrics().width( lineEdit->text() ) + 10, 100 );
+  width = std::max( width, tableTransparency->columnWidth( column ) );
 
   lineEdit->setFixedWidth( width );
 }
@@ -1850,4 +1850,4 @@ void QgsRasterLayerProperties::onCancel()
 void QgsRasterLayerProperties::showHelp()
 {
   QgsHelp::openHelp( QStringLiteral( "working_with_raster/raster_properties.html" ) );
-}
+}
diff --git a/src/app/qgsrulebasedlabelingwidget.cpp b/src/app/qgsrulebasedlabelingwidget.cpp
@@ -587,8 +587,8 @@ QgsLabelingRulePropsWidget::QgsLabelingRulePropsWidget( QgsRuleBasedLabeling::Ru
   {
     groupScale->setChecked( true );
     // caution: rule uses scale denom, scale widget uses true scales
-    mScaleRangeWidget->setMaximumScale( qMax( rule->maximumScale(), 0.0 ) );
-    mScaleRangeWidget->setMinimumScale( qMax( rule->minimumScale(), 0.0 ) );
+    mScaleRangeWidget->setMaximumScale( std::max( rule->maximumScale(), 0.0 ) );
+    mScaleRangeWidget->setMinimumScale( std::max( rule->minimumScale(), 0.0 ) );
   }
   mScaleRangeWidget->setMapCanvas( mMapCanvas );
 

diff --git a/src/app/qgsvariantdelegate.cpp b/src/app/qgsvariantdelegate.cpp
@@ -190,10 +190,10 @@ void QgsVariantDelegate::setModelData( QWidget *editor, QAbstractItemModel *mode
       break;
     case QVariant::Color:
       ( void )mColorExp.exactMatch( text );
-      value = QColor( qMin( mColorExp.cap( 1 ).toInt(), 255 ),
-                      qMin( mColorExp.cap( 2 ).toInt(), 255 ),
-                      qMin( mColorExp.cap( 3 ).toInt(), 255 ),
-                      qMin( mColorExp.cap( 4 ).toInt(), 255 ) );
+      value = QColor( std::min( mColorExp.cap( 1 ).toInt(), 255 ),
+                      std::min( mColorExp.cap( 2 ).toInt(), 255 ),
+                      std::min( mColorExp.cap( 3 ).toInt(), 255 ),
+                      std::min( mColorExp.cap( 4 ).toInt(), 255 ) );
       break;
     case QVariant::Date:
     {

diff --git a/src/app/qgswelcomepageitemsmodel.cpp b/src/app/qgswelcomepageitemsmodel.cpp
@@ -117,7 +117,7 @@ QSize QgsWelcomePageItemDelegate::sizeHint( const QStyleOptionViewItem &option,
                      index.data( QgsWelcomePageItemsModel::CrsRole ).toString() ) );
   doc.setTextWidth( width - ( !icon.isNull() ? icon.width() + 35 : 35 ) );
 
-  return QSize( width, qMax( ( double ) doc.size().height() + 10, ( double )icon.height() ) + 20 );
+  return QSize( width, std::max( ( double ) doc.size().height() + 10, ( double )icon.height() ) + 20 );
 }
 
 QgsWelcomePageItemsModel::QgsWelcomePageItemsModel( QObject *parent )

diff --git a/src/core/composer/qgscomposerarrow.cpp b/src/core/composer/qgscomposerarrow.cpp
@@ -380,8 +380,8 @@ double QgsComposerArrow::computeMarkerMargin() const
     }
     else if ( mMarkerMode == SVGMarker )
     {
-      double maxArrowHeight = qMax( mStartArrowHeadHeight, mStopArrowHeadHeight );
-      margin = mPen.widthF() / 2 + qMax( mArrowHeadWidth / 2.0, maxArrowHeight / 2.0 );
+      double maxArrowHeight = std::max( mStartArrowHeadHeight, mStopArrowHeadHeight );
+      margin = mPen.widthF() / 2 + std::max( mArrowHeadWidth / 2.0, maxArrowHeight / 2.0 );
     }
   }
   else
@@ -398,8 +398,8 @@ double QgsComposerArrow::computeMarkerMargin() const
     {
       double startMarkerMargin = std::sqrt( 0.25 * ( mStartArrowHeadHeight * mStartArrowHeadHeight + mArrowHeadWidth * mArrowHeadWidth ) );
       double stopMarkerMargin = std::sqrt( 0.25 * ( mStopArrowHeadHeight * mStopArrowHeadHeight + mArrowHeadWidth * mArrowHeadWidth ) );
-      double markerMargin = qMax( startMarkerMargin, stopMarkerMargin );
-      margin = qMax( mPen.widthF() / std::sqrt( 2.0 ), markerMargin );
+      double markerMargin = std::max( startMarkerMargin, stopMarkerMargin );
+      margin = std::max( mPen.widthF() / std::sqrt( 2.0 ), markerMargin );
     }
   }
   return margin;
@@ -408,7 +408,7 @@ double QgsComposerArrow::computeMarkerMargin() const
 void QgsComposerArrow::adaptItemSceneRect()
 {
   //rectangle containing start and end point
-  QRectF rect = QRectF( qMin( mStartPoint.x(), mStopPoint.x() ), qMin( mStartPoint.y(), mStopPoint.y() ),
+  QRectF rect = QRectF( std::min( mStartPoint.x(), mStopPoint.x() ), std::min( mStartPoint.y(), mStopPoint.y() ),
                         std::fabs( mStopPoint.x() - mStartPoint.x() ), std::fabs( mStopPoint.y() - mStartPoint.y() ) );
   double enlarge = computeMarkerMargin();
   rect.adjust( -enlarge, -enlarge, enlarge, enlarge );

diff --git a/src/core/composer/qgscomposerattributetablemodelv2.cpp b/src/core/composer/qgscomposerattributetablemodelv2.cpp
@@ -263,7 +263,7 @@ bool QgsComposerAttributeTableColumnModelV2::removeRows( int row, int count, con
 {
   Q_UNUSED( parent );
 
-  int maxRow = qMin( row + count - 1, mComposerTable->columns()->length() - 1 );
+  int maxRow = std::min( row + count - 1, mComposerTable->columns()->length() - 1 );
   beginRemoveRows( QModelIndex(), row, maxRow );
   //move backwards through rows, removing each corresponding QgsComposerTableColumn
   for ( int i = maxRow; i >= row; --i )
@@ -357,7 +357,7 @@ void QgsComposerAttributeTableColumnModelV2::setColumnAsSorted( QgsComposerTable
   QList<QgsComposerTableColumn *>::const_iterator columnIt = mComposerTable->columns()->constBegin();
   for ( ; columnIt != mComposerTable->columns()->constEnd(); ++columnIt )
   {
-    highestRank = qMax( highestRank, ( *columnIt )->sortByRank() );
+    highestRank = std::max( highestRank, ( *columnIt )->sortByRank() );
   }
 
   column->setSortByRank( highestRank + 1 );

diff --git a/src/core/composer/qgscomposerframe.cpp b/src/core/composer/qgscomposerframe.cpp
@@ -160,8 +160,8 @@ void QgsComposerFrame::setSceneRect( const QRectF &rectangle )
 
     //check minimum size
     QSizeF minSize = mMultiFrame->minFrameSize( frameIndex );
-    fixedRect.setWidth( qMax( minSize.width(), fixedRect.width() ) );
-    fixedRect.setHeight( qMax( minSize.height(), fixedRect.height() ) );
+    fixedRect.setWidth( std::max( minSize.width(), fixedRect.width() ) );
+    fixedRect.setHeight( std::max( minSize.height(), fixedRect.height() ) );
   }
 
   QgsComposerItem::setSceneRect( fixedRect );

diff --git a/src/core/composer/qgscomposerhtml.cpp b/src/core/composer/qgscomposerhtml.cpp
@@ -231,7 +231,7 @@ double QgsComposerHtml::maxFrameWidth() const
   QList<QgsComposerFrame *>::const_iterator frameIt = mFrameItems.constBegin();
   for ( ; frameIt != mFrameItems.constEnd(); ++frameIt )
   {
-    maxWidth = qMax( maxWidth, static_cast< double >( ( *frameIt )->boundingRect().width() ) );
+    maxWidth = std::max( maxWidth, static_cast< double >( ( *frameIt )->boundingRect().width() ) );
   }
 
   return maxWidth;
@@ -379,7 +379,7 @@ double QgsComposerHtml::findNearbyPageBreak( double yPos )
   bool previousPixelTransparent = false;
   QRgb pixelColor;
   QList< QPair<int, int> > candidates;
-  int minRow = qMax( idealPos - maxSearchDistance, 0 );
+  int minRow = std::max( idealPos - maxSearchDistance, 0 );
   for ( int candidateRow = idealPos; candidateRow >= minRow; --candidateRow )
   {
     changes = 0;

diff --git a/src/core/composer/qgscomposerlabel.cpp b/src/core/composer/qgscomposerlabel.cpp
@@ -609,7 +609,7 @@ void QgsComposerLabel::itemShiftAdjustSize( double newWidth, double newHeight, d
 QUrl QgsComposerLabel::createStylesheetUrl() const
 {
   QString stylesheet;
-  stylesheet += QStringLiteral( "body { margin: %1 %2;" ).arg( qMax( mMarginY * mHtmlUnitsToMM, 0.0 ) ).arg( qMax( mMarginX * mHtmlUnitsToMM, 0.0 ) );
+  stylesheet += QStringLiteral( "body { margin: %1 %2;" ).arg( std::max( mMarginY * mHtmlUnitsToMM, 0.0 ) ).arg( std::max( mMarginX * mHtmlUnitsToMM, 0.0 ) );
   stylesheet += QgsFontUtils::asCSS( mFont, 0.352778 * mHtmlUnitsToMM );
   stylesheet += QStringLiteral( "color: %1;" ).arg( mFontColor.name() );
   stylesheet += QStringLiteral( "text-align: %1; }" ).arg( mHAlignment == Qt::AlignLeft ? "left" : mHAlignment == Qt::AlignRight ? "right" : "center" );

diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -1584,10 +1584,10 @@ void QgsComposerMap::updateBoundingRect()
   if ( mGridStack )
     mGridStack->calculateMaxGridExtension( topExtension, rightExtension, bottomExtension, leftExtension );
 
-  topExtension = qMax( topExtension, frameExtension );
-  rightExtension = qMax( rightExtension, frameExtension );
-  bottomExtension = qMax( bottomExtension, frameExtension );
-  leftExtension = qMax( leftExtension, frameExtension );
+  topExtension = std::max( topExtension, frameExtension );
+  rightExtension = std::max( rightExtension, frameExtension );
+  bottomExtension = std::max( bottomExtension, frameExtension );
+  leftExtension = std::max( leftExtension, frameExtension );
 
   rectangle.setLeft( rectangle.left() - leftExtension );
   rectangle.setRight( rectangle.right() + rightExtension );