Return invalid feature instead of nullptr from QgsFеatureAction::feat…

…ure()
qgis · Sep 10, 2020 · 4257332 · 4257332
1 parent 018ca92
commit 4257332
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -623,7 +623,7 @@ void QgsAttributeTableDialog::mActionAddFeatureViaAttributeTable_triggered()
   if ( action.addFeature() )
   {
     masterModel->reload( masterModel->index( 0, 0 ), masterModel->index( masterModel->rowCount() - 1, masterModel->columnCount() - 1 ) );
-    mMainView->setCurrentEditSelection( QgsFeatureIds() << action.feature()->id() );
+    mMainView->setCurrentEditSelection( QgsFeatureIds() << action.feature().id() );
   }
 }
 
@@ -644,7 +644,7 @@ void QgsAttributeTableDialog::mActionAddFeatureViaAttributeForm_triggered()
   if ( action.addFeature() )
   {
     masterModel->reload( masterModel->index( 0, 0 ), masterModel->index( masterModel->rowCount() - 1, masterModel->columnCount() - 1 ) );
-    mMainView->setCurrentEditSelection( QgsFeatureIds() << action.feature()->id() );
+    mMainView->setCurrentEditSelection( QgsFeatureIds() << action.feature().id() );
   }
 }
 

diff --git a/src/app/qgsfeatureaction.cpp b/src/app/qgsfeatureaction.cpp
@@ -314,4 +314,9 @@ void QgsFeatureAction::onFeatureSaved( const QgsFeature &feature )
   }
 }
 
+QgsFeature QgsFeatureAction::feature() const
+{
+  return mFeature ? *mFeature : QgsFeature();
+}
+
 QHash<QgsVectorLayer *, QgsAttributeMap> QgsFeatureAction::sLastUsedValues;
diff --git a/src/app/qgsfeatureaction.h b/src/app/qgsfeatureaction.h
@@ -62,10 +62,9 @@ class APP_EXPORT QgsFeatureAction : public QAction
     void setForceSuppressFormPopup( bool force );
 
     /**
-     * Returns the current feature. It might be nullptr feature, so it's safe to use this method only
-     * right after`addFeature()` returned true.
+     * Returns the added feature or invalid feature in case addFeature() was not successful.
      */
-    QgsFeature *feature() const { return mFeature; }
+    QgsFeature feature() const;
 
   signals: