Use the less confusing QgsRelation::type()

qgis · Jan 18, 2021 · d092770 · d092770
1 parent 9c8d99e
commit d092770
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/src/app/qgsrelationmanagerdialog.cpp b/src/app/qgsrelationmanagerdialog.cpp
@@ -76,7 +76,7 @@ void QgsRelationManagerDialog::setLayers( const QList< QgsVectorLayer * > &layer
   {
     // the generated relations for polymorphic relations should be ignored,
     // they are generated when the polymorphic relation is added to the table
-    if ( !rel.polymorphicRelationId().isEmpty() )
+    if ( rel.type() == QgsRelation::Generated )
       continue;
 
     addRelation( rel );

diff --git a/src/core/qgsrelationmanager.cpp b/src/core/qgsrelationmanager.cpp
@@ -235,8 +235,8 @@ void QgsRelationManager::writeProject( QDomDocument &doc )
   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
-    if ( !relation.polymorphicRelationId().isEmpty() )
+    // they are generated every time when a polymorphic relation is added
+    if ( relation.type() == QgsRelation::Generated )
       continue;
 
     relation.writeXml( relationsNode, doc );

diff --git a/src/core/vector/qgsvectorlayer.cpp b/src/core/vector/qgsvectorlayer.cpp
@@ -2640,7 +2640,7 @@ bool QgsVectorLayer::writeSymbology( QDomNode &node, QDomDocument &doc, QString
     const auto constReferencingRelations { QgsProject::instance()->relationManager()->referencingRelations( this ) };
     for ( const auto &rel : constReferencingRelations )
     {
-      if ( rel.polymorphicRelationId().isNull() )
+      if ( rel.type() == QgsRelation::Normal )
       {
         QgsWeakRelation::writeXml( this, QgsWeakRelation::Referencing, rel, referencedLayersElement, doc );
       }
@@ -2653,7 +2653,7 @@ bool QgsVectorLayer::writeSymbology( QDomNode &node, QDomDocument &doc, QString
     const auto constReferencedRelations { QgsProject::instance()->relationManager()->referencedRelations( this ) };
     for ( const auto &rel : constReferencedRelations )
     {
-      if ( rel.polymorphicRelationId().isNull() )
+      if ( rel.type() == QgsRelation::Normal )
       {
         QgsWeakRelation::writeXml( this, QgsWeakRelation::Referenced, rel, referencingLayersElement, doc );
       }

diff --git a/src/gui/editorwidgets/qgsrelationreferenceconfigdlg.cpp b/src/gui/editorwidgets/qgsrelationreferenceconfigdlg.cpp
@@ -38,7 +38,7 @@ QgsRelationReferenceConfigDlg::QgsRelationReferenceConfigDlg( QgsVectorLayer *vl
   const auto constReferencingRelations = vl->referencingRelations( fieldIdx );
   for ( const QgsRelation &relation : constReferencingRelations )
   {
-    if ( !relation.polymorphicRelationId().isNull() )
+    if ( relation.type() == QgsRelation::Generated )
       continue;
 
     if ( relation.name().isEmpty() )

diff --git a/src/gui/editorwidgets/qgsrelationreferencefactory.cpp b/src/gui/editorwidgets/qgsrelationreferencefactory.cpp
@@ -56,13 +56,13 @@ QHash<const char *, int> QgsRelationReferenceFactory::supportedWidgetTypes()
 
 unsigned int QgsRelationReferenceFactory::fieldScore( const QgsVectorLayer *vl, int fieldIdx ) const
 {
-  int nonGeneratedRelationsCount = 0;
+  int normalRelationsCount = 0;
   const QList<QgsRelation> relations = vl->referencingRelations( fieldIdx );
   for ( const QgsRelation &rel : relations )
   {
-    if ( rel.polymorphicRelationId().isNull() )
-      nonGeneratedRelationsCount++;
+    if ( rel.type() == QgsRelation::Normal )
+      normalRelationsCount++;
   }
   // generated relations should not be used for relation reference widget
-  return nonGeneratedRelationsCount > 0 ? 21 /*A bit stronger than the range widget*/ : 5;
+  return normalRelationsCount > 0 ? 21 /*A bit stronger than the range widget*/ : 5;
 }
diff --git a/src/gui/qgsabstractrelationeditorwidget.cpp b/src/gui/qgsabstractrelationeditorwidget.cpp
@@ -223,8 +223,8 @@ void QgsAbstractRelationEditorWidget::addFeature( const QgsGeometry &geometry )
 
   if ( mNmRelation.isValid() )
   {
-    // there is no such case where we have polymorphic relations and m:n relation
-    Q_ASSERT( mNmRelation.polymorphicRelationId().isNull() );
+    // only normal relations support m:n relation
+    Q_ASSERT( mNmRelation.type() == QgsRelation::Normal );
 
     // n:m Relation: first let the user create a new feature on the other table
     // and autocreate a new linking feature.
@@ -261,7 +261,7 @@ void QgsAbstractRelationEditorWidget::addFeature( const QgsGeometry &geometry )
   else
   {
     QgsFields fields = mRelation.referencingLayer()->fields();
-    if ( ! mRelation.polymorphicRelationId().isNull() )
+    if ( mRelation.type() == QgsRelation::Normal )
     {
       QgsPolymorphicRelation polyRel = mRelation.polymorphicRelation();
       keyAttrs.insert( fields.indexFromName( polyRel.referencedLayerField() ), polyRel.layerRepresentation( mRelation.referencedLayer() ) );
@@ -288,8 +288,8 @@ void QgsAbstractRelationEditorWidget::deleteFeatures( const QgsFeatureIds &fids
   QgsVectorLayer *layer;
   if ( mNmRelation.isValid() )
   {
-    // there is no such case where we have polymorphic relations and m:n relation
-    Q_ASSERT( mNmRelation.polymorphicRelationId().isNull() );
+    // only normal relations support m:n relation
+    Q_ASSERT( mNmRelation.type() == QgsRelation::Normal );
 
     layer = mNmRelation.referencedLayer();
 
@@ -404,8 +404,8 @@ void QgsAbstractRelationEditorWidget::linkFeature()
 
   if ( mNmRelation.isValid() )
   {
-    // there is no such case where we have polymorphic relations and m:n relation
-    Q_ASSERT( mNmRelation.polymorphicRelationId().isNull() );
+    // only normal relations support m:n relation
+    Q_ASSERT( mNmRelation.type() == QgsRelation::Normal );
 
     layer = mNmRelation.referencedLayer();
   }
@@ -427,8 +427,8 @@ void QgsAbstractRelationEditorWidget::onLinkFeatureDlgAccepted()
   QgsFeatureSelectionDlg *selectionDlg = qobject_cast<QgsFeatureSelectionDlg *>( sender() );
   if ( mNmRelation.isValid() )
   {
-    // there is no such case where we have polymorphic relations and m:n relation
-    Q_ASSERT( mNmRelation.polymorphicRelationId().isNull() );
+    // only normal relations support m:n relation
+    Q_ASSERT( mNmRelation.type() == QgsRelation::Normal );
 
     QgsFeatureIterator it = mNmRelation.referencedLayer()->getFeatures(
                               QgsFeatureRequest()
@@ -488,7 +488,7 @@ void QgsAbstractRelationEditorWidget::onLinkFeatureDlgAccepted()
     for ( QgsFeatureId fid : constSelectedFeatures )
     {
       QgsVectorLayer *referencingLayer = mRelation.referencingLayer();
-      if ( ! mRelation.polymorphicRelationId().isNull() )
+      if ( mRelation.type() == QgsRelation::Normal )
       {
         QgsPolymorphicRelation polyRel = mRelation.polymorphicRelation();
 
@@ -520,8 +520,8 @@ void QgsAbstractRelationEditorWidget::unlinkFeatures( const QgsFeatureIds &fids
 {
   if ( mNmRelation.isValid() )
   {
-    // there is no such case where we have polymorphic relations and m:n relation
-    Q_ASSERT( mNmRelation.polymorphicRelationId().isNull() );
+    // only normal relations support m:n relation
+    Q_ASSERT( mNmRelation.type() == QgsRelation::Normal );
 
     QgsFeatureIterator selectedIterator = mNmRelation.referencedLayer()->getFeatures(
                                             QgsFeatureRequest()
@@ -577,7 +577,7 @@ void QgsAbstractRelationEditorWidget::unlinkFeatures( const QgsFeatureIds &fids
     for ( QgsFeatureId fid : constFeatureids )
     {
       QgsVectorLayer *referencingLayer = mRelation.referencingLayer();
-      if ( ! mRelation.polymorphicRelationId().isNull() )
+      if ( mRelation.type() == QgsRelation::Normal )
       {
         QgsPolymorphicRelation polyRel = mRelation.polymorphicRelation();