Changed begin() to rewind() on provider interface

git-svn-id: http://svn.osgeo.org/qgis/trunk@9582 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: timlinux

python/core/qgsvectordataprovider.sip

@@ -112,7 +112,7 @@ class QgsVectorDataProvider : QgsDataProvider
       virtual QString dataComment() const;
 
       /** Restart reading features from previous select operation */
-      virtual void begin() = 0;
+      virtual void rewind() = 0;
 
       /**
        * Returns the minimum value of an attributs

src/core/qgsvectordataprovider.h

@@ -155,7 +155,7 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
     virtual QString dataComment() const;
 
     /** Restart reading features from previous select operation */
-    virtual void begin() = 0;
+    virtual void rewind() = 0;
 
     /**
      * Returns the minimum value of an attribute

src/providers/delimitedtext/qgsdelimitedtextprovider.cpp

@@ -434,7 +434,7 @@ void QgsDelimitedTextProvider::select( QgsAttributeList fetchAttributes,
   {
     mSelectionRectangle = rect;
   }
-  begin();
+  rewind();
 }
 
 
@@ -476,7 +476,7 @@ const QgsFieldMap & QgsDelimitedTextProvider::fields() const
   return attributeFields;
 }
 
-void QgsDelimitedTextProvider::begin()
+void QgsDelimitedTextProvider::rewind()
 {
   // Reset feature id to 0
   mFid = 0;

src/providers/delimitedtext/qgsdelimitedtextprovider.h

@@ -103,7 +103,7 @@ class QgsDelimitedTextProvider : public QgsVectorDataProvider
     virtual const QgsFieldMap & fields() const;
 
     /** Restart reading features from previous select operation */
-    virtual void begin();
+    virtual void rewind();
 
     /** Returns a bitmask containing the supported capabilities
         Note, some capabilities may change depending on whether

src/providers/gpx/qgsgpxprovider.cpp

@@ -425,7 +425,7 @@ void QgsGPXProvider::select( QgsAttributeList fetchAttributes,
   mAttributesToFetch = fetchAttributes;
   mFetchGeom = fetchGeometry;
 
-  begin();
+  rewind();
 }
 
 
@@ -482,7 +482,7 @@ const QgsFieldMap& QgsGPXProvider::fields() const
 }
 
 
-void QgsGPXProvider::begin()
+void QgsGPXProvider::rewind()
 {
   if ( mFeatureType == WaypointType )
     mWptIter = data->waypointsBegin();

src/providers/gpx/qgsgpxprovider.h

@@ -93,7 +93,7 @@ class QgsGPXProvider : public QgsVectorDataProvider
     virtual const QgsFieldMap & fields() const;
 
     /** Restart reading features from previous select operation */
-    virtual void begin();
+    virtual void rewind();
 
     /**
      * Adds a list of features

src/providers/grass/qgsgrassprovider.cpp

@@ -557,7 +557,7 @@ int QgsGrassProvider::keyField()
   return mLayers[mLayerId].keyColumn;
 }
 
-void QgsGrassProvider::begin()
+void QgsGrassProvider::rewind()
 {
   if ( isEdited() || isFrozen() || !mValid )
     return;

src/providers/grass/qgsgrassprovider.h

@@ -175,7 +175,7 @@ class GRASS_EXPORT QgsGrassProvider : public QgsVectorDataProvider
     int keyField();
 
     /** Restart reading features from previous select operation */
-    void begin();
+    void rewind();
 
     /** Returns the minimum value of an attributs
      *  @param index the index of the attribute */

src/providers/memory/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-SET (MEMORY_SRCS memoryprovider.cpp)
+SET (MEMORY_SRCS qgsmemoryprovider.cpp)
 
 INCLUDE_DIRECTORIES(
   .

src/providers/memory/memoryprovider.cpp renamed to src/providers/memory/qgsmemoryprovider.cpp

@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "memoryprovider.h"
+#include "qgsmemoryprovider.h"
 
 #include "qgsfeature.h"
 #include "qgsfield.h"
@@ -175,10 +175,10 @@ void QgsMemoryProvider::select( QgsAttributeList fetchAttributes,
     mSelectSI_Features.clear();
   }
 
-  begin();
+  rewind();
 }
 
-void QgsMemoryProvider::begin()
+void QgsMemoryProvider::rewind()
 {
   if ( mSelectUsingSpatialIndex )
     mSelectSI_Iterator = mSelectSI_Features.begin();