Skip to content

Commit 82971f4

Browse files
author
jef
committedJul 16, 2008
fix common typo: retreive
(identifing copied code...) git-svn-id: http://svn.osgeo.org/qgis/trunk@8791 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 6a8bfc2 commit 82971f4

12 files changed

+25
-25
lines changed
 

‎python/core/qgsfield.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public:
4242
//! Gets the name of the field
4343
const QString & name() const;
4444

45-
//! Gets variant type of the field as it will be retreived from data source
45+
//! Gets variant type of the field as it will be retrieved from data source
4646
QVariant::Type type() const;
4747

4848
/**

‎python/core/qgsvectordataprovider.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class QgsVectorDataProvider : QgsDataProvider
120120
* @param index the index of the attribute
121121
*
122122
* Default implementation walks all numeric attributes and caches minimal
123-
* and maximal values. If provider has facilities to retreive minimal
123+
* and maximal values. If provider has facilities to retrieve minimal
124124
* value directly, override this function.
125125
*/
126126
virtual QVariant minValue(int index);
@@ -130,7 +130,7 @@ class QgsVectorDataProvider : QgsDataProvider
130130
* @param index the index of the attribute
131131
*
132132
* Default implementation walks all numeric attributes and caches minimal
133-
* and maximal values. If provider has facilities to retreive maximal
133+
* and maximal values. If provider has facilities to retrieve maximal
134134
* value directly, override this function.
135135
*/
136136
virtual QVariant maxValue(int index);

‎src/app/qgscustomprojectiondialog.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ void QgsCustomProjectionDialog::getProjList ()
115115
assert(myResult == 0);
116116
}
117117
118-
// Set up the query to retreive the projection information needed to populate the PROJECTION list
118+
// Set up the query to retrieve the projection information needed to populate the PROJECTION list
119119
QString mySql = "select * from tbl_projection order by name";
120120
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
121121
// XXX Need to free memory from the error msg if one is set
@@ -150,7 +150,7 @@ void QgsCustomProjectionDialog::getEllipsoidList()
150150
assert(myResult == 0);
151151
}
152152
153-
// Set up the query to retreive the projection information needed to populate the ELLIPSOID list
153+
// Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
154154
QString mySql = "select * from tbl_ellipsoid order by name";
155155
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
156156
// XXX Need to free memory from the error msg if one is set
@@ -193,7 +193,7 @@ void QgsCustomProjectionDialog::on_pbnDelete_clicked()
193193
// database if it does not exist.
194194
assert(myResult == 0);
195195
}
196-
// Set up the query to retreive the projection information needed to populate the ELLIPSOID list
196+
// Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
197197
QString mySql = "delete from tbl_srs where srs_id='" + mCurrentRecordId + "'";
198198
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
199199
// XXX Need to free memory from the error msg if one is set
@@ -253,7 +253,7 @@ long QgsCustomProjectionDialog::getRecordCount()
253253
// database if it does not exist.
254254
assert(myResult == 0);
255255
}
256-
// Set up the query to retreive the projection information needed to populate the ELLIPSOID list
256+
// Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
257257
QString mySql = "select count(*) from tbl_srs";
258258
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
259259
// XXX Need to free memory from the error msg if one is set
@@ -288,7 +288,7 @@ QString QgsCustomProjectionDialog::getProjectionFamilyName(QString theProjection
288288
// database if it does not exist.
289289
assert(myResult == 0);
290290
}
291-
// Set up the query to retreive the projection information needed to populate the ELLIPSOID list
291+
// Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
292292
QString mySql = "select name from tbl_projection where acronym='" + theProjectionFamilyAcronym + "'";
293293
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
294294
// XXX Need to free memory from the error msg if one is set
@@ -319,7 +319,7 @@ QString QgsCustomProjectionDialog::getEllipsoidName(QString theEllipsoidAcronym)
319319
// database if it does not exist.
320320
assert(myResult == 0);
321321
}
322-
// Set up the query to retreive the projection information needed to populate the ELLIPSOID list
322+
// Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
323323
QString mySql = "select name from tbl_ellipsoid where acronym='" + theEllipsoidAcronym + "'";
324324
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
325325
// XXX Need to free memory from the error msg if one is set
@@ -350,7 +350,7 @@ QString QgsCustomProjectionDialog::getProjectionFamilyAcronym(QString theProject
350350
// database if it does not exist.
351351
assert(myResult == 0);
352352
}
353-
// Set up the query to retreive the projection information needed to populate the ELLIPSOID list
353+
// Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
354354
QString mySql = "select acronym from tbl_projection where name='" + theProjectionFamilyName + "'";
355355
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
356356
// XXX Need to free memory from the error msg if one is set
@@ -381,7 +381,7 @@ QString QgsCustomProjectionDialog::getEllipsoidAcronym(QString theEllipsoidName)
381381
// database if it does not exist.
382382
assert(myResult == 0);
383383
}
384-
// Set up the query to retreive the projection information needed to populate the ELLIPSOID list
384+
// Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
385385
QString mySql = "select acronym from tbl_ellipsoid where name='" + theEllipsoidName + "'";
386386
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
387387
// XXX Need to free memory from the error msg if one is set
@@ -1000,7 +1000,7 @@ void QgsCustomProjectionDialog::cboProjectionFamily_highlighted( const QString &
10001000
assert(myResult == 0);
10011001
}
10021002
1003-
// Set up the query to retreive the projection information needed to populate the PROJECTION list
1003+
// Set up the query to retrieve the projection information needed to populate the PROJECTION list
10041004
QString mySql = "select parameters from tbl_projection name where name='"+theText+"'";
10051005
#ifdef QGISDEBUG
10061006
std::cout << "Query to get proj params:" << mySql.toLocal8Bit().data() << std::endl;

