Fix doxygen warning

nyalldawson · nyalldawson · commit b55708ec7b13 · 2015-10-09T06:52:04.000+11:00
diff --git a/python/core/qgsvectorlayereditutils.sip b/python/core/qgsvectorlayereditutils.sip
@@ -27,7 +27,7 @@ class QgsVectorLayerEditUtils
 
     /** Adds a ring to polygon/multipolygon features
      * @param ring ring to add
-     * @param featureId if specified, feature ID for feature ring was added to will be stored in this parameter
+     * @param modifiedFeatureId if specified, feature ID for feature ring was added to will be stored in this parameter
      * @param preferredFeatureIds if specified, the features will be the first candidates for adding a ring. Otherwise
      * all intersecting features are tested and the ring is added to the first valid feature.
      @return
@@ -37,7 +37,7 @@ class QgsVectorLayerEditUtils
        3 ring not valid,
        4 ring crosses existing rings,
        5 no feature found where ring can be inserted*/
-    int addRing( const QList<QgsPoint>& ring, QgsFeatureId* featureId = 0 );
+    int addRing( const QList<QgsPoint>& ring, QgsFeatureId* modifiedFeatureId = 0 );
 
     /** Adds a new part polygon to a multipart feature
      @return
diff --git a/src/core/qgsvectorlayereditutils.cpp b/src/core/qgsvectorlayereditutils.cpp
@@ -104,7 +104,7 @@ bool QgsVectorLayerEditUtils::deleteVertex( QgsFeatureId atFeatureId, int atVert
   return true;
 }
 
-int QgsVectorLayerEditUtils::addRing( const QList<QgsPoint>& ring, QgsFeatureId* featureId, const QgsFeatureIds& preferredFeatureIds )
+int QgsVectorLayerEditUtils::addRing( const QList<QgsPoint>& ring, QgsFeatureId* modifiedFeatureId, const QgsFeatureIds& preferredFeatureIds )
 {
   QgsLineStringV2* ringLine = new QgsLineStringV2();
   QList< QgsPointV2 > ringPoints;
@@ -114,7 +114,7 @@ int QgsVectorLayerEditUtils::addRing( const QList<QgsPoint>& ring, QgsFeatureId*
     ringPoints.append( QgsPointV2( ringIt->x(), ringIt->y() ) );
   }
   ringLine->setPoints( ringPoints );
-  return addRing( ringLine, featureId, preferredFeatureIds );
+  return addRing( ringLine, modifiedFeatureId, preferredFeatureIds );
 }
 
 int QgsVectorLayerEditUtils::addRing( QgsCurveV2* ring, QgsFeatureId* modifiedFeatureId, const QgsFeatureIds& preferredFeatureIds )
diff --git a/src/core/qgsvectorlayereditutils.h b/src/core/qgsvectorlayereditutils.h
@@ -69,7 +69,7 @@ class CORE_EXPORT QgsVectorLayerEditUtils
 
     /** Adds a ring to polygon/multipolygon features
      * @param ring ring to add
-     * @param featureId if specified, feature ID for feature ring was added to will be stored in this parameter
+     * @param modifiedFeatureId if specified, feature ID for feature ring was added to will be stored in this parameter
      * @param preferredFeatureIds if specified, the features will be the first candidates for adding a ring. Otherwise
      * all intersecting features are tested and the ring is added to the first valid feature.
          @return

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ bool QgsVectorLayerEditUtils::deleteVertex( QgsFeatureId atFeatureId, int atVert`
`104`	`104`	`return true;`
`105`	`105`	`}`
`106`	`106`
`107`		`-int QgsVectorLayerEditUtils::addRing( const QList<QgsPoint>& ring, QgsFeatureId* featureId, const QgsFeatureIds& preferredFeatureIds )`
	`107`	`+int QgsVectorLayerEditUtils::addRing( const QList<QgsPoint>& ring, QgsFeatureId* modifiedFeatureId, const QgsFeatureIds& preferredFeatureIds )`
`108`	`108`	`{`
`109`	`109`	`QgsLineStringV2* ringLine = new QgsLineStringV2();`
`110`	`110`	`QList< QgsPointV2 > ringPoints;`
`@@ -114,7 +114,7 @@ int QgsVectorLayerEditUtils::addRing( const QList<QgsPoint>& ring, QgsFeatureId*`
`114`	`114`	`ringPoints.append( QgsPointV2( ringIt->x(), ringIt->y() ) );`
`115`	`115`	`}`
`116`	`116`	`ringLine->setPoints( ringPoints );`
`117`		`- return addRing( ringLine, featureId, preferredFeatureIds );`
	`117`	`+ return addRing( ringLine, modifiedFeatureId, preferredFeatureIds );`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`int QgsVectorLayerEditUtils::addRing( QgsCurveV2* ring, QgsFeatureId* modifiedFeatureId, const QgsFeatureIds& preferredFeatureIds )`