From f8b468a0459823f86f04553b4ac8436d496c937a Mon Sep 17 00:00:00 2001 From: Ivan Ivanov Date: Tue, 12 Jan 2021 23:49:40 +0200 Subject: [PATCH] Rename QgsPolymorphicRelations getGeneratedRelations -> generateRelations --- python/core/auto_generated/qgspolymorphicrelation.sip.in | 2 +- src/core/qgspolymorphicrelation.cpp | 2 +- src/core/qgspolymorphicrelation.h | 2 +- src/core/qgsrelationmanager.cpp | 4 ++-- tests/src/python/test_qgspolymorphicrelation.py | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/python/core/auto_generated/qgspolymorphicrelation.sip.in b/python/core/auto_generated/qgspolymorphicrelation.sip.in index 5c36bb5609b..ef9dcf07ebf 100644 --- 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 getGeneratedRelations() const; + QList 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 index 5989ad1d05b..171c25f155c 100644 --- a/src/core/qgspolymorphicrelation.cpp +++ b/src/core/qgspolymorphicrelation.cpp @@ -357,7 +357,7 @@ QStringList QgsPolymorphicRelation::referencedLayerIds() const return d->mReferencedLayerIds; } -QList QgsPolymorphicRelation::getGeneratedRelations() const +QList QgsPolymorphicRelation::generateRelations() const { QList relations; diff --git a/src/core/qgspolymorphicrelation.h b/src/core/qgspolymorphicrelation.h index 2c0aba17f17..28232f3b2a5 100644 --- 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 getGeneratedRelations() const; + QList generateRelations() const; /** * Returns layer representation as evaluated string diff --git a/src/core/qgsrelationmanager.cpp b/src/core/qgsrelationmanager.cpp index e2f1420f705..618e7d22aab 100644 --- 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 generatedRelations = polymorphicRelation.getGeneratedRelations(); + const QList 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 generatedRelations = relation.getGeneratedRelations(); + const QList 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 index 27204a2f622..697ae2df891 100644 --- a/tests/src/python/test_qgspolymorphicrelation.py +++ b/tests/src/python/test_qgspolymorphicrelation.py @@ -164,7 +164,7 @@ class TestQgsRelation(unittest.TestCase): 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 @@ class TestQgsRelation(unittest.TestCase): self.assertTrue(poly_rel.isValid()) - rels = poly_rel.getGeneratedRelations() + rels = poly_rel.generateRelations() self.assertEqual(len(rels), 2)