Skip to content

Commit

Permalink
const ALL the things
Browse files Browse the repository at this point in the history 
Use clang-tidy const correctness fixit to add const to all
variables which it can
  • Loading branch information
@nyalldawson
nyalldawson committed Aug 13, 2021
1 parent 3d4224d commit 1956503
Show file tree
Hide file tree
Showing 1,677 changed files with 19,330 additions and 19,330 deletions.
20 changes: 10 additions & 10 deletions src/3d/chunks/qgschunkloader_p.cpp
View file
Expand Up @@ -42,24 +42,24 @@ QVector<QgsChunkNode *> QgsQuadtreeChunkLoaderFactory::createChildren( QgsChunkN
if ( node->level() >= mMaxLevel )
return children;

QgsChunkNodeId nodeId = node->tileId();
float childError = node->error() / 2;
QgsAABB bbox = node->bbox();
const QgsChunkNodeId nodeId = node->tileId();
const float childError = node->error() / 2;
const QgsAABB bbox = node->bbox();
float xc = bbox.xCenter(), zc = bbox.zCenter();

for ( int i = 0; i < 4; ++i )
{
int dx = i & 1, dy = !!( i & 2 );
QgsChunkNodeId childId( nodeId.d + 1, nodeId.x * 2 + dx, nodeId.y * 2 + ( dy ? 0 : 1 ) ); // TODO: inverse dy?
const QgsChunkNodeId childId( nodeId.d + 1, nodeId.x * 2 + dx, nodeId.y * 2 + ( dy ? 0 : 1 ) ); // TODO: inverse dy?
// the Y and Z coordinates below are intentionally flipped, because
// in chunk node IDs the X,Y axes define horizontal plane,
// while in our 3D scene the X,Z axes define the horizontal plane
float chXMin = dx ? xc : bbox.xMin;
float chXMax = dx ? bbox.xMax : xc;
float chZMin = dy ? zc : bbox.zMin;
float chZMax = dy ? bbox.zMax : zc;
float chYMin = bbox.yMin;
float chYMax = bbox.yMax;
const float chXMin = dx ? xc : bbox.xMin;
const float chXMax = dx ? bbox.xMax : xc;
const float chZMin = dy ? zc : bbox.zMin;
const float chZMax = dy ? bbox.zMax : zc;
const float chYMin = bbox.yMin;
const float chYMax = bbox.yMax;
children << new QgsChunkNode( childId, QgsAABB( chXMin, chYMin, chZMin, chXMax, chYMax, chZMax ), childError, node );
}
return children;
Expand Down
4 changes: 2 additions & 2 deletions src/3d/materials/qgsabstractmaterialsettings.cpp
View file
Expand Up @@ -19,7 +19,7 @@ QgsPropertiesDefinition QgsAbstractMaterialSettings::sPropertyDefinitions;

void QgsAbstractMaterialSettings::readXml( const QDomElement &element, const QgsReadWriteContext & )
{
QDomElement elemDataDefinedProperties = element.firstChildElement( QStringLiteral( "data-defined-properties" ) );
const QDomElement elemDataDefinedProperties = element.firstChildElement( QStringLiteral( "data-defined-properties" ) );
if ( !elemDataDefinedProperties.isNull() )
mDataDefinedProperties.readXml( elemDataDefinedProperties, propertyDefinitions() );
}
Expand Down Expand Up @@ -63,7 +63,7 @@ void QgsAbstractMaterialSettings::initPropertyDefinitions() const
if ( !sPropertyDefinitions.isEmpty() )
return;

QString origin = QStringLiteral( "material3d" );
const QString origin = QStringLiteral( "material3d" );

sPropertyDefinitions = QgsPropertiesDefinition
{
Expand Down
12 changes: 6 additions & 6 deletions src/3d/materials/qgsgoochmaterialsettings.cpp
View file
Expand Up @@ -135,10 +135,10 @@ void QgsGoochMaterialSettings::addParametersToEffect( Qt3DRender::QEffect * ) co
QByteArray QgsGoochMaterialSettings::dataDefinedVertexColorsAsByte( const QgsExpressionContext &expressionContext ) const
{

QColor diffuse = dataDefinedProperties().valueAsColor( Diffuse, expressionContext, mDiffuse );
QColor warm = dataDefinedProperties().valueAsColor( Warm, expressionContext, mWarm );
QColor cool = dataDefinedProperties().valueAsColor( Cool, expressionContext, mCool );
QColor specular = dataDefinedProperties().valueAsColor( Specular, expressionContext, mSpecular );
const QColor diffuse = dataDefinedProperties().valueAsColor( Diffuse, expressionContext, mDiffuse );
const QColor warm = dataDefinedProperties().valueAsColor( Warm, expressionContext, mWarm );
const QColor cool = dataDefinedProperties().valueAsColor( Cool, expressionContext, mCool );
const QColor specular = dataDefinedProperties().valueAsColor( Specular, expressionContext, mSpecular );


QByteArray array;
Expand Down Expand Up @@ -242,9 +242,9 @@ Qt3DRender::QMaterial *QgsGoochMaterialSettings::dataDefinedMaterial() const
Qt3DRender::QShaderProgram *shaderProgram = new Qt3DRender::QShaderProgram();

//Load shader programs
QUrl urlVert( QStringLiteral( "qrc:/shaders/goochDataDefined.vert" ) );
const QUrl urlVert( QStringLiteral( "qrc:/shaders/goochDataDefined.vert" ) );
shaderProgram->setShaderCode( Qt3DRender::QShaderProgram::Vertex, shaderProgram->loadSource( urlVert ) );
QUrl urlFrag( QStringLiteral( "qrc:/shaders/goochDataDefined.frag" ) );
const QUrl urlFrag( QStringLiteral( "qrc:/shaders/goochDataDefined.frag" ) );
shaderProgram->setShaderCode( Qt3DRender::QShaderProgram::Fragment, shaderProgram->loadSource( urlFrag ) );

renderPass->setShaderProgram( shaderProgram );
Expand Down
10 changes: 5 additions & 5 deletions src/3d/materials/qgsphongmaterialsettings.cpp
View file
Expand Up @@ -149,9 +149,9 @@ void QgsPhongMaterialSettings::addParametersToEffect( Qt3DRender::QEffect *effec

QByteArray QgsPhongMaterialSettings::dataDefinedVertexColorsAsByte( const QgsExpressionContext &expressionContext ) const
{
QColor ambient = dataDefinedProperties().valueAsColor( Ambient, expressionContext, mAmbient );
QColor diffuse = dataDefinedProperties().valueAsColor( Diffuse, expressionContext, mDiffuse );
QColor specular = dataDefinedProperties().valueAsColor( Specular, expressionContext, mSpecular );
const QColor ambient = dataDefinedProperties().valueAsColor( Ambient, expressionContext, mAmbient );
const QColor diffuse = dataDefinedProperties().valueAsColor( Diffuse, expressionContext, mDiffuse );
const QColor specular = dataDefinedProperties().valueAsColor( Specular, expressionContext, mSpecular );

QByteArray array;
array.resize( sizeof( unsigned char ) * 9 );
Expand Down Expand Up @@ -234,9 +234,9 @@ Qt3DRender::QMaterial *QgsPhongMaterialSettings::dataDefinedMaterial() const
Qt3DRender::QShaderProgram *shaderProgram = new Qt3DRender::QShaderProgram();

//Load shader programs
QUrl urlVert( QStringLiteral( "qrc:/shaders/phongDataDefined.vert" ) );
const QUrl urlVert( QStringLiteral( "qrc:/shaders/phongDataDefined.vert" ) );
shaderProgram->setShaderCode( Qt3DRender::QShaderProgram::Vertex, shaderProgram->loadSource( urlVert ) );
QUrl urlFrag( QStringLiteral( "qrc:/shaders/phongDataDefined.frag" ) );
const QUrl urlFrag( QStringLiteral( "qrc:/shaders/phongDataDefined.frag" ) );
shaderProgram->setShaderCode( Qt3DRender::QShaderProgram::Fragment, shaderProgram->loadSource( urlFrag ) );

renderPass->setShaderProgram( shaderProgram );
Expand Down
2 changes: 1 addition & 1 deletion src/3d/materials/qgsphongtexturedmaterialsettings.cpp
View file
Expand Up @@ -103,7 +103,7 @@ Qt3DRender::QMaterial *QgsPhongTexturedMaterialSettings::toMaterial( QgsMaterial
case QgsMaterialSettingsRenderingTechnique::TrianglesDataDefined:
{
bool fitsInCache = false;
QImage textureSourceImage = QgsApplication::imageCache()->pathAsImage( mDiffuseTexturePath, QSize(), true, 1.0, fitsInCache );
const QImage textureSourceImage = QgsApplication::imageCache()->pathAsImage( mDiffuseTexturePath, QSize(), true, 1.0, fitsInCache );
( void )fitsInCache;

if ( !textureSourceImage.isNull() )
Expand Down
2 changes: 1 addition & 1 deletion src/3d/mesh/qgsmesh3dentity_p.cpp
View file
Expand Up @@ -66,7 +66,7 @@ void QgsMeshDataset3dEntity::applyMaterial()
if ( mSymbol->renderingStyle() == QgsMesh3DSymbol::ColorRamp2DRendering && layer() )
{
const QgsMeshRendererSettings rendererSettings = layer()->rendererSettings();
int datasetGroupIndex = rendererSettings.activeScalarDatasetGroup();
const int datasetGroupIndex = rendererSettings.activeScalarDatasetGroup();
if ( datasetGroupIndex >= 0 )
mSymbol->setColorRampShader( rendererSettings.scalarSettings( datasetGroupIndex ).colorRampShader() );
}
Expand Down
20 changes: 10 additions & 10 deletions src/3d/mesh/qgsmesh3dgeometry_p.cpp
View file
Expand Up @@ -101,7 +101,7 @@ static QByteArray createDatasetVertexData(
{
const QgsMeshVertex &vert = mesh.vertices().at( i );
double vertMag = verticalMagnitude.at( i );
double scalarMag = scalarMagnitude.at( i );
const double scalarMag = scalarMagnitude.at( i );
if ( data.isVerticalMagnitudeRelative )
vertMag += vert.z();

Expand Down Expand Up @@ -162,7 +162,7 @@ static QByteArray createDatasetIndexData( const QgsTriangularMesh &mesh, QgsMesh
{
for ( int i = 0; i < mesh.triangles().count(); ++i )
{
int nativeIndex = mesh.trianglesToNativeFaces()[i];
const int nativeIndex = mesh.trianglesToNativeFaces()[i];
if ( mActiveFaceFlagValues.active( nativeIndex ) )
activeFaceCount++;
}
Expand All @@ -176,7 +176,7 @@ static QByteArray createDatasetIndexData( const QgsTriangularMesh &mesh, QgsMesh

for ( int i = 0; i < trianglesCount; ++i )
{
int nativeFaceIndex = mesh.trianglesToNativeFaces()[i];
const int nativeFaceIndex = mesh.trianglesToNativeFaces()[i];
const bool isActive = mActiveFaceFlagValues.active().isEmpty() || mActiveFaceFlagValues.active( nativeFaceIndex );
if ( !isActive )
continue;
Expand Down Expand Up @@ -250,7 +250,7 @@ void QgsMeshDataset3dGeometry::prepareData()
if ( !layer )
return;

QgsMeshDatasetIndex scalarDatasetIndex = layer->activeScalarDatasetAtTime( mTimeRange );
const QgsMeshDatasetIndex scalarDatasetIndex = layer->activeScalarDatasetAtTime( mTimeRange );

if ( !scalarDatasetIndex.isValid() )
return;
Expand All @@ -277,12 +277,12 @@ void QgsMeshDataset3dGeometry::prepareData()

VertexData data;
data.verticalGroupMetadata = layer->datasetGroupMetadata( mVerticalGroupDatasetIndex );
bool verticalDataOnVertices = data.verticalGroupMetadata.dataType() == QgsMeshDatasetGroupMetadata::DataOnVertices;
const bool verticalDataOnVertices = data.verticalGroupMetadata.dataType() == QgsMeshDatasetGroupMetadata::DataOnVertices;
int datacount = verticalDataOnVertices ? nativeMesh.vertices.count() : nativeMesh.faces.count();
data.verticalData = QgsMeshLayerUtils::datasetValues( layer, verticalMagDatasetIndex, 0, datacount );

data.scalarGroupMetadata = layer->datasetGroupMetadata( layer->activeScalarDatasetAtTime( mTimeRange ) );
bool scalarDataOnVertices = data.scalarGroupMetadata.dataType() == QgsMeshDatasetGroupMetadata::DataOnVertices;
const bool scalarDataOnVertices = data.scalarGroupMetadata.dataType() == QgsMeshDatasetGroupMetadata::DataOnVertices;
datacount = scalarDataOnVertices ? nativeMesh.vertices.count() : nativeMesh.faces.count();
data.scalarData = QgsMeshLayerUtils::datasetValues( layer, scalarDatasetIndex, 0, datacount );

Expand Down Expand Up @@ -412,7 +412,7 @@ QgsMesh3DGeometryBuilder::QgsMesh3DGeometryBuilder( const QgsTriangularMesh &mes

void QgsMesh3DGeometryBuilder::start()
{
QMutexLocker locker( &mMutex );
const QMutexLocker locker( &mMutex );

mWatcherVertex = new QFutureWatcher<QByteArray>( this );
connect( mWatcherVertex, &QFutureWatcher<int>::finished, this, &QgsMesh3DGeometryBuilder::vertexFinished );
Expand All @@ -427,7 +427,7 @@ void QgsMesh3DGeometryBuilder::start()

void QgsMesh3DGeometryBuilder::vertexFinished()
{
QMutexLocker locker( &mMutex );
const QMutexLocker locker( &mMutex );
mVertexFinished = true;
if ( mVertexFinished && mIndexFinished )
{
Expand All @@ -437,7 +437,7 @@ void QgsMesh3DGeometryBuilder::vertexFinished()

void QgsMesh3DGeometryBuilder::indexFinished()
{
QMutexLocker locker( &mMutex );
const QMutexLocker locker( &mMutex );
mIndexFinished = true;
if ( mVertexFinished && mIndexFinished )
{
Expand All @@ -459,7 +459,7 @@ QgsMeshDataset3DGeometryBuilder::QgsMeshDataset3DGeometryBuilder

void QgsMeshDataset3DGeometryBuilder::start()
{
QMutexLocker locker( &mMutex );
const QMutexLocker locker( &mMutex );

mWatcherVertex = new QFutureWatcher<QByteArray>( this );
connect( mWatcherVertex, &QFutureWatcher<int>::finished, this, &QgsMeshDataset3DGeometryBuilder::vertexFinished );
Expand Down
24 changes: 12 additions & 12 deletions src/3d/mesh/qgsmesh3dmaterial_p.cpp
View file
Expand Up @@ -179,29 +179,29 @@ void QgsMesh3dMaterial::configure()
Qt3DRender::QShaderProgram *shaderProgram = new Qt3DRender::QShaderProgram();

//Load shader programs
QUrl urlVert( QStringLiteral( "qrc:/shaders/mesh/mesh.vert" ) );
const QUrl urlVert( QStringLiteral( "qrc:/shaders/mesh/mesh.vert" ) );
shaderProgram->setShaderCode( Qt3DRender::QShaderProgram::Vertex, shaderProgram->loadSource( urlVert ) );
QUrl urlGeom( QStringLiteral( "qrc:/shaders/mesh/mesh.geom" ) );
const QUrl urlGeom( QStringLiteral( "qrc:/shaders/mesh/mesh.geom" ) );
shaderProgram->setShaderCode( Qt3DRender::QShaderProgram::Geometry, shaderProgram->loadSource( urlGeom ) );
QUrl urlFrag( QStringLiteral( "qrc:/shaders/mesh/mesh.frag" ) );
const QUrl urlFrag( QStringLiteral( "qrc:/shaders/mesh/mesh.frag" ) );
shaderProgram->setShaderCode( Qt3DRender::QShaderProgram::Fragment, shaderProgram->loadSource( urlFrag ) );

renderPass->setShaderProgram( shaderProgram );
mTechnique->addRenderPass( renderPass );

// Parameters
mTechnique->addParameter( new Qt3DRender::QParameter( "flatTriangles", ( !mSymbol->smoothedTriangles() ) ) );
QColor wireframecolor = mSymbol->wireframeLineColor();
const QColor wireframecolor = mSymbol->wireframeLineColor();
mTechnique->addParameter( new Qt3DRender::QParameter( "lineWidth", float( mSymbol->wireframeLineWidth() ) ) );
mTechnique->addParameter( new Qt3DRender::QParameter( "lineColor", QVector4D( wireframecolor.redF(), wireframecolor.greenF(), wireframecolor.blueF(), 1.0f ) ) );
mTechnique->addParameter( new Qt3DRender::QParameter( "wireframeEnabled", mSymbol->wireframeEnabled() ) );
mTechnique->addParameter( new Qt3DRender::QParameter( "textureType", int( mSymbol->renderingStyle() ) ) );
if ( colorRampTexture )
mTechnique->addParameter( new Qt3DRender::QParameter( "colorRampTexture", colorRampTexture ) ) ;
mTechnique->addParameter( new Qt3DRender::QParameter( "colorRampCount", mSymbol->colorRampShader().colorRampItemList().count() ) );
int colorRampType = mSymbol->colorRampShader().colorRampType();
const int colorRampType = mSymbol->colorRampShader().colorRampType();
mTechnique->addParameter( new Qt3DRender::QParameter( "colorRampType", colorRampType ) );
QColor meshColor = mSymbol->singleMeshColor();
const QColor meshColor = mSymbol->singleMeshColor();
mTechnique->addParameter( new Qt3DRender::QParameter( "meshColor", QVector4D( meshColor.redF(), meshColor.greenF(), meshColor.blueF(), 1.0f ) ) );
mTechnique->addParameter( new Qt3DRender::QParameter( "isScalarMagnitude", ( mMagnitudeType == QgsMesh3dMaterial::ScalarDataSet ) ) );
}
Expand All @@ -226,27 +226,27 @@ void QgsMesh3dMaterial::configureArrows( QgsMeshLayer *layer, const QgsDateTimeR
meta = layer->datasetGroupMetadata( datasetIndex );
arrowsColor = layer->rendererSettings().vectorSettings( datasetIndex.group() ).color();
arrowsEnabledParameter->setValue( true );
int maxSize = mSymbol->maximumTextureSize();
const int maxSize = mSymbol->maximumTextureSize();
// construct grid
QgsRectangle gridExtent = layer->triangularMesh()->extent();
const QgsRectangle gridExtent = layer->triangularMesh()->extent();
gridSize = QSize( maxSize, maxSize );
double xSpacing = mSymbol->arrowsSpacing();
double ySpacing = mSymbol->arrowsSpacing();
// check the size of the grid and adjust the spacing if needed
int desiredXSize = int( gridExtent.width() / xSpacing );
const int desiredXSize = int( gridExtent.width() / xSpacing );
if ( desiredXSize > maxSize )
xSpacing = gridExtent.width() / maxSize;
else
gridSize.setWidth( desiredXSize );

int desiredYSize = int( gridExtent.height() / ySpacing );
const int desiredYSize = int( gridExtent.height() / ySpacing );
if ( desiredYSize > maxSize )
ySpacing = gridExtent.height() / maxSize;
else
gridSize.setHeight( desiredYSize );

double xMin = gridExtent.xMinimum() + xSpacing / 2;
double yMin = gridExtent.yMinimum() + ySpacing / 2;
const double xMin = gridExtent.xMinimum() + xSpacing / 2;
const double yMin = gridExtent.yMinimum() + ySpacing / 2;
minCorner = QgsPointXY( xMin, yMin );

vectors = QgsMeshLayerUtils::griddedVectorValues(
Expand Down
20 changes: 10 additions & 10 deletions src/3d/mesh/qgsmeshterraingenerator.cpp
View file
Expand Up @@ -73,7 +73,7 @@ void QgsMeshTerrainGenerator::rootChunkHeightRange( float &hMin, float &hMax ) c

for ( int i = 0; i < mTriangularMesh.vertices().count(); ++i )
{
float zValue = static_cast< float >( mTriangularMesh.vertices().at( i ).z() );
const float zValue = static_cast< float >( mTriangularMesh.vertices().at( i ).z() );
if ( min > zValue )
min = zValue;
if ( max < zValue )
Expand Down Expand Up @@ -132,7 +132,7 @@ QgsRectangle QgsMeshTerrainGenerator::extent() const
else
return QgsRectangle();

QgsCoordinateTransform terrainToMapTransform( mLayer->crs(), mCrs, mTransformContext );
const QgsCoordinateTransform terrainToMapTransform( mLayer->crs(), mCrs, mTransformContext );
QgsRectangle extentInMap;

try
Expand All @@ -153,30 +153,30 @@ void QgsMeshTerrainGenerator::writeXml( QDomElement &elem ) const

elem.setAttribute( QStringLiteral( "layer" ), mLayer.layerId );
QDomElement elemSymbol = doc.createElement( "symbol" );
QgsReadWriteContext rwc;
const QgsReadWriteContext rwc;
mSymbol->writeXml( elemSymbol, rwc );
elem.appendChild( elemSymbol );
}

void QgsMeshTerrainGenerator::readXml( const QDomElement &elem )
{
mLayer = QgsMapLayerRef( elem.attribute( QStringLiteral( "layer" ) ) );
QgsReadWriteContext rwc;
const QgsReadWriteContext rwc;
mSymbol->readXml( elem.firstChildElement( "symbol" ), rwc );
}

float QgsMeshTerrainGenerator::heightAt( double x, double y, const Qgs3DMapSettings & ) const
{
QgsPointXY point( x, y );
int faceIndex = mTriangularMesh.faceIndexForPoint_v2( point );
const QgsPointXY point( x, y );
const int faceIndex = mTriangularMesh.faceIndexForPoint_v2( point );
if ( faceIndex < 0 || faceIndex >= mTriangularMesh.triangles().count() )
return std::numeric_limits<float>::quiet_NaN();

const QgsMeshFace &face = mTriangularMesh.triangles().at( faceIndex );

QgsPoint p1 = mTriangularMesh.vertices().at( face.at( 0 ) );
QgsPoint p2 = mTriangularMesh.vertices().at( face.at( 1 ) );
QgsPoint p3 = mTriangularMesh.vertices().at( face.at( 2 ) );
const QgsPoint p1 = mTriangularMesh.vertices().at( face.at( 0 ) );
const QgsPoint p2 = mTriangularMesh.vertices().at( face.at( 1 ) );
const QgsPoint p3 = mTriangularMesh.vertices().at( face.at( 2 ) );

return QgsMeshLayerUtils::interpolateFromVerticesData( p1, p2, p3, p1.z(), p2.z(), p3.z(), point );
}
Expand All @@ -185,7 +185,7 @@ void QgsMeshTerrainGenerator::updateTriangularMesh()
{
if ( meshLayer() )
{
QgsCoordinateTransform transform( mCrs, meshLayer()->crs(), mTransformContext );
const QgsCoordinateTransform transform( mCrs, meshLayer()->crs(), mTransformContext );
meshLayer()->updateTriangularMesh( transform );
mTriangularMesh = *meshLayer()->triangularMeshByLodIndex( mSymbol->levelOfDetailIndex() );
mTerrainTilingScheme = QgsTilingScheme( mTriangularMesh.extent(), mCrs );
Expand Down
6 changes: 3 additions & 3 deletions src/3d/processing/qgsalgorithmtessellate.cpp
View file
Expand Up @@ -88,21 +88,21 @@ QgsFeatureList QgsTessellateAlgorithm::processFeature( const QgsFeature &feature
f.clearGeometry();
else
{
QgsRectangle bounds = f.geometry().boundingBox();
const QgsRectangle bounds = f.geometry().boundingBox();
QgsTessellator t( bounds, false );

if ( f.geometry().isMultipart() )
{
const QgsMultiSurface *ms = qgsgeometry_cast< const QgsMultiSurface * >( f.geometry().constGet() );
for ( int i = 0; i < ms->numGeometries(); ++i )
{
std::unique_ptr< QgsPolygon > p( qgsgeometry_cast< QgsPolygon * >( ms->geometryN( i )->segmentize() ) );
const std::unique_ptr< QgsPolygon > p( qgsgeometry_cast< QgsPolygon * >( ms->geometryN( i )->segmentize() ) );
t.addPolygon( *p, 0 );
}
}
else
{
std::unique_ptr< QgsPolygon > p( qgsgeometry_cast< QgsPolygon * >( f.geometry().constGet()->segmentize() ) );
const std::unique_ptr< QgsPolygon > p( qgsgeometry_cast< QgsPolygon * >( f.geometry().constGet()->segmentize() ) );
t.addPolygon( *p, 0 );
}
QgsGeometry g( t.asMultiPolygon() );
Expand Down

0 comments on commit 1956503

Please sign in to comment.