Marked updateFeatureCount() in QgsVectorLayer and QgsVectorDataProvider as meaningless functions.

wonder · wonder · commit c90349d7bcd2 · 2010-04-22T15:07:45.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13346 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsvectordataprovider.h b/src/core/qgsvectordataprovider.h
@@ -107,8 +107,8 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
                          bool useIntersect = false ) = 0;
 
     /**
-     * Update the feature count based on current spatial filter. If not
-     * overridden in the data provider this function returns -1
+     * This function does nothing useful, it's kept only for compatibility.
+     * @todo to be removed
      */
     virtual long updateFeatureCount();
 
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -911,9 +911,6 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
       mRendererV2->setVertexMarkerAppearance( currentVertexMarkerType(), currentVertexMarkerSize() );
     }
 
-    // TODO: really needed?
-    updateFeatureCount();
-
     QgsAttributeList attributes;
     foreach( QString attrName, mRendererV2->usedAttributes() )
     {
@@ -973,7 +970,6 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
       mVertexMarkerOnlyForSelection = settings.value( "/qgis/digitizing/marker_only_for_selected", false ).toBool();
     }
 
-    updateFeatureCount();
     int totalFeatures = pendingFeatureCount();
     int featureCount = 0;
     QgsFeature fet;
@@ -1374,12 +1370,7 @@ long QgsVectorLayer::featureCount() const
 
 long QgsVectorLayer::updateFeatureCount() const
 {
-  if ( !mDataProvider )
-  {
-    QgsDebugMsg( "invoked with null mDataProvider" );
-    return 0;
-  }
-  return mDataProvider->updateFeatureCount();
+  return -1;
 }
 
 void QgsVectorLayer::updateExtents()
@@ -3451,7 +3442,6 @@ bool QgsVectorLayer::commitChanges()
   }
 
   mDataProvider->updateExtents();
-  mDataProvider->updateFeatureCount();
 
   triggerRepaint();
 
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -228,8 +228,8 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
      */
     virtual long featureCount() const;
 
-    /** Update the feature count
-     * @return long containing the number of features in the datasource
+    /** This function does nothing useful, it's kept only for compatibility.
+     * @todo to be removed
      */
     virtual long updateFeatureCount() const;
 

Original file line number	Diff line number	Diff line change
`@@ -911,9 +911,6 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )`
`911`	`911`	`mRendererV2->setVertexMarkerAppearance( currentVertexMarkerType(), currentVertexMarkerSize() );`
`912`	`912`	`}`
`913`	`913`
`914`		`- // TODO: really needed?`
`915`		`- updateFeatureCount();`
`916`		`-`
`917`	`914`	`QgsAttributeList attributes;`
`918`	`915`	`foreach( QString attrName, mRendererV2->usedAttributes() )`
`919`	`916`	`{`
`@@ -973,7 +970,6 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )`
`973`	`970`	`mVertexMarkerOnlyForSelection = settings.value( "/qgis/digitizing/marker_only_for_selected", false ).toBool();`
`974`	`971`	`}`
`975`	`972`
`976`		`- updateFeatureCount();`
`977`	`973`	`int totalFeatures = pendingFeatureCount();`
`978`	`974`	`int featureCount = 0;`
`979`	`975`	`QgsFeature fet;`
`@@ -1374,12 +1370,7 @@ long QgsVectorLayer::featureCount() const`
`1374`	`1370`
`1375`	`1371`	`long QgsVectorLayer::updateFeatureCount() const`
`1376`	`1372`	`{`
`1377`		`- if ( !mDataProvider )`
`1378`		`- {`
`1379`		`- QgsDebugMsg( "invoked with null mDataProvider" );`
`1380`		`- return 0;`
`1381`		`- }`
`1382`		`- return mDataProvider->updateFeatureCount();`
	`1373`	`+ return -1;`
`1383`	`1374`	`}`
`1384`	`1375`
`1385`	`1376`	`void QgsVectorLayer::updateExtents()`
`@@ -3451,7 +3442,6 @@ bool QgsVectorLayer::commitChanges()`
`3451`	`3442`	`}`
`3452`	`3443`
`3453`	`3444`	`mDataProvider->updateExtents();`
`3454`		`- mDataProvider->updateFeatureCount();`
`3455`	`3445`
`3456`	`3446`	`triggerRepaint();`
`3457`	`3447`