Skip to content

Commit 107a21b

Browse files
author
timlinux
committedOct 6, 2008
API Cleanup: Use begin() instead of reset() to move to start of selected features
git-svn-id: http://svn.osgeo.org/qgis/trunk@9447 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 8892abf commit 107a21b

18 files changed

+28
-28
lines changed
 

‎python/core/qgsvectordataprovider.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class QgsVectorDataProvider : QgsDataProvider
112112
virtual QString dataComment() const;
113113

114114
/** Restart reading features from previous select operation */
115-
virtual void reset() = 0;
115+
virtual void begin() = 0;
116116

117117
/**
118118
* Returns the minimum value of an attributs

‎src/core/qgsvectordataprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
155155
virtual QString dataComment() const;
156156

157157
/** Restart reading features from previous select operation */
158-
virtual void reset() = 0;
158+
virtual void begin() = 0;
159159

160160
/**
161161
* Returns the minimum value of an attribute

‎src/providers/delimitedtext/qgsdelimitedtextprovider.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ void QgsDelimitedTextProvider::select( QgsAttributeList fetchAttributes,
434434
{
435435
mSelectionRectangle = rect;
436436
}
437-
reset();
437+
begin();
438438
}
439439

440440

@@ -476,7 +476,7 @@ const QgsFieldMap & QgsDelimitedTextProvider::fields() const
476476
return attributeFields;
477477
}
478478

479-
void QgsDelimitedTextProvider::reset()
479+
void QgsDelimitedTextProvider::begin()
480480
{
481481
// Reset feature id to 0
482482
mFid = 0;

‎src/providers/delimitedtext/qgsdelimitedtextprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class QgsDelimitedTextProvider : public QgsVectorDataProvider
103103
virtual const QgsFieldMap & fields() const;
104104

105105
/** Restart reading features from previous select operation */
106-
virtual void reset();
106+
virtual void begin();
107107

108108
/** Returns a bitmask containing the supported capabilities
109109
Note, some capabilities may change depending on whether

‎src/providers/gpx/qgsgpxprovider.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ void QgsGPXProvider::select( QgsAttributeList fetchAttributes,
381381
mAttributesToFetch = fetchAttributes;
382382
mFetchGeom = fetchGeometry;
383383

384-
reset();
384+
begin();
385385
}
386386

387387

@@ -438,7 +438,7 @@ const QgsFieldMap& QgsGPXProvider::fields() const
438438
}
439439

440440

441-
void QgsGPXProvider::reset()
441+
void QgsGPXProvider::begin()
442442
{
443443
if ( mFeatureType == WaypointType )
444444
mWptIter = data->waypointsBegin();

‎src/providers/gpx/qgsgpxprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class QgsGPXProvider : public QgsVectorDataProvider
9393
virtual const QgsFieldMap & fields() const;
9494

9595
/** Restart reading features from previous select operation */
96-
virtual void reset();
96+
virtual void begin();
9797

9898
/**
9999
* Adds a list of features

‎src/providers/grass/qgsgrassprovider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ int QgsGrassProvider::keyField()
557557
return mLayers[mLayerId].keyColumn;
558558
}
559559

560-
void QgsGrassProvider::reset()
560+
void QgsGrassProvider::begin()
561561
{
562562
if ( isEdited() || isFrozen() || !mValid )
563563
return;

‎src/providers/grass/qgsgrassprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ class GRASS_EXPORT QgsGrassProvider : public QgsVectorDataProvider
175175
int keyField();
176176

177177
/** Restart reading features from previous select operation */
178-
void reset();
178+
void begin();
179179

180180
/** Returns the minimum value of an attributs
181181
* @param index the index of the attribute */

‎src/providers/memory/memoryprovider.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,10 @@ void QgsMemoryProvider::select( QgsAttributeList fetchAttributes,
175175
mSelectSI_Features.clear();
176176
}
177177

178-
reset();
178+
begin();
179179
}
180180

181-
void QgsMemoryProvider::reset()
181+
void QgsMemoryProvider::begin()
182182
{
183183
if ( mSelectUsingSpatialIndex )
184184
mSelectSI_Iterator = mSelectSI_Features.begin();

‎src/providers/memory/memoryprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class QgsMemoryProvider : public QgsVectorDataProvider
9393
virtual const QgsFieldMap & fields() const;
9494

9595
/** Restart reading features from previous select operation */
96-
virtual void reset();
96+
virtual void begin();
9797

9898

9999
/**

‎src/providers/ogr/qgsogrprovider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ const QgsFieldMap & QgsOgrProvider::fields() const
455455
return mAttributeFields;
456456
}
457457

458-
void QgsOgrProvider::reset()
458+
void QgsOgrProvider::begin()
459459
{
460460
OGR_L_ResetReading( ogrLayer );
461461
}

‎src/providers/ogr/qgsogrprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class QgsOgrProvider : public QgsVectorDataProvider
120120
virtual QgsRect extent();
121121

122122
/** Restart reading features from previous select operation */
123-
virtual void reset();
123+
virtual void begin();
124124

125125
/**Writes a list of features to the file*/
126126
virtual bool addFeatures( QgsFeatureList & flist );

‎src/providers/postgres/qgspostgresprovider.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ QString QgsPostgresProvider::dataComment() const
720720
return mDataComment;
721721
}
722722

