Fix spelling errors in processing algorithm help

This commit is contained in:
Nyall Dawson 2017-03-25 15:50:54 +10:00
parent b90aa916e6
commit 77e7693c48
27 changed files with 54 additions and 43 deletions

2
NEWS
View File

@ -2012,7 +2012,7 @@ Implemented a new map cursor type : Capture Point (little pencil icon on your to
are placed into the system clipboard. are placed into the system clipboard.
In release 0.5 this will be extended to provide simple point vector file data capture / In release 0.5 this will be extended to provide simple point vector file data capture /
digitizing facility. This will be implemented by means of a plugin which will utilise the digitizing facility. This will be implemented by means of a plugin which will utilize the
aforementioned xyClickCoordinate(QgsPoint) signal. aforementioned xyClickCoordinate(QgsPoint) signal.
2004-06-12 [gsherman] 0.3.0devel30 2004-06-12 [gsherman] 0.3.0devel30

View File

@ -2127,7 +2127,7 @@ Processing {#qgis_api_break_3_0_Processing}
- Algorithm providers now subclass the c++ QgsProcessingProvider class, and must be adapted to the API for QgsProcessingProvider. Specifically, - Algorithm providers now subclass the c++ QgsProcessingProvider class, and must be adapted to the API for QgsProcessingProvider. Specifically,
getName() should be replaced with id(), getDescription() with name(), and getIcon with icon(). getName() should be replaced with id(), getDescription() with name(), and getIcon with icon().
- Algorithm's processAlgorithm method now passes a QgsProcessingFeedback object instead of the loosely defined progress parameter. Algorithms will - Algorithm's processAlgorithm method now passes a QgsProcessingFeedback object instead of the loosely defined progress parameter. Algorithms will
need to update their use of the progress argument to utilise the QgsProcessingFeedback API. need to update their use of the progress argument to utilize the QgsProcessingFeedback API.
- Similarly, Python processing scripts no longer have access to a progress variable for reporting their progress. Instead they have a feedback - Similarly, Python processing scripts no longer have access to a progress variable for reporting their progress. Instead they have a feedback
object of type QgsProcessingFeedback, and will need to adapt their use of progress reporting to the QgsProcessingFeedback API. object of type QgsProcessingFeedback, and will need to adapt their use of progress reporting to the QgsProcessingFeedback API.
- SilentProgress was removed. Use the base QgsProcessingFeedback class instead. - SilentProgress was removed. Use the base QgsProcessingFeedback class instead.

View File

@ -2203,7 +2203,7 @@ Implemented a new map cursor type : Capture Point (little pencil icon on your to
</P> </P>
<P> <P>
In release 0.5 this will be extended to provide simple point vector file data capture / In release 0.5 this will be extended to provide simple point vector file data capture /
digitizing facility. This will be implemented by means of a plugin which will utilise the digitizing facility. This will be implemented by means of a plugin which will utilize the
aforementioned xyClickCoordinate(QgsPoint) signal. aforementioned xyClickCoordinate(QgsPoint) signal.
</P> </P>
<P> <P>

View File

@ -1964,7 +1964,7 @@ Implemented a new map cursor type : Capture Point (little pencil icon on your to
are placed into the system clipboard. are placed into the system clipboard.
In release 0.5 this will be extended to provide simple point vector file data capture / In release 0.5 this will be extended to provide simple point vector file data capture /
digitizing facility. This will be implemented by means of a plugin which will utilise the digitizing facility. This will be implemented by means of a plugin which will utilize the
aforementioned xyClickCoordinate(QgsPoint) signal. aforementioned xyClickCoordinate(QgsPoint) signal.
2004-06-12 [gsherman] 0.3.0devel30 2004-06-12 [gsherman] 0.3.0devel30

View File

@ -124,7 +124,7 @@ class QgsGlowEffect : QgsPaintEffect
QColor color() const; QColor color() const;
/** Sets the color ramp for the glow. This only applies if the @link colorType @endlink /** Sets the color ramp for the glow. This only applies if the @link colorType @endlink
* is set to ColorRamp. The glow will utilise colors from the ramp. * is set to ColorRamp. The glow will utilize colors from the ramp.
* @param ramp color ramp for glow. Ownership of the ramp is transferred to the effect. * @param ramp color ramp for glow. Ownership of the ramp is transferred to the effect.
* @see ramp * @see ramp
* @see setColorType * @see setColorType
@ -132,7 +132,7 @@ class QgsGlowEffect : QgsPaintEffect
void setRamp( QgsColorRamp* ramp /Transfer/ ); void setRamp( QgsColorRamp* ramp /Transfer/ );
/** Returns the color ramp used for the glow. This only applies if the @link colorType @endlink /** Returns the color ramp used for the glow. This only applies if the @link colorType @endlink
* is set to ColorRamp. The glow will utilise colors from the ramp. * is set to ColorRamp. The glow will utilize colors from the ramp.
* @returns color ramp for glow * @returns color ramp for glow
* @see setRamp * @see setRamp
* @see colorType * @see colorType

View File

@ -192,7 +192,7 @@ class QgsPaintEffect
*/ */
void drawSource( QPainter& painter ); void drawSource( QPainter& painter );
/** Returns the source QPicture. The @link draw @endlink member can utilise this when /** Returns the source QPicture. The @link draw @endlink member can utilize this when
* drawing the effect. * drawing the effect.
* @returns source QPicture * @returns source QPicture
* @see drawSource * @see drawSource
@ -201,7 +201,7 @@ class QgsPaintEffect
const QPicture* source() const; const QPicture* source() const;
/** Returns the source QPicture rendered to a new QImage. The @link draw @endlink member can /** Returns the source QPicture rendered to a new QImage. The @link draw @endlink member can
* utilise this when drawing the effect. The image will be padded or cropped from the original * utilize this when drawing the effect. The image will be padded or cropped from the original
* source QPicture by the results of the @link boundingRect @endlink method. * source QPicture by the results of the @link boundingRect @endlink method.
* The result is cached to speed up subsequent calls to sourceAsImage. * The result is cached to speed up subsequent calls to sourceAsImage.
* @returns source QPicture rendered to an image * @returns source QPicture rendered to an image

View File

@ -423,7 +423,7 @@ class QgsExpression
static const QList<QgsExpression::Function *>& Functions(); static const QList<QgsExpression::Function *>& Functions();
static const QStringList& BuiltinFunctions(); static const QStringList& BuiltinFunctions();
/** Registers a function to the expression engine. This is required to allow expressions to utilise the function. /** Registers a function to the expression engine. This is required to allow expressions to utilize the function.
* @param function function to register * @param function function to register
* @param transferOwnership set to true to transfer ownership of function to expression engine * @param transferOwnership set to true to transfer ownership of function to expression engine
* @returns true on successful registration * @returns true on successful registration

View File

@ -206,7 +206,7 @@ class QgsExpressionContextScope
/** \ingroup core /** \ingroup core
* \class QgsExpressionContext * \class QgsExpressionContext
* \brief Expression contexts are used to encapsulate the parameters around which a QgsExpression should * \brief Expression contexts are used to encapsulate the parameters around which a QgsExpression should
* be evaluated. QgsExpressions can then utilise the information stored within a context to contextualise * be evaluated. QgsExpressions can then utilize the information stored within a context to contextualise
* their evaluated result. A QgsExpressionContext consists of a stack of QgsExpressionContextScope objects, * their evaluated result. A QgsExpressionContext consists of a stack of QgsExpressionContextScope objects,
* where scopes added later to the stack will override conflicting variables and functions from scopes * where scopes added later to the stack will override conflicting variables and functions from scopes
* lower in the stack. * lower in the stack.

View File

@ -116,7 +116,7 @@ class QgsTask : QObject
* time as the parent task. This behavior can be overridden through the subTaskDependency * time as the parent task. This behavior can be overridden through the subTaskDependency
* argument. * argument.
* *
* The parent task must be added to a QgsTaskManager for subtasks to be utilised. * The parent task must be added to a QgsTaskManager for subtasks to be utilized.
* Subtasks should not be added manually to a QgsTaskManager, rather, only the parent * Subtasks should not be added manually to a QgsTaskManager, rather, only the parent
* task should be added to the manager. * task should be added to the manager.
* *

View File

@ -609,7 +609,7 @@ class QgsTextShadowSettings
*/ */
int offsetAngle() const; int offsetAngle() const;
/** Sets the angle for offseting the position of the shadow from the text. /** Sets the angle for offsetting the position of the shadow from the text.
* @param angle offset angle in degrees * @param angle offset angle in degrees
* @see offsetAngle() * @see offsetAngle()
* @see setOffsetDistance() * @see setOffsetDistance()

View File

@ -217,7 +217,7 @@ class QgsSymbol
*/ */
QSet<QString> usedAttributes( const QgsRenderContext& context ) const; QSet<QString> usedAttributes( const QgsRenderContext& context ) const;
/** Returns whether the symbol utilises any data defined properties. /** Returns whether the symbol utilizes any data defined properties.
* @note added in QGIS 2.12 * @note added in QGIS 2.12
*/ */
bool hasDataDefinedProperties() const; bool hasDataDefinedProperties() const;

View File

@ -13,7 +13,7 @@ class QgsFieldModel : QAbstractItemModel
public: public:
//! Roles utilised by the model //! Roles utilized by the model
enum FieldRoles enum FieldRoles
{ {
FieldNameRole, /*!< return field name if index corresponds to a field */ FieldNameRole, /*!< return field name if index corresponds to a field */

View File

@ -53,7 +53,7 @@ qgis:checkvalidity:
qgis:clip: > qgis:clip: >
This algorithm clips a vector layer using the polygons of an additional polygons layer. Only the parts of the features in the input layer that falls within the polygons of the clipping layer will be added to the resulting layer. This algorithm clips a vector layer using the polygons of an additional polygons layer. Only the parts of the features in the input layer that falls within the polygons of the clipping layer will be added to the resulting layer.
The attributes of the features are not modified, although properties such as area or length of the features will be modified by the clipoing operation. If such properties are stored as attributes, those attributes will have to be manually updated. The attributes of the features are not modified, although properties such as area or length of the features will be modified by the clipping operation. If such properties are stored as attributes, those attributes will have to be manually updated.
qgis:concavehull: > qgis:concavehull: >
This algorithm computes the concave hull of the features in an input layer. This algorithm computes the concave hull of the features in an input layer.
@ -112,7 +112,7 @@ qgis:creategridpolygon:
qgis:createpointsalonglines: > qgis:createpointsalonglines: >
This algorithms creates a points layer, with points distributed along the lines of an input vector layer. the distance between points (measured along the line) is defined as a parameter. This algorithms creates a points layer, with points distributed along the lines of an input vector layer. the distance between points (measured along the line) is defined as a parameter.
Start and end points can be defined, so the first and last point do not fall on the line first and last node. Start and end points are defined as distances, mesaureed from the first and last nodes of the lines, in the units of the projection used by the lines layer. Start and end points can be defined, so the first and last point do not fall on the line first and last node. Start and end points are defined as distances, measured from the first and last nodes of the lines, in the units of the projection used by the lines layer.
qgis:createspatialindex: > qgis:createspatialindex: >
Creates an index to speed up access to the features in a layer based on their spatial location. Support for spatial index creation is dependent on the layer's data provider. Creates an index to speed up access to the features in a layer based on their spatial location. Support for spatial index creation is dependent on the layer's data provider.
@ -139,7 +139,7 @@ qgis:densifygeometries:
The number of new vertices to add to each feature geometry is specified as an input parameter. The number of new vertices to add to each feature geometry is specified as an input parameter.
qgis:densifygeometriesgivenaninterval: qgis:densifygeometriesgivenaninterval:
This algorithm takes a polygon or line layer and generaates a new one in which the geometries have a larger number of vertices than the original one. This algorithm takes a polygon or line layer and generates a new one in which the geometries have a larger number of vertices than the original one.
The number of new vertices depends on the length of the geometry, and is specified as a distance between them. The distance is expressed in the same units used by the layer CRS. The number of new vertices depends on the length of the geometry, and is specified as a distance between them. The distance is expressed in the same units used by the layer CRS.
@ -155,7 +155,7 @@ qgis:distancematrix: >
This algorithms creates a table containing a distance matrix, with distances between all the points in a points layer. This algorithms creates a table containing a distance matrix, with distances between all the points in a points layer.
qgis:distancetonearesthub: > qgis:distancetonearesthub: >
Given a layer with source point and another one representing destination points, this algorithm computes the distance between each source point and the closest detination one. Given a layer with source point and another one representing destination points, this algorithm computes the distance between each source point and the closest destination one.
The resulting layer can contain only source points with an additional field indicating the distance to the nearest point and the name of the destination point, or lines linking each source point with its nearest destination point. The resulting layer can contain only source points with an additional field indicating the distance to the nearest point and the name of the destination point, or lines linking each source point with its nearest destination point.
@ -201,7 +201,7 @@ qgis:extractspecificnodes: >
Additional fields are added to the nodes indicating the specific node position (e.g., 0, -1, etc), the original node index, distance along the original geometry and bisector angle of node for the original geometry. Additional fields are added to the nodes indicating the specific node position (e.g., 0, -1, etc), the original node index, distance along the original geometry and bisector angle of node for the original geometry.
qgis:fieldcalculator: > qgis:fieldcalculator: >
This algorithm computes a new vector layer with the same features of the input layer, but with an additional attribute. The values of this new attribute are computed from each feature using a mathematical formula, based on te properties and attributes of the feature. This algorithm computes a new vector layer with the same features of the input layer, but with an additional attribute. The values of this new attribute are computed from each feature using a mathematical formula, based on the properties and attributes of the feature.
qgis:findprojection: > qgis:findprojection: >
This algorithm allows creation of a shortlist of possible candidate coordinate reference systems for a layer with an unknown projection. This algorithm allows creation of a shortlist of possible candidate coordinate reference systems for a layer with an unknown projection.
@ -217,7 +217,7 @@ qgis:fixeddistancebuffer: >
The end cap style parameter controls how line endings are handled in the buffer. The end cap style parameter controls how line endings are handled in the buffer.
The join style parameter specifies whether round, mitre or beveled joins should be used when offseting corners in a line. The join style parameter specifies whether round, mitre or beveled joins should be used when offsetting corners in a line.
The mitre limit parameter is only applicable for mitre join styles, and controls the maximum distance from the offset curve to use when creating a mitred join. The mitre limit parameter is only applicable for mitre join styles, and controls the maximum distance from the offset curve to use when creating a mitred join.
@ -225,7 +225,7 @@ qgis:frequencyanalysis: >
This algorithms generates a table with frequency analysis of the values of a selected attribute from an input vector layer This algorithms generates a table with frequency analysis of the values of a selected attribute from an input vector layer
qgis:geometrybyexpression: > qgis:geometrybyexpression: >
This algorithm updates existing geometries (or creates new geometries) for input features by use of a QGIS expression. This allows complex geometry modifications which can utilise all the flexibility of the QGIS expression engine to manipulate and create geometries for output features. This algorithm updates existing geometries (or creates new geometries) for input features by use of a QGIS expression. This allows complex geometry modifications which can utilize all the flexibility of the QGIS expression engine to manipulate and create geometries for output features.
For help with QGIS expression functions, see the inbuilt help for specific functions which is available in the expression builder. For help with QGIS expression functions, see the inbuilt help for specific functions which is available in the expression builder.
@ -266,7 +266,7 @@ qgis:joinattributestable: >
The additional attributes and their values are taken from a second vector layer. An attribute is selected in each of them to define the join criteria. The additional attributes and their values are taken from a second vector layer. An attribute is selected in each of them to define the join criteria.
qgis:keepnbiggestparts: > qgis:keepnbiggestparts: >
This algorithms takes a polygon layer and creates a new polygon layer in which multipart goemetries have been removed, leaving only the n largest (in terms of area) parts This algorithms takes a polygon layer and creates a new polygon layer in which multipart geometries have been removed, leaving only the n largest (in terms of area) parts
qgis:lineintersections: qgis:lineintersections:
This algorithm creates point features where the lines in the Intersect layer intersect the lines in the Input layer. This algorithm creates point features where the lines in the Intersect layer intersect the lines in the Input layer.
@ -307,7 +307,7 @@ qgis:multiparttosingleparts: >
This algorithm takes a vector layer with multipart geometries and generates a new one in which all geometries contain a single part. Features with multipart geometries are divided in as many different features as parts the geometry contain, and the same attributes are used for each of them. This algorithm takes a vector layer with multipart geometries and generates a new one in which all geometries contain a single part. Features with multipart geometries are divided in as many different features as parts the geometry contain, and the same attributes are used for each of them.
qgis:nearestneighbouranalysis: > qgis:nearestneighbouranalysis: >
This algorithm performs nearest neighbout analysis for a point layer. This algorithm performs nearest neighbor analysis for a point layer.
Output is generated as an html file with the computed statistical values. Output is generated as an html file with the computed statistical values.
@ -324,7 +324,7 @@ qgis:offsetline: >
The segments parameter controls the number of line segments to use to approximate a quarter circle when creating rounded offsets. The segments parameter controls the number of line segments to use to approximate a quarter circle when creating rounded offsets.
The join style parameter specifies whether round, mitre or beveled joins should be used when offseting corners in a line. The join style parameter specifies whether round, mitre or beveled joins should be used when offsetting corners in a line.
The mitre limit parameter is only applicable for mitre join styles, and controls the maximum distance from the offset curve to use when creating a mitred join. The mitre limit parameter is only applicable for mitre join styles, and controls the maximum distance from the offset curve to use when creating a mitred join.
@ -421,10 +421,10 @@ qgis:randompointsinlayerbounds: >
This algorithm creates a new point layer with a given number of random points, all of them within the extent of a given layer. A distance factor can be specified, to avoid points being too close to each other. This algorithm creates a new point layer with a given number of random points, all of them within the extent of a given layer. A distance factor can be specified, to avoid points being too close to each other.
qgis:randompointsinsidepolygonsfixed: > qgis:randompointsinsidepolygonsfixed: >
This algorithms creates a new point layer with random points insides the ppolygons of a given layer. The number of points in each polygon can be defined as a fixed count or as a density value, and it will be the same for all polygons. This algorithms creates a new point layer with random points insides the polygons of a given layer. The number of points in each polygon can be defined as a fixed count or as a density value, and it will be the same for all polygons.
qgis:randompointsinsidepolygonsvariable: > qgis:randompointsinsidepolygonsvariable: >
This algorithm creates a new point layer with random points insides the ppolygons of a given layer. The number of points in each polygon can be defined as a fixed count or as a density value. The count/density valu is taken from an attribute, so it can be different for each polygons in the input layer. This algorithm creates a new point layer with random points insides the polygons of a given layer. The number of points in each polygon can be defined as a fixed count or as a density value. The count/density value is taken from an attribute, so it can be different for each polygons in the input layer.
qgis:randomselection: > qgis:randomselection: >
This algorithm takes a vector layer and selects a subset of its features. No new layer is generated by this algorithm. This algorithm takes a vector layer and selects a subset of its features. No new layer is generated by this algorithm.
@ -541,7 +541,7 @@ qgis:sumlinelengths: >
The resulting layer has the same features as the input polygon layer, but with two additional attributes containing the length and count of the lines across each polygon. The names of these two fields can be configured in the algorithm parameters. The resulting layer has the same features as the input polygon layer, but with two additional attributes containing the length and count of the lines across each polygon. The names of these two fields can be configured in the algorithm parameters.
qgis:symmetricaldifference: > qgis:symmetricaldifference: >
This algorithm creates a layer containing features from both the Input and Difference layers but with the overlapping areas between the two layers removed. The attribute table of the Symmetrical Difference layer contains atrributes from both the Input and Difference layers. This algorithm creates a layer containing features from both the Input and Difference layers but with the overlapping areas between the two layers removed. The attribute table of the Symmetrical Difference layer contains attributes from both the Input and Difference layers.
qgis:texttofloat: > qgis:texttofloat: >

View File

@ -759,6 +759,7 @@ atorney:attorney
atribute:attribute atribute:attribute
atributed:attributed atributed:attributed
atributes:attributes atributes:attributes
atrributes:attributes
attachement:attachment attachement:attachment
attaindre:attainder attaindre:attainder
attatch:attach attatch:attach
@ -1292,6 +1293,7 @@ cleints:clients
clera:clear clera:clear
clincial:clinical clincial:clinical
clinicaly:clinically clinicaly:clinically
clipoing:clipping
closeing:closing closeing:closing
cmoputer:computer cmoputer:computer
co-incided:coincided co-incided:coincided
@ -2115,6 +2117,7 @@ determinining:determining
determins:determines determins:determines
determinstic:deterministic determinstic:deterministic
determinstically:deterministically determinstically:deterministically
detination:destination
detremental:detrimental detremental:detrimental
detroy:destroy detroy:destroy
detroyed:destroyed detroyed:destroyed
@ -3112,6 +3115,7 @@ gausian:Gaussian
geneological:genealogical geneological:genealogical
geneologies:genealogies geneologies:genealogies
geneology:genealogy geneology:genealogy
generaates:generates
generaly:generally generaly:generally
generater:generator generater:generator
generaters:generators generaters:generators
@ -3147,6 +3151,7 @@ glyphes:glyphs
gnawwed:gnawed gnawwed:gnawed
godess:goddess godess:goddess
godesses:goddesses godesses:goddesses
goemetries:geometries
Godounov:Godunov Godounov:Godunov
gogin:going gogin:going
goign:going goign:going
@ -4315,6 +4320,7 @@ mentionned:mentioned
mercentile:mercantile mercentile:mercantile
mesage:message mesage:message
mesages:messages mesages:messages
mesaureed:measured
messagin:messaging messagin:messaging
messags:messages messags:messages
messanger:messenger messanger:messenger
@ -4566,6 +4572,7 @@ neigbour:neighbor
neigbourhood:neighbourhood neigbourhood:neighbourhood
neigbouring:neighboring neigbouring:neighboring
neigbours:neighbors neigbours:neighbors
neighbout:neighbor
neolitic:neolithic neolitic:neolithic
nescessarily:necessarily nescessarily:necessarily
nescessary:necessary nescessary:necessary
@ -4720,6 +4727,7 @@ officals:officials
officaly:officially officaly:officially
officialy:officially officialy:officially
offred:offered offred:offered
offseting:offsetting
oftenly:often oftenly:often
ofthe:of the ofthe:of the
oging:going oging:going
@ -5191,6 +5199,7 @@ poulations:populations
poverful:powerful poverful:powerful
poweful:powerful poweful:powerful
powerfull:powerful powerfull:powerful
ppolygons:polygons
ppublisher:publisher ppublisher:publisher
practial:practical practial:practical
practially:practically practially:practically
@ -7279,6 +7288,7 @@ usetnet:Usenet
usuable:usable usuable:usable
usualy:usually usualy:usually
ususally:usually ususally:usually
utilise:utilize
utilites:utilities utilites:utilities
utillities:utilities utillities:utilities
utilties:utilities utilties:utilities
@ -7297,6 +7307,7 @@ vailidty:validity
valetta:valletta valetta:valletta
validing:validating validing:validating
valied:valid valied:valid
valu:value
valuble:valuable valuble:valuable
valueable:valuable valueable:valuable
varable:variable varable:variable

View File

@ -1723,7 +1723,7 @@ QgsExpressionContext QgsComposerMap::createExpressionContext() const
{ {
QgsExpressionContext context = QgsComposerItem::createExpressionContext(); QgsExpressionContext context = QgsComposerItem::createExpressionContext();
//Can't utilise QgsExpressionContextUtils::mapSettingsScope as we don't always //Can't utilize QgsExpressionContextUtils::mapSettingsScope as we don't always
//have a QgsMapSettings object available when the context is required, so we manually //have a QgsMapSettings object available when the context is required, so we manually
//add the same variables here //add the same variables here
QgsExpressionContextScope *scope = new QgsExpressionContextScope( tr( "Map Settings" ) ); QgsExpressionContextScope *scope = new QgsExpressionContextScope( tr( "Map Settings" ) );

View File

@ -312,7 +312,7 @@ QPair<int, int> QgsComposerTableV2::rowRange( const int frameIndex ) const
} }
//loop through all previous frames to calculate how many rows are visible in each //loop through all previous frames to calculate how many rows are visible in each
//as the entire height of a frame may not be utilised for content rows //as the entire height of a frame may not be utilized for content rows
int rowsAlreadyShown = 0; int rowsAlreadyShown = 0;
for ( int idx = 0; idx < frameIndex; ++idx ) for ( int idx = 0; idx < frameIndex; ++idx )
{ {
@ -1064,7 +1064,7 @@ double QgsComposerTableV2::totalHeight()
double height = 0; double height = 0;
//loop through all existing frames to calculate how many rows are visible in each //loop through all existing frames to calculate how many rows are visible in each
//as the entire height of a frame may not be utilised for content rows //as the entire height of a frame may not be utilized for content rows
int rowsAlreadyShown = 0; int rowsAlreadyShown = 0;
int numberExistingFrames = frameCount(); int numberExistingFrames = frameCount();
int rowsVisibleInLastFrame = 0; int rowsVisibleInLastFrame = 0;

View File

@ -148,7 +148,7 @@ class CORE_EXPORT QgsGlowEffect : public QgsPaintEffect
QColor color() const { return mColor; } QColor color() const { return mColor; }
/** Sets the color ramp for the glow. This only applies if the @link colorType @endlink /** Sets the color ramp for the glow. This only applies if the @link colorType @endlink
* is set to ColorRamp. The glow will utilise colors from the ramp. * is set to ColorRamp. The glow will utilize colors from the ramp.
* @param ramp color ramp for glow. Ownership of the ramp is transferred to the effect. * @param ramp color ramp for glow. Ownership of the ramp is transferred to the effect.
* @see ramp * @see ramp
* @see setColorType * @see setColorType
@ -156,7 +156,7 @@ class CORE_EXPORT QgsGlowEffect : public QgsPaintEffect
void setRamp( QgsColorRamp *ramp ); void setRamp( QgsColorRamp *ramp );
/** Returns the color ramp used for the glow. This only applies if the @link colorType @endlink /** Returns the color ramp used for the glow. This only applies if the @link colorType @endlink
* is set to ColorRamp. The glow will utilise colors from the ramp. * is set to ColorRamp. The glow will utilize colors from the ramp.
* @returns color ramp for glow * @returns color ramp for glow
* @see setRamp * @see setRamp
* @see colorType * @see colorType

View File

@ -181,7 +181,7 @@ class CORE_EXPORT QgsPaintEffect
*/ */
void drawSource( QPainter &painter ); void drawSource( QPainter &painter );
/** Returns the source QPicture. The @link draw @endlink member can utilise this when /** Returns the source QPicture. The @link draw @endlink member can utilize this when
* drawing the effect. * drawing the effect.
* @returns source QPicture * @returns source QPicture
* @see drawSource * @see drawSource
@ -190,7 +190,7 @@ class CORE_EXPORT QgsPaintEffect
const QPicture *source() const { return mPicture; } const QPicture *source() const { return mPicture; }
/** Returns the source QPicture rendered to a new QImage. The @link draw @endlink member can /** Returns the source QPicture rendered to a new QImage. The @link draw @endlink member can
* utilise this when drawing the effect. The image will be padded or cropped from the original * utilize this when drawing the effect. The image will be padded or cropped from the original
* source QPicture by the results of the @link boundingRect @endlink method. * source QPicture by the results of the @link boundingRect @endlink method.
* The result is cached to speed up subsequent calls to sourceAsImage. * The result is cached to speed up subsequent calls to sourceAsImage.
* @returns source QPicture rendered to an image * @returns source QPicture rendered to an image

View File

@ -758,7 +758,7 @@ class CORE_EXPORT QgsExpression
static QStringList sBuiltinFunctions; static QStringList sBuiltinFunctions;
static const QStringList &BuiltinFunctions(); static const QStringList &BuiltinFunctions();
/** Registers a function to the expression engine. This is required to allow expressions to utilise the function. /** Registers a function to the expression engine. This is required to allow expressions to utilize the function.
* @param function function to register * @param function function to register
* @param transferOwnership set to true to transfer ownership of function to expression engine * @param transferOwnership set to true to transfer ownership of function to expression engine
* @returns true on successful registration * @returns true on successful registration

View File

@ -301,7 +301,7 @@ class CORE_EXPORT QgsExpressionContextScope
/** \ingroup core /** \ingroup core
* \class QgsExpressionContext * \class QgsExpressionContext
* \brief Expression contexts are used to encapsulate the parameters around which a QgsExpression should * \brief Expression contexts are used to encapsulate the parameters around which a QgsExpression should
* be evaluated. QgsExpressions can then utilise the information stored within a context to contextualise * be evaluated. QgsExpressions can then utilize the information stored within a context to contextualise
* their evaluated result. A QgsExpressionContext consists of a stack of QgsExpressionContextScope objects, * their evaluated result. A QgsExpressionContext consists of a stack of QgsExpressionContextScope objects,
* where scopes added later to the stack will override conflicting variables and functions from scopes * where scopes added later to the stack will override conflicting variables and functions from scopes
* lower in the stack. * lower in the stack.

View File

@ -160,7 +160,7 @@ class CORE_EXPORT QgsTask : public QObject
* argument. Note that subtasks should NEVER be dependent on their parent task, and violating * argument. Note that subtasks should NEVER be dependent on their parent task, and violating
* this constraint will prevent the task from completing successfully. * this constraint will prevent the task from completing successfully.
* *
* The parent task must be added to a QgsTaskManager for subtasks to be utilised. * The parent task must be added to a QgsTaskManager for subtasks to be utilized.
* Subtasks should not be added manually to a QgsTaskManager, rather, only the parent * Subtasks should not be added manually to a QgsTaskManager, rather, only the parent
* task should be added to the manager. * task should be added to the manager.
* *

View File

@ -657,7 +657,7 @@ class CORE_EXPORT QgsTextShadowSettings
*/ */
int offsetAngle() const; int offsetAngle() const;
/** Sets the angle for offseting the position of the shadow from the text. /** Sets the angle for offsetting the position of the shadow from the text.
* @param angle offset angle in degrees * @param angle offset angle in degrees
* @see offsetAngle() * @see offsetAngle()
* @see setOffsetDistance() * @see setOffsetDistance()

View File

@ -349,7 +349,7 @@ class CORE_EXPORT QgsMarkerLineSymbolLayer : public QgsLineSymbolLayer
private: private:
/** Renders a marker by offseting a vertex along the line by a specified distance. /** Renders a marker by offsetting a vertex along the line by a specified distance.
* @param points vertices making up the line * @param points vertices making up the line
* @param vertex vertex number to begin offset at * @param vertex vertex number to begin offset at
* @param distance distance to offset from vertex. If distance is positive, offset is calculated * @param distance distance to offset from vertex. If distance is positive, offset is calculated

View File

@ -267,7 +267,7 @@ class CORE_EXPORT QgsSymbol
*/ */
QSet<QString> usedAttributes( const QgsRenderContext &context ) const; QSet<QString> usedAttributes( const QgsRenderContext &context ) const;
/** Returns whether the symbol utilises any data defined properties. /** Returns whether the symbol utilizes any data defined properties.
* @note added in QGIS 2.12 * @note added in QGIS 2.12
*/ */
bool hasDataDefinedProperties() const; bool hasDataDefinedProperties() const;

View File

@ -2868,7 +2868,7 @@ QString QgsSymbolLayerUtils::colorToName( const QColor &color )
return QString(); return QString();
} }
//TODO - utilise a color names database (such as X11) to return nicer names //TODO - utilize a color names database (such as X11) to return nicer names
//for now, just return hex codes //for now, just return hex codes
return color.name(); return color.name();
} }

View File

@ -41,7 +41,7 @@ class GUI_EXPORT QgsFieldModel : public QAbstractItemModel
public: public:
//! Roles utilised by the model //! Roles utilized by the model
enum FieldRoles enum FieldRoles
{ {
FieldNameRole = Qt::UserRole + 1, //!< Return field name if index corresponds to a field FieldNameRole = Qt::UserRole + 1, //!< Return field name if index corresponds to a field

View File

@ -819,7 +819,7 @@ void TestQgsPaintEffect::vectorLayerEffect()
void TestQgsPaintEffect::mapUnits() void TestQgsPaintEffect::mapUnits()
{ {
//test rendering an effect which utilises map units //test rendering an effect which utilizes map units
QString linesFileName = mTestDataDir + "lines.shp"; QString linesFileName = mTestDataDir + "lines.shp";
QFileInfo lineFileInfo( linesFileName ); QFileInfo lineFileInfo( linesFileName );
QgsVectorLayer *lineLayer = new QgsVectorLayer( lineFileInfo.filePath(), QgsVectorLayer *lineLayer = new QgsVectorLayer( lineFileInfo.filePath(),