sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-27 00:07:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename QgsPolymorphicRelations getGeneratedRelations -> generateRelations

Browse Source
This commit is contained in:
Ivan Ivanov 2021-01-12 23:49:40 +02:00
parent 41e1e61513
commit f8b468a045
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/auto_generated/qgspolymorphicrelation.sip.in
View File

@ -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 Returns a list of layer ids to be used as potential referenced layers
%End %End
QList<QgsRelation> getGeneratedRelations() const; QList<QgsRelation> generateRelations() const;
%Docstring %Docstring
Returns a list of generated relations, based on the currently set :py:func:`~QgsPolymorphicRelation.referencedLayerIds` Returns a list of generated relations, based on the currently set :py:func:`~QgsPolymorphicRelation.referencedLayerIds`
%End %End

2
src/core/qgspolymorphicrelation.cpp
View File

@ -357,7 +357,7 @@ QStringList QgsPolymorphicRelation::referencedLayerIds() const
return d->mReferencedLayerIds; return d->mReferencedLayerIds;
} }
QList<QgsRelation> QgsPolymorphicRelation::getGeneratedRelations() const QList<QgsRelation> QgsPolymorphicRelation::generateRelations() const
{ {
QList<QgsRelation> relations; QList<QgsRelation> relations;

2
src/core/qgspolymorphicrelation.h
View File

@ -267,7 +267,7 @@ class CORE_EXPORT QgsPolymorphicRelation
/** /**
* Returns a list of generated relations, based on the currently set referencedLayerIds() * 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 * Returns layer representation as evaluated string

4
src/core/qgsrelationmanager.cpp
View File

@ -328,7 +328,7 @@ void QgsRelationManager::addPolymorphicRelation( const QgsPolymorphicRelation &p
mPolymorphicRelations.insert( polymorphicRelation.id(), polymorphicRelation ); mPolymorphicRelations.insert( polymorphicRelation.id(), polymorphicRelation );
const QList<QgsRelation> generatedRelations = polymorphicRelation.getGeneratedRelations(); const QList<QgsRelation> generatedRelations = polymorphicRelation.generateRelations();
for ( const QgsRelation &generatedRelation : generatedRelations ) for ( const QgsRelation &generatedRelation : generatedRelations )
addRelation( generatedRelation ); addRelation( generatedRelation );
} }
@ -337,7 +337,7 @@ void QgsRelationManager::removePolymorphicRelation( const QString &polymorphicRe
{ {
QgsPolymorphicRelation relation = mPolymorphicRelations.take( polymorphicRelationId ); QgsPolymorphicRelation relation = mPolymorphicRelations.take( polymorphicRelationId );
const QList<QgsRelation> generatedRelations = relation.getGeneratedRelations(); const QList<QgsRelation> generatedRelations = relation.generateRelations();
for ( const QgsRelation &generatedRelation : generatedRelations ) for ( const QgsRelation &generatedRelation : generatedRelations )
removeRelation( generatedRelation.id() ); removeRelation( generatedRelation.id() );
} }

4
tests/src/python/test_qgspolymorphicrelation.py
View File

@ -164,7 +164,7 @@ class TestQgsRelation(unittest.TestCase):
self.assertEqual(poly_rel.layerRepresentation(self.referencedLayer1), 'referencedlayer1') self.assertEqual(poly_rel.layerRepresentation(self.referencedLayer1), 'referencedlayer1')
def test_getGeneratedRelations(self): def test_generateRelations(self):
poly_rel = QgsPolymorphicRelation() poly_rel = QgsPolymorphicRelation()
poly_rel.setId('poly_rel1') poly_rel.setId('poly_rel1')
poly_rel.setName('Polymorphic Relation Number One') poly_rel.setName('Polymorphic Relation Number One')
@ -178,7 +178,7 @@ class TestQgsRelation(unittest.TestCase):
self.assertTrue(poly_rel.isValid()) self.assertTrue(poly_rel.isValid())
rels = poly_rel.getGeneratedRelations() rels = poly_rel.generateRelations()
self.assertEqual(len(rels), 2) self.assertEqual(len(rels), 2)