723-
void QgsPostgresProvider::reset()
723+
void QgsPostgresProvider::begin()
724724
{
725725
if ( mFetching )
726726
{
@@ -1876,7 +1876,7 @@ bool QgsPostgresProvider::addFeatures( QgsFeatureList & flist )
18761876
returnvalue = false;
18771877
}
18781878

1879-
reset();
1879+
begin();
18801880
return returnvalue;
18811881
}
18821882

@@ -1914,7 +1914,7 @@ bool QgsPostgresProvider::deleteFeatures( const QgsFeatureIds & id )
19141914
connectionRW->PQexecNR( "ROLLBACK" );
19151915
returnvalue = false;
19161916
}
1917-
reset();
1917+
begin();
19181918
return returnvalue;
19191919
}
19201920

@@ -1953,7 +1953,7 @@ bool QgsPostgresProvider::addAttributes( const QgsNewAttributesMap & name )
19531953
returnvalue = false;
19541954
}
19551955

1956-
reset();
1956+
begin();
19571957
return returnvalue;
19581958
}
19591959

@@ -1998,7 +1998,7 @@ bool QgsPostgresProvider::deleteAttributes( const QgsAttributeIds& ids )
19981998
returnvalue = false;
19991999
}
20002000

2001-
reset();
2001+
begin();
20022002
return returnvalue;
20032003
}
20042004

@@ -2068,7 +2068,7 @@ bool QgsPostgresProvider::changeAttributeValues( const QgsChangedAttributesMap &
20682068
returnvalue = false;
20692069
}
20702070

2071-
reset();
2071+
begin();
20722072

20732073
return returnvalue;
20742074
}
@@ -2148,7 +2148,7 @@ bool QgsPostgresProvider::changeGeometryValues( QgsGeometryMap & geometry_map )
21482148
returnvalue = false;
21492149
}
21502150

2151-
reset();
2151+
begin();
21522152

21532153
QgsDebugMsg( "exiting." );
21542154

‎src/providers/postgres/qgspostgresprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ class QgsPostgresProvider : public QgsVectorDataProvider
176176
/** Reset the layer - for a PostgreSQL layer, this means clearing the PQresult
177177
* pointer, setting it to 0 and reloading the field list
178178
*/
179-
void reset();
179+
void begin();
180180

181181
/** Returns the minimum value of an attribute
182182
* @param index the index of the attribute */

‎src/providers/wfs/qgswfsprovider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ const QgsFieldMap & QgsWFSProvider::fields() const
130130
return mFields;
131131
}
132132

133-
void QgsWFSProvider::reset()
133+
void QgsWFSProvider::begin()
134134
{
135135
mFeatureIterator = mSelectedFeatures.begin();
136136
}

‎src/providers/wfs/qgswfsprovider.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class QgsWFSProvider: public QgsVectorDataProvider
6969
long featureCount() const;
7070
uint fieldCount() const;
7171
const QgsFieldMap & fields() const;
72-
void reset();
72+
void begin();
7373

7474
virtual QgsCoordinateReferenceSystem getCRS();
7575

@@ -114,7 +114,7 @@ class QgsWFSProvider: public QgsVectorDataProvider
114114
QgsSpatialIndex *mSpatialIndex;
115115
/**Vector where the ids of the selected features are inserted*/
116116
QList<int> mSelectedFeatures;
117-
/**Iterator on the feature vector for use in reset(), getNextFeature(), etc...*/
117+
/**Iterator on the feature vector for use in begin(), getNextFeature(), etc...*/
118118
QList<int>::iterator mFeatureIterator;
119119
/**Vector where the features are inserted*/
120120
QList<QgsFeature*> mFeatures;

‎src/providers/wms/qgswmsprovider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1666,7 +1666,7 @@ QgsRect QgsWmsProvider::extent()
16661666
return layerExtent;
16671667
}
16681668

1669-
void QgsWmsProvider::reset()
1669+
void QgsWmsProvider::begin()
16701670
{
16711671
// TODO
16721672
}

‎src/providers/wms/qgswmsprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ class QgsWmsProvider : public QgsRasterDataProvider
449449
/** Reset the layer - for a PostgreSQL layer, this means clearing the PQresult
450450
* pointer and setting it to 0
451451
*/
452-
void reset();
452+
void begin();
453453

454454
/**Returns true if layer is valid
455455
*/

0 commit comments

Comments
 (0)
Please sign in to comment.