[qt6] Changed size of size(), length()

m-kuhn · nyalldawson · commit abc51f935e72 · 2021-03-28T06:25:07.000+10:00
long long vs int
diff --git a/src/core/geometry/qgsgeometrycollection.cpp b/src/core/geometry/qgsgeometrycollection.cpp
@@ -272,7 +272,7 @@ bool QgsGeometryCollection::insertGeometry( QgsAbstractGeometry *g, int index )
     return false;
   }
 
-  index = std::min( mGeometries.count(), index );
+  index = std::min( static_cast<int>( mGeometries.count() ), index );
 
   mGeometries.insert( index, g );
   clearCache(); //set bounding box invalid
diff --git a/src/core/labeling/qgspallabeling.cpp b/src/core/labeling/qgspallabeling.cpp
@@ -1586,7 +1586,7 @@ void QgsPalLayerSettings::calculateLabelSize( const QFontMetricsF *fm, const QSt
       int maxLineLength = 0;
       for ( const auto &line : multiLineSplit )
       {
-        maxLineLength = std::max( maxLineLength, line.length() );
+        maxLineLength = std::max( maxLineLength, static_cast<int>( line.length() ) );
       }
       h = fm->ascent() * maxLineLength + ( maxLineLength - 1 ) * letterSpacing;
       break;
@@ -1612,7 +1612,7 @@ void QgsPalLayerSettings::calculateLabelSize( const QFontMetricsF *fm, const QSt
       int maxLineLength = 0;
       for ( const auto &line : multiLineSplit )
       {
-        maxLineLength = std::max( maxLineLength, line.length() );
+        maxLineLength = std::max( maxLineLength, static_cast<int>( line.length() ) );
       }
       heightVertical = fm->ascent() * maxLineLength + ( maxLineLength - 1 ) * letterSpacing;
 
diff --git a/src/core/layout/qgsabstractreportsection.cpp b/src/core/layout/qgsabstractreportsection.cpp
@@ -417,7 +417,7 @@ void QgsAbstractReportSection::insertChild( int index, QgsAbstractReportSection
 {
   section->setParentSection( this );
   index = std::max( 0, index );
-  index = std::min( index, mChildren.count() );
+  index = std::min( index, static_cast<int>( mChildren.count() ) );
   mChildren.insert( index, section );
 }
 
diff --git a/src/core/layout/qgslayouttable.cpp b/src/core/layout/qgslayouttable.cpp
@@ -360,9 +360,9 @@ QPair<int, int> QgsLayoutTable::rowRange( QgsRenderContext &context, const int f
   }
 
   //using zero based indexes
-  int firstVisible = std::min( rowsAlreadyShown, mTableContents.length() );
+  int firstVisible = std::min( rowsAlreadyShown, static_cast<int>( mTableContents.length() ) );
   int possibleRowsVisible = rowsVisible( context, frameIndex, rowsAlreadyShown, false );
-  int lastVisible = std::min( firstVisible + possibleRowsVisible, mTableContents.length() );
+  int lastVisible = std::min( firstVisible + possibleRowsVisible, static_cast<int>( mTableContents.length() ) );
 
   return qMakePair( firstVisible, lastVisible );
 }
diff --git a/src/core/qgsstringstatisticalsummary.cpp b/src/core/qgsstringstatisticalsummary.cpp
@@ -144,8 +144,8 @@ void QgsStringStatisticalSummary::testString( const QString &string )
   }
   if ( mStatistics & MeanLength )
     mSumLengths += string.length();
-  mMinLength = std::min( mMinLength, string.length() );
-  mMaxLength = std::max( mMaxLength, string.length() );
+  mMinLength = std::min( mMinLength, static_cast<int>( string.length() ) );
+  mMaxLength = std::max( mMaxLength, static_cast<int>( string.length() ) );
 }
 
 QVariant QgsStringStatisticalSummary::statistic( QgsStringStatisticalSummary::Statistic stat ) const
