[QGIS Commit] r9447 - in trunk/qgis: python/core src/core
src/providers/delimitedtext src/providers/gpx
src/providers/grass src/providers/memory src/providers/ogr
src/providers/postgres src/providers/wfs src/providers/wms
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Mon Oct 6 17:11:54 EDT 2008
Author: timlinux
Date: 2008-10-06 17:11:54 -0400 (Mon, 06 Oct 2008)
New Revision: 9447
Modified:
trunk/qgis/python/core/qgsvectordataprovider.sip
trunk/qgis/src/core/qgsvectordataprovider.h
trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.h
trunk/qgis/src/providers/gpx/qgsgpxprovider.cpp
trunk/qgis/src/providers/gpx/qgsgpxprovider.h
trunk/qgis/src/providers/grass/qgsgrassprovider.cpp
trunk/qgis/src/providers/grass/qgsgrassprovider.h
trunk/qgis/src/providers/memory/memoryprovider.cpp
trunk/qgis/src/providers/memory/memoryprovider.h
trunk/qgis/src/providers/ogr/qgsogrprovider.cpp
trunk/qgis/src/providers/ogr/qgsogrprovider.h
trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp
trunk/qgis/src/providers/postgres/qgspostgresprovider.h
trunk/qgis/src/providers/wfs/qgswfsprovider.cpp
trunk/qgis/src/providers/wfs/qgswfsprovider.h
trunk/qgis/src/providers/wms/qgswmsprovider.cpp
trunk/qgis/src/providers/wms/qgswmsprovider.h
Log:
API Cleanup: Use begin() instead of reset() to move to start of selected features
Modified: trunk/qgis/python/core/qgsvectordataprovider.sip
===================================================================
--- trunk/qgis/python/core/qgsvectordataprovider.sip 2008-10-06 18:50:42 UTC (rev 9446)
+++ trunk/qgis/python/core/qgsvectordataprovider.sip 2008-10-06 21:11:54 UTC (rev 9447)
@@ -112,7 +112,7 @@
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
Modified: trunk/qgis/src/core/qgsvectordataprovider.h
===================================================================
--- trunk/qgis/src/core/qgsvectordataprovider.h 2008-10-06 18:50:42 UTC (rev 9446)
+++ trunk/qgis/src/core/qgsvectordataprovider.h 2008-10-06 21:11:54 UTC (rev 9447)
@@ -155,7 +155,7 @@
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
Modified: trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
===================================================================
--- trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp 2008-10-06 18:50:42 UTC (rev 9446)
+++ trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp 2008-10-06 21:11:54 UTC (rev 9447)
@@ -434,7 +434,7 @@
{
mSelectionRectangle = rect;
}
- reset();
+ begin();
}
@@ -476,7 +476,7 @@
return attributeFields;
}
-void QgsDelimitedTextProvider::reset()
+void QgsDelimitedTextProvider::begin()
{
// Reset feature id to 0
mFid = 0;
Modified: trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.h
===================================================================
--- trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.h 2008-10-06 18:50:42 UTC (rev 9446)
+++ trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.h 2008-10-06 21:11:54 UTC (rev 9447)
@@ -103,7 +103,7 @@
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
Modified: trunk/qgis/src/providers/gpx/qgsgpxprovider.cpp
===================================================================
--- trunk/qgis/src/providers/gpx/qgsgpxprovider.cpp 2008-10-06 18:50:42 UTC (rev 9446)
+++ trunk/qgis/src/providers/gpx/qgsgpxprovider.cpp 2008-10-06 21:11:54 UTC (rev 9447)
@@ -381,7 +381,7 @@
mAttributesToFetch = fetchAttributes;
mFetchGeom = fetchGeometry;
- reset();
+ begin();
}
@@ -438,7 +438,7 @@
}
-void QgsGPXProvider::reset()
+void QgsGPXProvider::begin()
{
if ( mFeatureType == WaypointType )
mWptIter = data->waypointsBegin();
Modified: trunk/qgis/src/providers/gpx/qgsgpxprovider.h
===================================================================
--- trunk/qgis/src/providers/gpx/qgsgpxprovider.h 2008-10-06 18:50:42 UTC (rev 9446)
+++ trunk/qgis/src/providers/gpx/qgsgpxprovider.h 2008-10-06 21:11:54 UTC (rev 9447)
@@ -93,7 +93,7 @@
virtual const QgsFieldMap & fields() const;
/** Restart reading features from previous select operation */
- virtual void reset();
+ virtual void begin();
/**
* Adds a list of features
Modified: trunk/qgis/src/providers/grass/qgsgrassprovider.cpp
===================================================================
--- trunk/qgis/src/providers/grass/qgsgrassprovider.cpp 2008-10-06 18:50:42 UTC (rev 9446)
+++ trunk/qgis/src/providers/grass/qgsgrassprovider.cpp 2008-10-06 21:11:54 UTC (rev 9447)
@@ -557,7 +557,7 @@
return mLayers[mLayerId].keyColumn;
}
-void QgsGrassProvider::reset()
+void QgsGrassProvider::begin()
{
if ( isEdited() || isFrozen() || !mValid )
return;
Modified: trunk/qgis/src/providers/grass/qgsgrassprovider.h
===================================================================
--- trunk/qgis/src/providers/grass/qgsgrassprovider.h 2008-10-06 18:50:42 UTC (rev 9446)
+++ trunk/qgis/src/providers/grass/qgsgrassprovider.h 2008-10-06 21:11:54 UTC (rev 9447)
@@ -175,7 +175,7 @@
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 */
Modified: trunk/qgis/src/providers/memory/memoryprovider.cpp
===================================================================
--- trunk/qgis/src/providers/memory/memoryprovider.cpp 2008-10-06 18:50:42 UTC (rev 9446)
+++ trunk/qgis/src/providers/memory/memoryprovider.cpp 2008-10-06 21:11:54 UTC (rev 9447)
@@ -175,10 +175,10 @@
mSelectSI_Features.clear();
}
- reset();
+ begin();
}
-void QgsMemoryProvider::reset()
+void QgsMemoryProvider::begin()
{
if ( mSelectUsingSpatialIndex )
mSelectSI_Iterator = mSelectSI_Features.begin();
Modified: trunk/qgis/src/providers/memory/memoryprovider.h
===================================================================
--- trunk/qgis/src/providers/memory/memoryprovider.h 2008-10-06 18:50:42 UTC (rev 9446)
+++ trunk/qgis/src/providers/memory/memoryprovider.h 2008-10-06 21:11:54 UTC (rev 9447)
@@ -93,7 +93,7 @@
virtual const QgsFieldMap & fields() const;
/** Restart reading features from previous select operation */
- virtual void reset();
+ virtual void begin();
/**
Modified: trunk/qgis/src/providers/ogr/qgsogrprovider.cpp
===================================================================
--- trunk/qgis/src/providers/ogr/qgsogrprovider.cpp 2008-10-06 18:50:42 UTC (rev 9446)
+++ trunk/qgis/src/providers/ogr/qgsogrprovider.cpp 2008-10-06 21:11:54 UTC (rev 9447)
@@ -455,7 +455,7 @@
return mAttributeFields;
}
-void QgsOgrProvider::reset()
+void QgsOgrProvider::begin()
{
OGR_L_ResetReading( ogrLayer );
}
Modified: trunk/qgis/src/providers/ogr/qgsogrprovider.h
===================================================================
--- trunk/qgis/src/providers/ogr/qgsogrprovider.h 2008-10-06 18:50:42 UTC (rev 9446)
+++ trunk/qgis/src/providers/ogr/qgsogrprovider.h 2008-10-06 21:11:54 UTC (rev 9447)
@@ -120,7 +120,7 @@
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 );
Modified: trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp
===================================================================
--- trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp 2008-10-06 18:50:42 UTC (rev 9446)
+++ trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp 2008-10-06 21:11:54 UTC (rev 9447)
@@ -720,7 +720,7 @@
return mDataComment;
}
-void QgsPostgresProvider::reset()
+void QgsPostgresProvider::begin()
{
if ( mFetching )
{
@@ -1876,7 +1876,7 @@
returnvalue = false;
}
- reset();
+ begin();
return returnvalue;
}
@@ -1914,7 +1914,7 @@
connectionRW->PQexecNR( "ROLLBACK" );
returnvalue = false;
}
- reset();
+ begin();
return returnvalue;
}
@@ -1953,7 +1953,7 @@
returnvalue = false;
}
- reset();
+ begin();
return returnvalue;
}
@@ -1998,7 +1998,7 @@
returnvalue = false;
}
- reset();
+ begin();
return returnvalue;
}
@@ -2068,7 +2068,7 @@
returnvalue = false;
}
- reset();
+ begin();
return returnvalue;
}
@@ -2148,7 +2148,7 @@
returnvalue = false;
}
- reset();
+ begin();
QgsDebugMsg( "exiting." );
Modified: trunk/qgis/src/providers/postgres/qgspostgresprovider.h
===================================================================
--- trunk/qgis/src/providers/postgres/qgspostgresprovider.h 2008-10-06 18:50:42 UTC (rev 9446)
+++ trunk/qgis/src/providers/postgres/qgspostgresprovider.h 2008-10-06 21:11:54 UTC (rev 9447)
@@ -176,7 +176,7 @@
/** 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 */
Modified: trunk/qgis/src/providers/wfs/qgswfsprovider.cpp
===================================================================
--- trunk/qgis/src/providers/wfs/qgswfsprovider.cpp 2008-10-06 18:50:42 UTC (rev 9446)
+++ trunk/qgis/src/providers/wfs/qgswfsprovider.cpp 2008-10-06 21:11:54 UTC (rev 9447)
@@ -130,7 +130,7 @@
return mFields;
}
-void QgsWFSProvider::reset()
+void QgsWFSProvider::begin()
{
mFeatureIterator = mSelectedFeatures.begin();
}
Modified: trunk/qgis/src/providers/wfs/qgswfsprovider.h
===================================================================
--- trunk/qgis/src/providers/wfs/qgswfsprovider.h 2008-10-06 18:50:42 UTC (rev 9446)
+++ trunk/qgis/src/providers/wfs/qgswfsprovider.h 2008-10-06 21:11:54 UTC (rev 9447)
@@ -69,7 +69,7 @@
long featureCount() const;
uint fieldCount() const;
const QgsFieldMap & fields() const;
- void reset();
+ void begin();
virtual QgsCoordinateReferenceSystem getCRS();
@@ -114,7 +114,7 @@
QgsSpatialIndex *mSpatialIndex;
/**Vector where the ids of the selected features are inserted*/
QList<int> mSelectedFeatures;
- /**Iterator on the feature vector for use in reset(), getNextFeature(), etc...*/
+ /**Iterator on the feature vector for use in begin(), getNextFeature(), etc...*/
QList<int>::iterator mFeatureIterator;
/**Vector where the features are inserted*/
QList<QgsFeature*> mFeatures;
Modified: trunk/qgis/src/providers/wms/qgswmsprovider.cpp
===================================================================
--- trunk/qgis/src/providers/wms/qgswmsprovider.cpp 2008-10-06 18:50:42 UTC (rev 9446)
+++ trunk/qgis/src/providers/wms/qgswmsprovider.cpp 2008-10-06 21:11:54 UTC (rev 9447)
@@ -1666,7 +1666,7 @@
return layerExtent;
}
-void QgsWmsProvider::reset()
+void QgsWmsProvider::begin()
{
// TODO
}
Modified: trunk/qgis/src/providers/wms/qgswmsprovider.h
===================================================================
--- trunk/qgis/src/providers/wms/qgswmsprovider.h 2008-10-06 18:50:42 UTC (rev 9446)
+++ trunk/qgis/src/providers/wms/qgswmsprovider.h 2008-10-06 21:11:54 UTC (rev 9447)
@@ -449,7 +449,7 @@
/** 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
*/
More information about the QGIS-commit
mailing list