[QGIS Commit] r8791 - in trunk/qgis: python/core src/app src/core
src/gui src/providers/postgres src/providers/wms
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Wed Jul 16 05:21:42 EDT 2008
Author: jef
Date: 2008-07-16 05:21:41 -0400 (Wed, 16 Jul 2008)
New Revision: 8791
Modified:
trunk/qgis/python/core/qgsfield.sip
trunk/qgis/python/core/qgsvectordataprovider.sip
trunk/qgis/src/app/qgscustomprojectiondialog.cpp
trunk/qgis/src/app/qgsoptions.cpp
trunk/qgis/src/app/qgsserversourceselect.h
trunk/qgis/src/core/qgsdistancearea.cpp
trunk/qgis/src/core/qgsfield.h
trunk/qgis/src/core/qgsspatialrefsys.cpp
trunk/qgis/src/gui/qgsprojectionselector.cpp
trunk/qgis/src/providers/postgres/qgspostgrescountthread.h
trunk/qgis/src/providers/postgres/qgspostgresextentthread.h
trunk/qgis/src/providers/wms/qgswmsprovider.h
Log:
fix common typo: retreive
(identifing copied code...)
Modified: trunk/qgis/python/core/qgsfield.sip
===================================================================
--- trunk/qgis/python/core/qgsfield.sip 2008-07-15 22:05:07 UTC (rev 8790)
+++ trunk/qgis/python/core/qgsfield.sip 2008-07-16 09:21:41 UTC (rev 8791)
@@ -42,7 +42,7 @@
//! Gets the name of the field
const QString & name() const;
- //! Gets variant type of the field as it will be retreived from data source
+ //! Gets variant type of the field as it will be retrieved from data source
QVariant::Type type() const;
/**
Modified: trunk/qgis/python/core/qgsvectordataprovider.sip
===================================================================
--- trunk/qgis/python/core/qgsvectordataprovider.sip 2008-07-15 22:05:07 UTC (rev 8790)
+++ trunk/qgis/python/core/qgsvectordataprovider.sip 2008-07-16 09:21:41 UTC (rev 8791)
@@ -120,7 +120,7 @@
* @param index the index of the attribute
*
* Default implementation walks all numeric attributes and caches minimal
- * and maximal values. If provider has facilities to retreive minimal
+ * and maximal values. If provider has facilities to retrieve minimal
* value directly, override this function.
*/
virtual QVariant minValue(int index);
@@ -130,7 +130,7 @@
* @param index the index of the attribute
*
* Default implementation walks all numeric attributes and caches minimal
- * and maximal values. If provider has facilities to retreive maximal
+ * and maximal values. If provider has facilities to retrieve maximal
* value directly, override this function.
*/
virtual QVariant maxValue(int index);
Modified: trunk/qgis/src/app/qgscustomprojectiondialog.cpp
===================================================================
--- trunk/qgis/src/app/qgscustomprojectiondialog.cpp 2008-07-15 22:05:07 UTC (rev 8790)
+++ trunk/qgis/src/app/qgscustomprojectiondialog.cpp 2008-07-16 09:21:41 UTC (rev 8791)
@@ -115,7 +115,7 @@
assert(myResult == 0);
}
- // Set up the query to retreive the projection information needed to populate the PROJECTION list
+ // Set up the query to retrieve the projection information needed to populate the PROJECTION list
QString mySql = "select * from tbl_projection order by name";
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
// XXX Need to free memory from the error msg if one is set
@@ -150,7 +150,7 @@
assert(myResult == 0);
}
- // Set up the query to retreive the projection information needed to populate the ELLIPSOID list
+ // Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
QString mySql = "select * from tbl_ellipsoid order by name";
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
// XXX Need to free memory from the error msg if one is set
@@ -193,7 +193,7 @@
// database if it does not exist.
assert(myResult == 0);
}
- // Set up the query to retreive the projection information needed to populate the ELLIPSOID list
+ // Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
QString mySql = "delete from tbl_srs where srs_id='" + mCurrentRecordId + "'";
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
// XXX Need to free memory from the error msg if one is set
@@ -253,7 +253,7 @@
// database if it does not exist.
assert(myResult == 0);
}
- // Set up the query to retreive the projection information needed to populate the ELLIPSOID list
+ // Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
QString mySql = "select count(*) from tbl_srs";
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
// XXX Need to free memory from the error msg if one is set
@@ -288,7 +288,7 @@
// database if it does not exist.
assert(myResult == 0);
}
- // Set up the query to retreive the projection information needed to populate the ELLIPSOID list
+ // Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
QString mySql = "select name from tbl_projection where acronym='" + theProjectionFamilyAcronym + "'";
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
// XXX Need to free memory from the error msg if one is set
@@ -319,7 +319,7 @@
// database if it does not exist.
assert(myResult == 0);
}
- // Set up the query to retreive the projection information needed to populate the ELLIPSOID list
+ // Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
QString mySql = "select name from tbl_ellipsoid where acronym='" + theEllipsoidAcronym + "'";
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
// XXX Need to free memory from the error msg if one is set
@@ -350,7 +350,7 @@
// database if it does not exist.
assert(myResult == 0);
}
- // Set up the query to retreive the projection information needed to populate the ELLIPSOID list
+ // Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
QString mySql = "select acronym from tbl_projection where name='" + theProjectionFamilyName + "'";
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
// XXX Need to free memory from the error msg if one is set
@@ -381,7 +381,7 @@
// database if it does not exist.
assert(myResult == 0);
}
- // Set up the query to retreive the projection information needed to populate the ELLIPSOID list
+ // Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
QString mySql = "select acronym from tbl_ellipsoid where name='" + theEllipsoidName + "'";
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
// XXX Need to free memory from the error msg if one is set
@@ -1000,7 +1000,7 @@
assert(myResult == 0);
}
- // Set up the query to retreive the projection information needed to populate the PROJECTION list
+ // Set up the query to retrieve the projection information needed to populate the PROJECTION list
QString mySql = "select parameters from tbl_projection name where name='"+theText+"'";
#ifdef QGISDEBUG
std::cout << "Query to get proj params:" << mySql.toLocal8Bit().data() << std::endl;
Modified: trunk/qgis/src/app/qgsoptions.cpp
===================================================================
--- trunk/qgis/src/app/qgsoptions.cpp 2008-07-15 22:05:07 UTC (rev 8790)
+++ trunk/qgis/src/app/qgsoptions.cpp 2008-07-16 09:21:41 UTC (rev 8791)
@@ -446,7 +446,7 @@
assert(myResult == 0);
}
- // Set up the query to retreive the projection information needed to populate the ELLIPSOID list
+ // Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
QString mySql = "select * from tbl_ellipsoid order by name";
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
// XXX Need to free memory from the error msg if one is set
@@ -478,7 +478,7 @@
// database if it does not exist.
assert(myResult == 0);
}
- // Set up the query to retreive the projection information needed to populate the ELLIPSOID list
+ // Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
QString mySql = "select acronym from tbl_ellipsoid where name='" + theEllipsoidName + "'";
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
// XXX Need to free memory from the error msg if one is set
Modified: trunk/qgis/src/app/qgsserversourceselect.h
===================================================================
--- trunk/qgis/src/app/qgsserversourceselect.h 2008-07-15 22:05:07 UTC (rev 8790)
+++ trunk/qgis/src/app/qgsserversourceselect.h 2008-07-16 09:21:41 UTC (rev 8791)
@@ -132,7 +132,7 @@
/**
* \brief Populate the layer list - private for now.
*
- * \retval FALSE if the layers could not be retreived or parsed -
+ * \retval FALSE if the layers could not be retrieved or parsed -
* see mWmsProvider->errorString() for more info
*/
bool populateLayerList(QgsWmsProvider* wmsProvider);
@@ -180,7 +180,7 @@
QButtonGroup* m_imageFormatGroup;
QHBoxLayout* m_imageFormatLayout;
- //! The WMS provider that retreives information for this dialog
+ //! The WMS provider that retrieves information for this dialog
QgsWmsProvider * mWmsProvider;
static const int context_id = 710979116;
Modified: trunk/qgis/src/core/qgsdistancearea.cpp
===================================================================
--- trunk/qgis/src/core/qgsdistancearea.cpp 2008-07-15 22:05:07 UTC (rev 8790)
+++ trunk/qgis/src/core/qgsdistancearea.cpp 2008-07-16 09:21:41 UTC (rev 8791)
@@ -101,7 +101,7 @@
// database if it does not exist.
return false;
}
- // Set up the query to retreive the projection information needed to populate the ELLIPSOID list
+ // Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
QString mySql = "select radius, parameter2 from tbl_ellipsoid where acronym='" + ellipsoid + "'";
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
// XXX Need to free memory from the error msg if one is set
Modified: trunk/qgis/src/core/qgsfield.h
===================================================================
--- trunk/qgis/src/core/qgsfield.h 2008-07-15 22:05:07 UTC (rev 8790)
+++ trunk/qgis/src/core/qgsfield.h 2008-07-16 09:21:41 UTC (rev 8791)
@@ -58,7 +58,7 @@
//! Gets the name of the field
const QString & name() const;
- //! Gets variant type of the field as it will be retreived from data source
+ //! Gets variant type of the field as it will be retrieved from data source
QVariant::Type type() const;
/**
Modified: trunk/qgis/src/core/qgsspatialrefsys.cpp
===================================================================
--- trunk/qgis/src/core/qgsspatialrefsys.cpp 2008-07-15 22:05:07 UTC (rev 8790)
+++ trunk/qgis/src/core/qgsspatialrefsys.cpp 2008-07-16 09:21:41 UTC (rev 8791)
@@ -769,7 +769,7 @@
sqlite3_stmt *myPreparedStatement;
int myResult;
- // Set up the query to retreive the projection information needed to populate the list
+ // Set up the query to retrieve the projection information needed to populate the list
QString mySql = QString ("select srs_id,parameters from tbl_srs where projection_acronym='" +
mProjectionAcronym + "' and ellipsoid_acronym='" + mEllipsoidAcronym + "'");
// Get the full path name to the sqlite3 spatial reference database.
Modified: trunk/qgis/src/gui/qgsprojectionselector.cpp
===================================================================
--- trunk/qgis/src/gui/qgsprojectionselector.cpp 2008-07-15 22:05:07 UTC (rev 8790)
+++ trunk/qgis/src/gui/qgsprojectionselector.cpp 2008-07-16 09:21:41 UTC (rev 8791)
@@ -527,7 +527,7 @@
assert(myResult == 0);
}
- // Set up the query to retreive the projection information needed to populate the list
+ // Set up the query to retrieve the projection information needed to populate the list
QString mySql = "select description, srs_id, is_geo, name, parameters from vw_srs ";
mySql += "where ";
mySql += sqlFilter;
Modified: trunk/qgis/src/providers/postgres/qgspostgrescountthread.h
===================================================================
--- trunk/qgis/src/providers/postgres/qgspostgrescountthread.h 2008-07-15 22:05:07 UTC (rev 8790)
+++ trunk/qgis/src/providers/postgres/qgspostgrescountthread.h 2008-07-16 09:21:41 UTC (rev 8791)
@@ -100,7 +100,7 @@
QString tableName;
/**
- * SQL statement used to limit the features retreived
+ * SQL statement used to limit the features retrieved
*/
QString sqlWhereClause;
Modified: trunk/qgis/src/providers/postgres/qgspostgresextentthread.h
===================================================================
--- trunk/qgis/src/providers/postgres/qgspostgresextentthread.h 2008-07-15 22:05:07 UTC (rev 8790)
+++ trunk/qgis/src/providers/postgres/qgspostgresextentthread.h 2008-07-16 09:21:41 UTC (rev 8791)
@@ -119,7 +119,7 @@
QString tableName;
/**
- * SQL statement used to limit the features retreived
+ * SQL statement used to limit the features retrieved
*/
QString sqlWhereClause;
Modified: trunk/qgis/src/providers/wms/qgswmsprovider.h
===================================================================
--- trunk/qgis/src/providers/wms/qgswmsprovider.h 2008-07-15 22:05:07 UTC (rev 8790)
+++ trunk/qgis/src/providers/wms/qgswmsprovider.h 2008-07-16 09:21:41 UTC (rev 8791)
@@ -354,7 +354,7 @@
*
* \param[out] layers The list of layers will be placed here.
*
- * \retval FALSE if the layers could not be retreived or parsed -
+ * \retval FALSE if the layers could not be retrieved or parsed -
* see errorString() for more info
*
* \todo Document this better, make static
@@ -587,7 +587,7 @@
*
* \param forceRefresh if true, ignores any previous response cached in memory
* and always contact the server for a new copy.
- * \retval FALSE if the capabilities document could not be retreived or parsed -
+ * \retval FALSE if the capabilities document could not be retrieved or parsed -
* see errorString() for more info
*
* When this returns, "layers" will make sense.
@@ -679,7 +679,7 @@
/**
* \brief Calculates the combined extent of the layers selected by layersDrawn
*
- * \retval FALSE if the capabilities document could not be retreived or parsed -
+ * \retval FALSE if the capabilities document could not be retrieved or parsed -
* see errorString() for more info
*/
bool calculateExtent();
More information about the QGIS-commit
mailing list