Rename QgsPolymorphicRelations getGeneratedRelations -> generateRelat…

…ions
qgis · Jan 12, 2021 · f8b468a · f8b468a
1 parent 41e1e61
commit f8b468a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
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)