diff --git a/python/core/qgsvectordataprovider.sip b/python/core/qgsvectordataprovider.sip index 38175869bd10..5cf66e1b725c 100644 --- a/python/core/qgsvectordataprovider.sip +++ b/python/core/qgsvectordataprovider.sip @@ -112,7 +112,7 @@ class QgsVectorDataProvider : QgsDataProvider virtual QString dataComment() const; /** Restart reading features from previous select operation */ - virtual void reset() = 0; + virtual void begin() = 0; /** * Returns the minimum value of an attributs diff --git a/src/core/qgsvectordataprovider.h b/src/core/qgsvectordataprovider.h index 2d4aae04ffc9..c94120c3d884 100644 --- a/src/core/qgsvectordataprovider.h +++ b/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 reset() = 0; + virtual void begin() = 0; /** * Returns the minimum value of an attribute diff --git a/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp b/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp index 8ddaa657e2ef..018424bc1c3d 100644 --- a/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp +++ b/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp @@ -434,7 +434,7 @@ void QgsDelimitedTextProvider::select( QgsAttributeList fetchAttributes, { mSelectionRectangle = rect; } - reset(); + begin(); } @@ -476,7 +476,7 @@ const QgsFieldMap & QgsDelimitedTextProvider::fields() const return attributeFields; } -void QgsDelimitedTextProvider::reset() +void QgsDelimitedTextProvider::begin() { // Reset feature id to 0 mFid = 0; diff --git a/src/providers/delimitedtext/qgsdelimitedtextprovider.h b/src/providers/delimitedtext/qgsdelimitedtextprovider.h index 382343319a17..8156ee8636f2 100644 --- a/src/providers/delimitedtext/qgsdelimitedtextprovider.h +++ b/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 reset(); + virtual void begin(); /** Returns a bitmask containing the supported capabilities Note, some capabilities may change depending on whether diff --git a/src/providers/gpx/qgsgpxprovider.cpp b/src/providers/gpx/qgsgpxprovider.cpp index cfe8c95ed07f..c2e3e8a091d4 100644 --- a/src/providers/gpx/qgsgpxprovider.cpp +++ b/src/providers/gpx/qgsgpxprovider.cpp @@ -381,7 +381,7 @@ void QgsGPXProvider::select( QgsAttributeList fetchAttributes, mAttributesToFetch = fetchAttributes; mFetchGeom = fetchGeometry; - reset(); + begin(); } @@ -438,7 +438,7 @@ const QgsFieldMap& QgsGPXProvider::fields() const } -void QgsGPXProvider::reset() +void QgsGPXProvider::begin() { if ( mFeatureType == WaypointType ) mWptIter = data->waypointsBegin(); diff --git a/src/providers/gpx/qgsgpxprovider.h b/src/providers/gpx/qgsgpxprovider.h index f68b9f96b9bf..218c7b03e5e3 100644 --- a/src/providers/gpx/qgsgpxprovider.h +++ b/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 reset(); + virtual void begin(); /** * Adds a list of features diff --git a/src/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp index f05f63a6d74d..f5faf70b1c0f 100644 --- a/src/providers/grass/qgsgrassprovider.cpp +++ b/src/providers/grass/qgsgrassprovider.cpp @@ -557,7 +557,7 @@ int QgsGrassProvider::keyField() return mLayers[mLayerId].keyColumn; } -void QgsGrassProvider::reset() +void QgsGrassProvider::begin() { if ( isEdited() || isFrozen() || !mValid ) return; diff --git a/src/providers/grass/qgsgrassprovider.h b/src/providers/grass/qgsgrassprovider.h index 6161c1ec99f1..1af288adcddf 100644 --- a/src/providers/grass/qgsgrassprovider.h +++ b/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 reset(); + void begin(); /** Returns the minimum value of an attributs * @param index the index of the attribute */ diff --git a/src/providers/memory/memoryprovider.cpp b/src/providers/memory/memoryprovider.cpp index d2aa6e971ea7..9e4aaaf03754 100644 --- a/src/providers/memory/memoryprovider.cpp +++ b/src/providers/memory/memoryprovider.cpp @@ -175,10 +175,10 @@ void QgsMemoryProvider::select( QgsAttributeList fetchAttributes, mSelectSI_Features.clear(); } - reset(); + begin(); } -void QgsMemoryProvider::reset() +void QgsMemoryProvider::begin() { if ( mSelectUsingSpatialIndex ) mSelectSI_Iterator = mSelectSI_Features.begin(); diff --git a/src/providers/memory/memoryprovider.h b/src/providers/memory/memoryprovider.h index d34cd6723211..4bdac0636dcc 100644 --- a/src/providers/memory/memoryprovider.h +++ b/src/providers/memory/memoryprovider.h @@ -93,7 +93,7 @@ class QgsMemoryProvider : public QgsVectorDataProvider virtual const QgsFieldMap & fields() const; /** Restart reading features from previous select operation */ - virtual void reset(); + virtual void begin(); /** diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp index fd177ad51508..40745207d447 100644 --- a/src/providers/ogr/qgsogrprovider.cpp +++ b/src/providers/ogr/qgsogrprovider.cpp @@ -455,7 +455,7 @@ const QgsFieldMap & QgsOgrProvider::fields() const return mAttributeFields; } -void QgsOgrProvider::reset() +void QgsOgrProvider::begin() { OGR_L_ResetReading( ogrLayer ); } diff --git a/src/providers/ogr/qgsogrprovider.h b/src/providers/ogr/qgsogrprovider.h index b60d3638aedd..9612ebe41c58 100644 --- a/src/providers/ogr/qgsogrprovider.h +++ b/src/providers/ogr/qgsogrprovider.h @@ -120,7 +120,7 @@ class QgsOgrProvider : public QgsVectorDataProvider virtual QgsRect extent(); /** Restart reading features from previous select operation */ - virtual void reset(); + virtual void begin(); /**Writes a list of features to the file*/ virtual bool addFeatures( QgsFeatureList & flist ); diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp index 949e1a9d1ff4..05848d998e62 100644 --- a/src/providers/postgres/qgspostgresprovider.cpp +++ b/src/providers/postgres/qgspostgresprovider.cpp @@ -720,7 +720,7 @@ QString QgsPostgresProvider::dataComment() const return mDataComment; } -void QgsPostgresProvider::reset() +void QgsPostgresProvider::begin() { if ( mFetching ) { @@ -1876,7 +1876,7 @@ bool QgsPostgresProvider::addFeatures( QgsFeatureList & flist ) returnvalue = false; } - reset(); + begin(); return returnvalue; } @@ -1914,7 +1914,7 @@ bool QgsPostgresProvider::deleteFeatures( const QgsFeatureIds & id ) connectionRW->PQexecNR( "ROLLBACK" ); returnvalue = false; } - reset(); + begin(); return returnvalue; } @@ -1953,7 +1953,7 @@ bool QgsPostgresProvider::addAttributes( const QgsNewAttributesMap & name ) returnvalue = false; } - reset(); + begin(); return returnvalue; } @@ -1998,7 +1998,7 @@ bool QgsPostgresProvider::deleteAttributes( const QgsAttributeIds& ids ) returnvalue = false; } - reset(); + begin(); return returnvalue; } @@ -2068,7 +2068,7 @@ bool QgsPostgresProvider::changeAttributeValues( const QgsChangedAttributesMap & returnvalue = false; } - reset(); + begin(); return returnvalue; } @@ -2148,7 +2148,7 @@ bool QgsPostgresProvider::changeGeometryValues( QgsGeometryMap & geometry_map ) returnvalue = false; } - reset(); + begin(); QgsDebugMsg( "exiting." ); diff --git a/src/providers/postgres/qgspostgresprovider.h b/src/providers/postgres/qgspostgresprovider.h index f91e705208bb..41783a580fe9 100644 --- a/src/providers/postgres/qgspostgresprovider.h +++ b/src/providers/postgres/qgspostgresprovider.h @@ -176,7 +176,7 @@ class QgsPostgresProvider : public QgsVectorDataProvider /** Reset the layer - for a PostgreSQL layer, this means clearing the PQresult * pointer, setting it to 0 and reloading the field list */ - void reset(); + void begin(); /** Returns the minimum value of an attribute * @param index the index of the attribute */ diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp index 2c3ac2c3b58c..88b7b70f13f8 100644 --- a/src/providers/wfs/qgswfsprovider.cpp +++ b/src/providers/wfs/qgswfsprovider.cpp @@ -130,7 +130,7 @@ const QgsFieldMap & QgsWFSProvider::fields() const return mFields; } -void QgsWFSProvider::reset() +void QgsWFSProvider::begin() { mFeatureIterator = mSelectedFeatures.begin(); } diff --git a/src/providers/wfs/qgswfsprovider.h b/src/providers/wfs/qgswfsprovider.h index 67a348ca0b1b..30b12cbe3313 100644 --- a/src/providers/wfs/qgswfsprovider.h +++ b/src/providers/wfs/qgswfsprovider.h @@ -69,7 +69,7 @@ class QgsWFSProvider: public QgsVectorDataProvider long featureCount() const; uint fieldCount() const; const QgsFieldMap & fields() const; - void reset(); + void begin(); virtual QgsCoordinateReferenceSystem getCRS(); @@ -114,7 +114,7 @@ class QgsWFSProvider: public QgsVectorDataProvider QgsSpatialIndex *mSpatialIndex; /**Vector where the ids of the selected features are inserted*/ QList mSelectedFeatures; - /**Iterator on the feature vector for use in reset(), getNextFeature(), etc...*/ + /**Iterator on the feature vector for use in begin(), getNextFeature(), etc...*/ QList::iterator mFeatureIterator; /**Vector where the features are inserted*/ QList mFeatures; diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp index d935b768f771..46bf54b08714 100644 --- a/src/providers/wms/qgswmsprovider.cpp +++ b/src/providers/wms/qgswmsprovider.cpp @@ -1666,7 +1666,7 @@ QgsRect QgsWmsProvider::extent() return layerExtent; } -void QgsWmsProvider::reset() +void QgsWmsProvider::begin() { // TODO } diff --git a/src/providers/wms/qgswmsprovider.h b/src/providers/wms/qgswmsprovider.h index 80bff537b10e..29aa20b7b3b8 100644 --- a/src/providers/wms/qgswmsprovider.h +++ b/src/providers/wms/qgswmsprovider.h @@ -449,7 +449,7 @@ class QgsWmsProvider : public QgsRasterDataProvider /** Reset the layer - for a PostgreSQL layer, this means clearing the PQresult * pointer and setting it to 0 */ - void reset(); + void begin(); /**Returns true if layer is valid */