diff --git a/src/core/raster/qgsrasterblock.cpp b/src/core/raster/qgsrasterblock.cpp
@@ -475,7 +475,7 @@ void QgsRasterBlock::setData( const QByteArray &data, int offset )
 
   if ( mData )
   {
-    int len = std::min( data.size(), typeSize( mDataType ) * mWidth * mHeight - offset );
+    int len = std::min( static_cast<int>( data.size() ), typeSize( mDataType ) * mWidth * mHeight - offset );
     ::memcpy( static_cast<char *>( mData ) + offset, data.constData(), len );
   }
   else if ( mImage && mImage->constBits() )
diff --git a/src/core/vector/qgsvectorlayerfeatureiterator.cpp b/src/core/vector/qgsvectorlayerfeatureiterator.cpp
@@ -355,7 +355,7 @@ class QgsThreadStackOverflowGuard
       QStringList dumpStack;
       const QStack<QString> &stack = mStorage.localData();
 
-      int dumpSize = std::min( stack.size(), 10 );
+      int dumpSize = std::min( static_cast<int>( stack.size() ), 10 );
       for ( int i = 0; i < dumpSize; ++i )
       {
         dumpStack += stack.at( i );
diff --git a/src/core/vector/qgsvectorlayerutils.cpp b/src/core/vector/qgsvectorlayerutils.cpp
@@ -306,7 +306,7 @@ QVariant QgsVectorLayerUtils::createUniqueValueFromCache( const QgsVectorLayer *
 
   if ( field.isNumeric() )
   {
-    QVariant maxVal = existingValues.isEmpty() ? 0 : *std::max_element( existingValues.begin(), existingValues.end() );
+    QVariant maxVal = existingValues.isEmpty() ? 0 : *std::max_element( existingValues.begin(), existingValues.end(), []( const QVariant & a, const QVariant & b ) { return a.toLongLong() < b.toLongLong(); } );
     QVariant newVar( maxVal.toLongLong() + 1 );
     if ( field.convertCompatible( newVar ) )
       return newVar;

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ bool QgsGeometryCollection::insertGeometry( QgsAbstractGeometry *g, int index )`
`272`	`272`	`return false;`
`273`	`273`	`}`
`274`	`274`
`275`		`- index = std::min( mGeometries.count(), index );`
	`275`	`+ index = std::min( static_cast<int>( mGeometries.count() ), index );`
`276`	`276`
`277`	`277`	`mGeometries.insert( index, g );`
`278`	`278`	`clearCache(); //set bounding box invalid`
Original file line number	Diff line number	Diff line change
`@@ -1586,7 +1586,7 @@ void QgsPalLayerSettings::calculateLabelSize( const QFontMetricsF *fm, const QSt`
`1586`	`1586`	`int maxLineLength = 0;`
`1587`	`1587`	`for ( const auto &line : multiLineSplit )`
`1588`	`1588`	`{`
`1589`		`- maxLineLength = std::max( maxLineLength, line.length() );`
	`1589`	`+ maxLineLength = std::max( maxLineLength, static_cast<int>( line.length() ) );`
`1590`	`1590`	`}`
`1591`	`1591`	`h = fm->ascent() * maxLineLength + ( maxLineLength - 1 ) * letterSpacing;`
`1592`	`1592`	`break;`
`@@ -1612,7 +1612,7 @@ void QgsPalLayerSettings::calculateLabelSize( const QFontMetricsF *fm, const QSt`
`1612`	`1612`	`int maxLineLength = 0;`
`1613`	`1613`	`for ( const auto &line : multiLineSplit )`
`1614`	`1614`	`{`
`1615`		`- maxLineLength = std::max( maxLineLength, line.length() );`
	`1615`	`+ maxLineLength = std::max( maxLineLength, static_cast<int>( line.length() ) );`
`1616`	`1616`	`}`
`1617`	`1617`	`heightVertical = fm->ascent() * maxLineLength + ( maxLineLength - 1 ) * letterSpacing;`
`1618`	`1618`
Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,7 @@ void QgsAbstractReportSection::insertChild( int index, QgsAbstractReportSection`
`417`	`417`	`{`
`418`	`418`	`section->setParentSection( this );`
`419`	`419`	`index = std::max( 0, index );`
`420`		`- index = std::min( index, mChildren.count() );`
	`420`	`+ index = std::min( index, static_cast<int>( mChildren.count() ) );`
`421`	`421`	`mChildren.insert( index, section );`
`422`	`422`	`}`
`423`	`423`
Original file line number	Diff line number	Diff line change
`@@ -360,9 +360,9 @@ QPair<int, int> QgsLayoutTable::rowRange( QgsRenderContext &context, const int f`
`360`	`360`	`}`
`361`	`361`
`362`	`362`	`//using zero based indexes`
`363`		`- int firstVisible = std::min( rowsAlreadyShown, mTableContents.length() );`
	`363`	`+ int firstVisible = std::min( rowsAlreadyShown, static_cast<int>( mTableContents.length() ) );`
`364`	`364`	`int possibleRowsVisible = rowsVisible( context, frameIndex, rowsAlreadyShown, false );`
`365`		`- int lastVisible = std::min( firstVisible + possibleRowsVisible, mTableContents.length() );`
	`365`	`+ int lastVisible = std::min( firstVisible + possibleRowsVisible, static_cast<int>( mTableContents.length() ) );`
`366`	`366`
`367`	`367`	`return qMakePair( firstVisible, lastVisible );`
`368`	`368`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,8 +144,8 @@ void QgsStringStatisticalSummary::testString( const QString &string )`
`144`	`144`	`}`
`145`	`145`	`if ( mStatistics & MeanLength )`
`146`	`146`	`mSumLengths += string.length();`
`147`		`- mMinLength = std::min( mMinLength, string.length() );`
`148`		`- mMaxLength = std::max( mMaxLength, string.length() );`
	`147`	`+ mMinLength = std::min( mMinLength, static_cast<int>( string.length() ) );`
	`148`	`+ mMaxLength = std::max( mMaxLength, static_cast<int>( string.length() ) );`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`QVariant QgsStringStatisticalSummary::statistic( QgsStringStatisticalSummary::Statistic stat ) const`
Original file line number	Diff line number	Diff line change
`@@ -475,7 +475,7 @@ void QgsRasterBlock::setData( const QByteArray &data, int offset )`
`475`	`475`
`476`	`476`	`if ( mData )`
`477`	`477`	`{`
`478`		`- int len = std::min( data.size(), typeSize( mDataType ) * mWidth * mHeight - offset );`
	`478`	`+ int len = std::min( static_cast<int>( data.size() ), typeSize( mDataType ) * mWidth * mHeight - offset );`
`479`	`479`	`::memcpy( static_cast<char *>( mData ) + offset, data.constData(), len );`
`480`	`480`	`}`
`481`	`481`	`else if ( mImage && mImage->constBits() )`
Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ class QgsThreadStackOverflowGuard`
`355`	`355`	`QStringList dumpStack;`
`356`	`356`	`const QStack<QString> &stack = mStorage.localData();`
`357`	`357`
`358`		`- int dumpSize = std::min( stack.size(), 10 );`
	`358`	`+ int dumpSize = std::min( static_cast<int>( stack.size() ), 10 );`
`359`	`359`	`for ( int i = 0; i < dumpSize; ++i )`
`360`	`360`	`{`
`361`	`361`	`dumpStack += stack.at( i );`
Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ QVariant QgsVectorLayerUtils::createUniqueValueFromCache( const QgsVectorLayer *`
`306`	`306`
`307`	`307`	`if ( field.isNumeric() )`
`308`	`308`	`{`
`309`		`- QVariant maxVal = existingValues.isEmpty() ? 0 : *std::max_element( existingValues.begin(), existingValues.end() );`
	`309`	`+ QVariant maxVal = existingValues.isEmpty() ? 0 : *std::max_element( existingValues.begin(), existingValues.end(), []( const QVariant & a, const QVariant & b ) { return a.toLongLong() < b.toLongLong(); } );`
`310`	`310`	`QVariant newVar( maxVal.toLongLong() + 1 );`
`311`	`311`	`if ( field.convertCompatible( newVar ) )`
`312`	`312`	`return newVar;`