Skip to content

Commit

Permalink
fix common typo: retreive
Browse files Browse the repository at this point in the history
(identifing copied code...)


git-svn-id: http://svn.osgeo.org/qgis/trunk@8791 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Jul 16, 2008
1 parent 6a8bfc2 commit 82971f4
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion python/core/qgsfield.sip
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public:
//! 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;

/**
Expand Down
4 changes: 2 additions & 2 deletions python/core/qgsvectordataprovider.sip
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class QgsVectorDataProvider : QgsDataProvider
* @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);
Expand All @@ -130,7 +130,7 @@ class QgsVectorDataProvider : QgsDataProvider
* @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);
Expand Down
18 changes: 9 additions & 9 deletions src/app/qgscustomprojectiondialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ void QgsCustomProjectionDialog::getProjList ()
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
Expand Down Expand Up @@ -150,7 +150,7 @@ void QgsCustomProjectionDialog::getEllipsoidList()
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
Expand Down Expand Up @@ -193,7 +193,7 @@ void QgsCustomProjectionDialog::on_pbnDelete_clicked()
// 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
Expand Down Expand Up @@ -253,7 +253,7 @@ long QgsCustomProjectionDialog::getRecordCount()
// 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
Expand Down Expand Up @@ -288,7 +288,7 @@ QString QgsCustomProjectionDialog::getProjectionFamilyName(QString theProjection
// 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
Expand Down Expand Up @@ -319,7 +319,7 @@ QString QgsCustomProjectionDialog::getEllipsoidName(QString theEllipsoidAcronym)
// 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
Expand Down Expand Up @@ -350,7 +350,7 @@ QString QgsCustomProjectionDialog::getProjectionFamilyAcronym(QString theProject
// 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
Expand Down Expand Up @@ -381,7 +381,7 @@ QString QgsCustomProjectionDialog::getEllipsoidAcronym(QString theEllipsoidName)
// 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
Expand Down Expand Up @@ -1000,7 +1000,7 @@ void QgsCustomProjectionDialog::cboProjectionFamily_highlighted( const QString &
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;
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsoptions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ void QgsOptions::getEllipsoidList()
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
Expand Down Expand Up @@ -478,7 +478,7 @@ QString QgsOptions::getEllipsoidAcronym(QString theEllipsoidName)
// 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
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsserversourceselect.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public slots:
/**
* \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);
Expand Down Expand Up @@ -180,7 +180,7 @@ public slots:
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;
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsdistancearea.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ bool QgsDistanceArea::setEllipsoid(const QString& ellipsoid)
// 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
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsfield.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class CORE_EXPORT QgsField
//! 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;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsspatialrefsys.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@ long QgsSpatialRefSys::findMatchingProj()
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.
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsprojectionselector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ void QgsProjectionSelector::applyUserProjList(QSet<QString> * crsFilter)
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;
Expand Down
2 changes: 1 addition & 1 deletion src/providers/postgres/qgspostgrescountthread.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class QgsPostgresCountThread : public QThread
QString tableName;

/**
* SQL statement used to limit the features retreived
* SQL statement used to limit the features retrieved
*/
QString sqlWhereClause;

Expand Down
2 changes: 1 addition & 1 deletion src/providers/postgres/qgspostgresextentthread.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class QgsPostgresExtentThread : public QThread
QString tableName;

/**
* SQL statement used to limit the features retreived
* SQL statement used to limit the features retrieved
*/
QString sqlWhereClause;

Expand Down
6 changes: 3 additions & 3 deletions src/providers/wms/qgswmsprovider.h
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ class QgsWmsProvider : public QgsRasterDataProvider
*
* \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
Expand Down Expand Up @@ -587,7 +587,7 @@ public slots:
*
* \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.
Expand Down Expand Up @@ -679,7 +679,7 @@ public slots:
/**
* \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();
Expand Down

0 comments on commit 82971f4

Please sign in to comment.