Rename QgsPolymorphicRelations getGeneratedRelations -> generateRelations

suricactus · suricactus · commit f8b468a04598 · 2021-01-12T23:49:40.000+02:00
diff --git a/python/core/auto_generated/qgspolymorphicrelation.sip.in b/python/core/auto_generated/qgspolymorphicrelation.sip.in
@@ -219,7 +219,7 @@ Sets a list of layer ids to be used as potential referenced layers
 Returns a list of layer ids to be used as potential referenced layers
 %End
 
-    QList<QgsRelation> getGeneratedRelations() const;
+    QList<QgsRelation> generateRelations() const;
 %Docstring
 Returns a list of generated relations, based on the currently set :py:func:`~QgsPolymorphicRelation.referencedLayerIds`
 %End
diff --git a/src/core/qgspolymorphicrelation.cpp b/src/core/qgspolymorphicrelation.cpp
@@ -357,7 +357,7 @@ QStringList QgsPolymorphicRelation::referencedLayerIds() const
   return d->mReferencedLayerIds;
 }
 
-QList<QgsRelation> QgsPolymorphicRelation::getGeneratedRelations() const
+QList<QgsRelation> QgsPolymorphicRelation::generateRelations() const
 {
   QList<QgsRelation> relations;
 
diff --git a/src/core/qgspolymorphicrelation.h b/src/core/qgspolymorphicrelation.h
@@ -267,7 +267,7 @@ class CORE_EXPORT QgsPolymorphicRelation
     /**
      * Returns a list of generated relations, based on the currently set referencedLayerIds()
      */
-    QList<QgsRelation> getGeneratedRelations() const;
+    QList<QgsRelation> generateRelations() const;
 
     /**
      * Returns layer representation as evaluated string
diff --git a/src/core/qgsrelationmanager.cpp b/src/core/qgsrelationmanager.cpp
@@ -328,7 +328,7 @@ void QgsRelationManager::addPolymorphicRelation( const QgsPolymorphicRelation &p
 
   mPolymorphicRelations.insert( polymorphicRelation.id(), polymorphicRelation );
 
-  const QList<QgsRelation> generatedRelations = polymorphicRelation.getGeneratedRelations();
+  const QList<QgsRelation> generatedRelations = polymorphicRelation.generateRelations();
   for ( const QgsRelation &generatedRelation : generatedRelations )
     addRelation( generatedRelation );
 }
@@ -337,7 +337,7 @@ void QgsRelationManager::removePolymorphicRelation( const QString &polymorphicRe
 {
   QgsPolymorphicRelation relation = mPolymorphicRelations.take( polymorphicRelationId );
 
-  const QList<QgsRelation> generatedRelations = relation.getGeneratedRelations();
+  const QList<QgsRelation> generatedRelations = relation.generateRelations();
   for ( const QgsRelation &generatedRelation : generatedRelations )
     removeRelation( generatedRelation.id() );
 }
diff --git a/tests/src/python/test_qgspolymorphicrelation.py b/tests/src/python/test_qgspolymorphicrelation.py
@@ -164,7 +164,7 @@ def test_layerRepresentation(self):
 
         self.assertEqual(poly_rel.layerRepresentation(self.referencedLayer1), 'referencedlayer1')
 
-    def test_getGeneratedRelations(self):
+    def test_generateRelations(self):
         poly_rel = QgsPolymorphicRelation()
         poly_rel.setId('poly_rel1')
         poly_rel.setName('Polymorphic Relation Number One')
@@ -178,7 +178,7 @@ def test_getGeneratedRelations(self):
 
         self.assertTrue(poly_rel.isValid())
 
-        rels = poly_rel.getGeneratedRelations()
+        rels = poly_rel.generateRelations()
 
         self.assertEqual(len(rels), 2)
 

Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ QStringList QgsPolymorphicRelation::referencedLayerIds() const`
`357`	`357`	`return d->mReferencedLayerIds;`
`358`	`358`	`}`
`359`	`359`
`360`		`-QList<QgsRelation> QgsPolymorphicRelation::getGeneratedRelations() const`
	`360`	`+QList<QgsRelation> QgsPolymorphicRelation::generateRelations() const`
`361`	`361`	`{`
`362`	`362`	`QList<QgsRelation> relations;`
`363`	`363`
Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ void QgsRelationManager::addPolymorphicRelation( const QgsPolymorphicRelation &p`
`328`	`328`
`329`	`329`	`mPolymorphicRelations.insert( polymorphicRelation.id(), polymorphicRelation );`
`330`	`330`
`331`		`- const QList<QgsRelation> generatedRelations = polymorphicRelation.getGeneratedRelations();`
	`331`	`+ const QList<QgsRelation> generatedRelations = polymorphicRelation.generateRelations();`
`332`	`332`	`for ( const QgsRelation &generatedRelation : generatedRelations )`
`333`	`333`	`addRelation( generatedRelation );`
`334`	`334`	`}`
`@@ -337,7 +337,7 @@ void QgsRelationManager::removePolymorphicRelation( const QString &polymorphicRe`
`337`	`337`	`{`
`338`	`338`	`QgsPolymorphicRelation relation = mPolymorphicRelations.take( polymorphicRelationId );`
`339`	`339`
`340`		`- const QList<QgsRelation> generatedRelations = relation.getGeneratedRelations();`
	`340`	`+ const QList<QgsRelation> generatedRelations = relation.generateRelations();`
`341`	`341`	`for ( const QgsRelation &generatedRelation : generatedRelations )`
`342`	`342`	`removeRelation( generatedRelation.id() );`
`343`	`343`	`}`