‎src/app/qgsoptions.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ void QgsOptions::getEllipsoidList()
446446
assert(myResult == 0);
447447
}
448448

449-
// Set up the query to retreive the projection information needed to populate the ELLIPSOID list
449+
// Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
450450
QString mySql = "select * from tbl_ellipsoid order by name";
451451
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
452452
// XXX Need to free memory from the error msg if one is set
@@ -478,7 +478,7 @@ QString QgsOptions::getEllipsoidAcronym(QString theEllipsoidName)
478478
// database if it does not exist.
479479
assert(myResult == 0);
480480
}
481-
// Set up the query to retreive the projection information needed to populate the ELLIPSOID list
481+
// Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
482482
QString mySql = "select acronym from tbl_ellipsoid where name='" + theEllipsoidName + "'";
483483
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
484484
// XXX Need to free memory from the error msg if one is set

‎src/app/qgsserversourceselect.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public slots:
132132
/**
133133
* \brief Populate the layer list - private for now.
134134
*
135-
* \retval FALSE if the layers could not be retreived or parsed -
135+
* \retval FALSE if the layers could not be retrieved or parsed -
136136
* see mWmsProvider->errorString() for more info
137137
*/
138138
bool populateLayerList(QgsWmsProvider* wmsProvider);
@@ -180,7 +180,7 @@ public slots:
180180
QButtonGroup* m_imageFormatGroup;
181181
QHBoxLayout* m_imageFormatLayout;
182182

183-
//! The WMS provider that retreives information for this dialog
183+
//! The WMS provider that retrieves information for this dialog
184184
QgsWmsProvider * mWmsProvider;
185185

186186
static const int context_id = 710979116;

‎src/core/qgsdistancearea.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ bool QgsDistanceArea::setEllipsoid(const QString& ellipsoid)
101101
// database if it does not exist.
102102
return false;
103103
}
104-
// Set up the query to retreive the projection information needed to populate the ELLIPSOID list
104+
// Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
105105
QString mySql = "select radius, parameter2 from tbl_ellipsoid where acronym='" + ellipsoid + "'";
106106
myResult = sqlite3_prepare(myDatabase, mySql.toUtf8(), mySql.length(), &myPreparedStatement, &myTail);
107107
// XXX Need to free memory from the error msg if one is set

‎src/core/qgsfield.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class CORE_EXPORT QgsField
5858
//! Gets the name of the field
5959
const QString & name() const;
6060

61-
//! Gets variant type of the field as it will be retreived from data source
61+
//! Gets variant type of the field as it will be retrieved from data source
6262
QVariant::Type type() const;
6363

6464
/**

‎src/core/qgsspatialrefsys.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ long QgsSpatialRefSys::findMatchingProj()
769769
sqlite3_stmt *myPreparedStatement;
770770
int myResult;
771771

772-
// Set up the query to retreive the projection information needed to populate the list
772+
// Set up the query to retrieve the projection information needed to populate the list
773773
QString mySql = QString ("select srs_id,parameters from tbl_srs where projection_acronym='" +
774774
mProjectionAcronym + "' and ellipsoid_acronym='" + mEllipsoidAcronym + "'");
775775
// Get the full path name to the sqlite3 spatial reference database.

‎src/gui/qgsprojectionselector.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ void QgsProjectionSelector::applyUserProjList(QSet<QString> * crsFilter)
527527
assert(myResult == 0);
528528
}
529529

530-
// Set up the query to retreive the projection information needed to populate the list
530+
// Set up the query to retrieve the projection information needed to populate the list
531531
QString mySql = "select description, srs_id, is_geo, name, parameters from vw_srs ";
532532
mySql += "where ";
533533
mySql += sqlFilter;

‎src/providers/postgres/qgspostgrescountthread.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class QgsPostgresCountThread : public QThread
100100
QString tableName;
101101

102102
/**
103-
* SQL statement used to limit the features retreived
103+
* SQL statement used to limit the features retrieved
104104
*/
105105
QString sqlWhereClause;
106106

‎src/providers/postgres/qgspostgresextentthread.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class QgsPostgresExtentThread : public QThread
119119
QString tableName;
120120

121121
/**
122-
* SQL statement used to limit the features retreived
122+
* SQL statement used to limit the features retrieved
123123
*/
124124
QString sqlWhereClause;
125125

‎src/providers/wms/qgswmsprovider.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ class QgsWmsProvider : public QgsRasterDataProvider
354354
*
355355
* \param[out] layers The list of layers will be placed here.
356356
*
357-
* \retval FALSE if the layers could not be retreived or parsed -
357+
* \retval FALSE if the layers could not be retrieved or parsed -
358358
* see errorString() for more info
359359
*
360360
* \todo Document this better, make static
@@ -587,7 +587,7 @@ public slots:
587587
*
588588
* \param forceRefresh if true, ignores any previous response cached in memory
589589
* and always contact the server for a new copy.
590-
* \retval FALSE if the capabilities document could not be retreived or parsed -
590+
* \retval FALSE if the capabilities document could not be retrieved or parsed -
591591
* see errorString() for more info
592592
*
593593
* When this returns, "layers" will make sense.
@@ -679,7 +679,7 @@ public slots:
679679
/**
680680
* \brief Calculates the combined extent of the layers selected by layersDrawn
681681
*
682-
* \retval FALSE if the capabilities document could not be retreived or parsed -
682+
* \retval FALSE if the capabilities document could not be retrieved or parsed -
683683
* see errorString() for more info
684684
*/
685685
bool calculateExtent();

0 commit comments

Comments
 (0)
Please sign in to comment.