Replace with qgis::as_const() where possible

qgis · Jan 12, 2021 · 2d6ea89 · 2d6ea89
1 parent bdb1a54
commit 2d6ea89
Showing 1 changed file with 9 additions and 18 deletions.
diff --git a/src/core/qgsrelationmanager.cpp b/src/core/qgsrelationmanager.cpp
@@ -44,8 +44,7 @@ QgsRelationContext QgsRelationManager::context() const
 void QgsRelationManager::setRelations( const QList<QgsRelation> &relations )
 {
   mRelations.clear();
-  const auto constRelations = relations;
-  for ( const QgsRelation &rel : constRelations )
+  for ( const QgsRelation &rel : qgis::as_const( relations ) )
   {
     addRelation( rel );
   }
@@ -102,8 +101,7 @@ QList<QgsRelation> QgsRelationManager::relationsByName( const QString &name ) co
 {
   QList<QgsRelation> relations;
 
-  const auto constMRelations = mRelations;
-  for ( const QgsRelation &rel : constMRelations )
+  for ( const QgsRelation &rel : qgis::as_const( mRelations ) )
   {
     if ( QString::compare( rel.name(), name, Qt::CaseInsensitive ) == 0 )
       relations << rel;
@@ -127,8 +125,7 @@ QList<QgsRelation> QgsRelationManager::referencingRelations( const QgsVectorLaye
 
   QList<QgsRelation> relations;
 
-  const auto constMRelations = mRelations;
-  for ( const QgsRelation &rel : constMRelations )
+  for ( const QgsRelation &rel : qgis::as_const( mRelations ) )
   {
     if ( rel.referencingLayer() == layer )
     {
@@ -166,8 +163,7 @@ QList<QgsRelation> QgsRelationManager::referencedRelations( const QgsVectorLayer
 
   QList<QgsRelation> relations;
 
-  const auto constMRelations = mRelations;
-  for ( const QgsRelation &rel : constMRelations )
+  for ( const QgsRelation &rel : qgis::as_const( mRelations ) )
   {
     if ( rel.referencedLayer() == layer )
     {
@@ -236,8 +232,7 @@ void QgsRelationManager::writeProject( QDomDocument &doc )
   QDomElement relationsNode = doc.createElement( QStringLiteral( "relations" ) );
   qgisNode.appendChild( relationsNode );
 
-  const auto constMRelations = mRelations;
-  for ( const QgsRelation &relation : constMRelations )
+  for ( const QgsRelation &relation : qgis::as_const( mRelations ) )
   {
     // the generated relations for polymorphic relations should be ignored,
     // they are generated when a polymorphic relation is added
@@ -250,8 +245,7 @@ void QgsRelationManager::writeProject( QDomDocument &doc )
   QDomElement polymorphicRelationsNode = doc.createElement( QStringLiteral( "polymorphicRelations" ) );
   qgisNode.appendChild( polymorphicRelationsNode );
 
-  const auto constMPolymorphicRelations = mPolymorphicRelations;
-  for ( const QgsPolymorphicRelation &relation : constMPolymorphicRelations )
+  for ( const QgsPolymorphicRelation &relation : qgis::as_const( mPolymorphicRelations ) )
   {
     relation.writeXml( polymorphicRelationsNode, doc );
   }
@@ -260,8 +254,7 @@ void QgsRelationManager::writeProject( QDomDocument &doc )
 void QgsRelationManager::layersRemoved( const QStringList &layers )
 {
   bool relationsChanged = false;
-  const auto constLayers = layers;
-  for ( const QString &layer : constLayers )
+  for ( const QString &layer : qgis::as_const( layers ) )
   {
     QMapIterator<QString, QgsRelation> it( mRelations );
 
@@ -285,8 +278,7 @@ void QgsRelationManager::layersRemoved( const QStringList &layers )
 
 static bool hasRelationWithEqualDefinition( const QList<QgsRelation> &existingRelations, const QgsRelation &relation )
 {
-  const auto constExistingRelations = existingRelations;
-  for ( const QgsRelation &cur : constExistingRelations )
+  for ( const QgsRelation &cur : qgis::as_const( existingRelations ) )
   {
     if ( cur.hasEqualDefinition( relation ) ) return true;
   }
@@ -296,8 +288,7 @@ static bool hasRelationWithEqualDefinition( const QList<QgsRelation> &existingRe
 QList<QgsRelation> QgsRelationManager::discoverRelations( const QList<QgsRelation> &existingRelations, const QList<QgsVectorLayer *> &layers )
 {
   QList<QgsRelation> result;
-  const auto constLayers = layers;
-  for ( const QgsVectorLayer *layer : constLayers )
+  for ( const QgsVectorLayer *layer : qgis::as_const( layers ) )
   {
     const auto constDiscoverRelations = layer->dataProvider()->discoverRelations( layer, layers );
     for ( const QgsRelation &relation : constDiscoverRelations )