Skip to content

Commit 3711763

Browse files
sebasticjef-n
authored andcommitted
Fix spelling errors.
* cancelation -> cancellation * overal -> overall
1 parent 13a08c9 commit 3711763

File tree

73 files changed

+95
-95
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+95
-95
lines changed

doc/api_break.dox

+3-3
Original file line numberDiff line numberDiff line change
@@ -1896,7 +1896,7 @@ QgsRasterCalculator {#qgis_api_break_3_0_QgsRasterCalculator}
18961896

18971897
- Cancelled (Result enum value) has been renamed to Canceled <!--#spellok-->
18981898
- processCalculation() now uses an optional QgsFeedback instead of QProgressDialog
1899-
for progress reports and cancelation.
1899+
for progress reports and cancellation.
19001900

19011901
QgsRasterDataProvider {#qgis_api_break_3_0_QgsRasterDataProvider}
19021902
---------------------
@@ -2581,15 +2581,15 @@ QgsRendererAbstractMetadata {#qgis_api_break_3_0_QgsRendererAbstractMetadata}
25812581
QgsGraphDirector {#qgis_api_break_3_0_QgsGraphDirector}
25822582
----------------
25832583

2584-
- makeGraph() now uses QgsFeedback for progress reporting and cancelation
2584+
- makeGraph() now uses QgsFeedback for progress reporting and cancellation
25852585
- buildProgress() signal was removed
25862586
- buildMessage() signal was removed
25872587

25882588
QgsVectorLayerDirector {#qgis_api_break_3_0_QgsVectorLayerDirector}
25892589
----------------------
25902590

25912591
- QgsVectorLayerDirector() constructor now expects a reference to QgsFeatureSource as the first argument
2592-
- makeGraph() now uses QgsFeedback for progress reporting and cancelation
2592+
- makeGraph() now uses QgsFeedback for progress reporting and cancellation
25932593

25942594
Processing {#qgis_api_break_3_0_Processing}
25952595
----------

doc/porting_processing.dox

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Other porting notes
7474

7575
- Your algorithm's processAlgorithm methods should return a dict with output values. In the case of output feature sinks, the sink's ID string should be included in this dictionary.
7676

77-
- Since Processing algorithms can now be run in the background, it's important to implement support for cancelation in your algorithms. Whenever looping (or before/after calling lengthy operations) listen out for user cancelation via the provided feedback object. E.g.
77+
- Since Processing algorithms can now be run in the background, it's important to implement support for cancellation in your algorithms. Whenever looping (or before/after calling lengthy operations) listen out for user cancellation via the provided feedback object. E.g.
7878

7979
if feedback.isCanceled():
8080
break
@@ -93,7 +93,7 @@ object to pushInfo or reportError so that the lack of features is brought to use
9393

9494
- Don't write outputs using TableWriter or by directly creating a CSV file. Wherever possible use a feature sink instead so that the output is created as a proper vector layer. This allows other algorithms in a multi-step model to easily use the tabular outputs from the algorithm.
9595

96-
- To run another Processing algorithm as part of your algorithm, you can use processing.run(...). Make sure you pass the current context and feedback to processing.run to ensure that all temporary layer outputs are available to the executed algorithm, and that the executed algorithm can send feedback reports to the user (and correctly handle cancelation and progress reports!)
96+
- To run another Processing algorithm as part of your algorithm, you can use processing.run(...). Make sure you pass the current context and feedback to processing.run to ensure that all temporary layer outputs are available to the executed algorithm, and that the executed algorithm can send feedback reports to the user (and correctly handle cancellation and progress reports!)
9797

9898
- A new API contract exists for Processing. Now, only the c++ base class (e.g. those prefixed with "Qgs"), the gui wrappers, and the methods from processing.tools are considered stable, public API. All other Processing classes and methods are considered private and may change between QGIS versions. These should not be relied on by custom algorithms.
9999

python/analysis/auto_generated/interpolation/qgsgridfilewriter.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The ``extent`` and ``nCols``, ``nRows`` arguments dictate the extent and size of
3131
%Docstring
3232
Writes the grid file.
3333

34-
An optional ``feedback`` object can be set for progress reports and cancelation support
34+
An optional ``feedback`` object can be set for progress reports and cancellation support
3535

3636
:return: 0 in case of success
3737
%End

python/analysis/auto_generated/interpolation/qgsinterpolator.sip.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Calculates interpolation value for map coordinates x, y
8282

8383
:param x: x-coordinate (in map units)
8484
:param y: y-coordinate (in map units)
85-
:param feedback: optional feedback object for progress and cancelation support
85+
:param feedback: optional feedback object for progress and cancellation support
8686

8787
:return: - 0 in case of success
8888
- result: interpolation result
@@ -96,7 +96,7 @@ Calculates interpolation value for map coordinates x, y
9696
Caches the vertex and value data from the provider. All the vertex data
9797
will be held in virtual memory.
9898

99-
An optional ``feedback`` argument may be specified to allow cancelation and
99+
An optional ``feedback`` argument may be specified to allow cancellation and
100100
progress reports from the cache operation.
101101

102102
:return: Success in case of success

python/analysis/auto_generated/interpolation/qgstininterpolator.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Interpolation in a triangular irregular network
3232
QgsTinInterpolator( const QList<QgsInterpolator::LayerData> &inputData, TinInterpolation interpolation = Linear, QgsFeedback *feedback = 0 );
3333
%Docstring
3434
Constructor for QgsTinInterpolator.
35-
The ``feedback`` object specifies an optional QgsFeedback object for progress reports and cancelation support.
35+
The ``feedback`` object specifies an optional QgsFeedback object for progress reports and cancellation support.
3636
Ownership of ``feedback`` is not transferred and callers must ensure that it exists for the lifetime of this object.
3737
%End
3838
~QgsTinInterpolator();

python/analysis/auto_generated/mesh/qgsmeshcalculator.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Creates calculator with geometry mask
8383
%Docstring
8484
Starts the calculation, writes new dataset group to file and adds it to the mesh layer
8585

86-
:param feedback: The optional feedback argument for progress reporting and cancelation support
86+
:param feedback: The optional feedback argument for progress reporting and cancellation support
8787

8888
:return: QgsMeshCalculator.Success in case of success
8989
%End

python/analysis/auto_generated/raster/qgsninecellfilter.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Constructor that takes input file, output file and output format (GDAL string)
3333
%Docstring
3434
Starts the calculation, reads from mInputFile and stores the result in mOutputFile
3535

36-
:param feedback: feedback object that receives update and that is checked for cancelation.
36+
:param feedback: feedback object that receives update and that is checked for cancellation.
3737

3838
:return: 0 in case of success
3939
%End

python/analysis/auto_generated/raster/qgsrastercalculator.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ QgsRasterCalculator constructor.
100100
%Docstring
101101
Starts the calculation and writes a new raster.
102102

103-
The optional ``feedback`` argument can be used for progress reporting and cancelation support.
103+
The optional ``feedback`` argument can be used for progress reporting and cancellation support.
104104

105105
:return: QgsRasterCalculator.Success in case of success. If an error is encountered then
106106
a description of the error can be obtained by calling lastError().

python/analysis/auto_generated/raster/qgsrelief.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Produces colored relief rasters from DEM*
3636
%Docstring
3737
Starts the calculation, reads from mInputFile and stores the result in mOutputFile
3838

39-
:param feedback: feedback object that receives update and that is checked for cancelation.
39+
:param feedback: feedback object that receives update and that is checked for cancellation.
4040

4141
:return: 0 in case of success*
4242
%End

python/core/auto_generated/locator/qgslocator.sip.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ all filters.
114114

115115
void cancelWithoutBlocking();
116116
%Docstring
117-
Triggers cancelation of any current running query without blocking. The query may
117+
Triggers cancellation of any current running query without blocking. The query may
118118
take some time to cancel after calling this.
119119

120120
.. seealso:: :py:func:`cancel`
@@ -143,7 +143,7 @@ is called.
143143
void finished();
144144
%Docstring
145145
Emitted when locator has finished a query, either as a result
146-
of successful completion or early cancelation.
146+
of successful completion or early cancellation.
147147
%End
148148

149149
};

python/core/auto_generated/mesh/qgsmeshlayerinterpolator.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ from data provider and calculates triangular mesh
4343
:param transformContext: Transform context to transform layer CRS to destination CRS
4444
:param mapUnitsPerPixel: map units per pixel for block
4545
:param extent: extent of block in destination CRS
46-
:param feedback: optional raster feedback object for cancelation/preview
46+
:param feedback: optional raster feedback object for cancellation/preview
4747

4848
:return: raster block with Float.64 values. None on error
4949

python/core/auto_generated/mesh/qgsmeshspatialindex.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Constructor for :py:class:`QgsSpatialIndex`. Creates an empty R-tree index.
4545
%Docstring
4646
Constructor - creates R-tree and bulk loads faces from the specified mesh
4747

48-
The optional ``feedback`` object can be used to allow cancelation of bulk face loading. Ownership
48+
The optional ``feedback`` object can be used to allow cancellation of bulk face loading. Ownership
4949
of ``feedback`` is not transferred, and callers must take care that the lifetime of feedback exceeds
5050
that of the spatial index construction.
5151
%End

python/core/auto_generated/processing/qgsprocessingalgorithm.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ will be added to the algorithm's output. This allows for "explode" type algorith
900900
input feature results in multiple output features.
901901

902902
The provided ``feedback`` object can be used to push messages to the log and for giving feedback
903-
to users. Note that handling of progress reports and algorithm cancelation is handled by
903+
to users. Note that handling of progress reports and algorithm cancellation is handled by
904904
the base class and subclasses do not need to reimplement this logic.
905905

906906
Algorithms can throw a QgsProcessingException if a fatal error occurred which should

python/core/auto_generated/qgsfeedback.sip.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
class QgsFeedback : QObject
1313
{
1414
%Docstring
15-
Base class for feedback objects to be used for cancelation of something running in a worker thread.
15+
Base class for feedback objects to be used for cancellation of something running in a worker thread.
1616
The class may be used as is or it may be subclassed for extended functionality
1717
for a particular operation (e.g. report progress or pass some data for preview).
1818

19-
When cancel() is called, the internal code has two options to check for cancelation state:
19+
When cancel() is called, the internal code has two options to check for cancellation state:
2020
- if the worker thread uses an event loop (e.g. for network communication), the code can
21-
make a queued connection to canceled() signal and handle the cancelation in its slot.
21+
make a queued connection to canceled() signal and handle the cancellation in its slot.
2222
- if the worker thread does not use an event loop, it can poll isCanceled() method regularly
2323
to see if the operation should be canceled.
2424

python/core/auto_generated/qgsfiledownloader.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Emitted when data are ready to be processed
7777

7878
void cancelDownload();
7979
%Docstring
80-
Call to abort the download and delete this object after the cancelation
80+
Call to abort the download and delete this object after the cancellation
8181
has been processed.
8282

8383
.. seealso:: :py:func:`downloadCanceled`

python/core/auto_generated/qgshistogram.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ result of an expression.
4747

4848
:param layer: vector layer
4949
:param fieldOrExpression: field name or expression to be evaluated
50-
:param feedback: optional feedback object to allow cancelation of calculation
50+
:param feedback: optional feedback object to allow cancellation of calculation
5151

5252
:return: true if values were successfully set
5353
%End

python/core/auto_generated/qgsmaprendererjob.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Does nothing if the rendering is not active.
6161

6262
virtual void cancelWithoutBlocking() = 0;
6363
%Docstring
64-
Triggers cancelation of the rendering job without blocking. The render job will continue
64+
Triggers cancellation of the rendering job without blocking. The render job will continue
6565
to operate until it is able to cancel, at which stage the finished() signal will be emitted.
6666
Does nothing if the rendering is not active.
6767
%End

python/core/auto_generated/qgsspatialindex.sip.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Constructor for QgsSpatialIndex. Creates an empty R-tree index.
5656
Constructor - creates R-tree and bulk loads it with features from the iterator.
5757
This is much faster approach than creating an empty index and then inserting features one by one.
5858

59-
The optional ``feedback`` object can be used to allow cancelation of bulk feature loading. Ownership
59+
The optional ``feedback`` object can be used to allow cancellation of bulk feature loading. Ownership
6060
of ``feedback`` is not transferred, and callers must take care that the lifetime of feedback exceeds
6161
that of the spatial index construction.
6262

@@ -68,7 +68,7 @@ that of the spatial index construction.
6868
Constructor - creates R-tree and bulk loads it with features from the source.
6969
This is much faster approach than creating an empty index and then inserting features one by one.
7070

71-
The optional ``feedback`` object can be used to allow cancelation of bulk feature loading. Ownership
71+
The optional ``feedback`` object can be used to allow cancellation of bulk feature loading. Ownership
7272
of ``feedback`` is not transferred, and callers must take care that the lifetime of feedback exceeds
7373
that of the spatial index construction.
7474

python/core/auto_generated/qgsspatialindexkdbush.sip.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ QgsSpatialIndexKDBush objects are implicitly shared and can be inexpensively cop
4040
%Docstring
4141
Constructor - creates KDBush index and bulk loads it with features from the iterator.
4242

43-
The optional ``feedback`` object can be used to allow cancelation of bulk feature loading. Ownership
43+
The optional ``feedback`` object can be used to allow cancellation of bulk feature loading. Ownership
4444
of ``feedback`` is not transferred, and callers must take care that the lifetime of feedback exceeds
4545
that of the spatial index construction.
4646

@@ -51,7 +51,7 @@ Any non-single point features encountered during iteration will be ignored and n
5151
%Docstring
5252
Constructor - creates KDBush index and bulk loads it with features from the source.
5353

54-
The optional ``feedback`` object can be used to allow cancelation of bulk feature loading. Ownership
54+
The optional ``feedback`` object can be used to allow cancellation of bulk feature loading. Ownership
5555
of ``feedback`` is not transferred, and callers must take care that the lifetime of feedback exceeds
5656
that of the spatial index construction.
5757

python/core/auto_generated/qgsvectorlayerexporter.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Writes the contents of vector layer to a different datasource.
6666
:param onlySelected: set to true to export only selected features
6767
:param errorMessage: if non-null, will be set to any error messages
6868
:param options: optional provider dataset options
69-
:param feedback: optional feedback object to show progress and cancelation of export
69+
:param feedback: optional feedback object to show progress and cancellation of export
7070

7171
:return: NoError for a successful export, or encountered error
7272
%End

python/core/auto_generated/qgsvectorlayerutils.sip.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Fetches all values from a specified field name or expression.
113113
:param fieldOrExpression: field name or an expression string
114114
:param ok: will be set to false if field or expression is invalid, otherwise true
115115
:param selectedOnly: set to true to get values from selected features only
116-
:param feedback: optional feedback object to allow cancelation
116+
:param feedback: optional feedback object to allow cancellation
117117

118118
:return: list of fetched values
119119

@@ -132,7 +132,7 @@ invalid expression results are skipped.
132132
:param ok: will be set to false if field or expression is invalid, otherwise true
133133
:param selectedOnly: set to true to get values from selected features only
134134
:param nullCount: optional pointer to integer to store number of null values encountered in
135-
:param feedback: optional feedback object to allow cancelation
135+
:param feedback: optional feedback object to allow cancellation
136136

137137
:return: list of fetched values
138138

python/core/auto_generated/raster/qgsrasterdrawer.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Draws raster data.
2929
:param p: destination QPainter
3030
:param viewPort: viewport to render
3131
:param qgsMapToPixel: map to pixel converter
32-
:param feedback: optional raster feedback object for cancelation/preview. Added in QGIS 3.0.
32+
:param feedback: optional raster feedback object for cancellation/preview. Added in QGIS 3.0.
3333
%End
3434

3535
protected:

python/core/auto_generated/raster/qgsrasterinterface.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ Caller is responsible to free the memory returned.
215215
:param extent: extent of block
216216
:param width: pixel width of block
217217
:param height: pixel height of block
218-
:param feedback: optional raster feedback object for cancelation/preview. Added in QGIS 3.0.
218+
:param feedback: optional raster feedback object for cancellation/preview. Added in QGIS 3.0.
219219
%End
220220

221221
virtual bool setInput( QgsRasterInterface *input );

python/core/auto_generated/raster/qgsrasteriterator.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Start reading of raster band. Raster data can then be retrieved by calling readN
3232
:param nCols: number of columns
3333
:param nRows: number of rows
3434
:param extent: area to read
35-
:param feedback: optional raster feedback object for cancelation/preview. Added in QGIS 3.0.
35+
:param feedback: optional raster feedback object for cancellation/preview. Added in QGIS 3.0.
3636
%End
3737

3838
bool next( int bandNumber, int &columns /Out/, int &rows /Out/, int &topLeftColumn /Out/, int &topLeftRow /Out/, QgsRectangle &blockExtent /Out/ );

python/core/auto_generated/raster/qgsrastertransparency.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ by the stored transparency value.
101101
:param redValue: the red portion of the needle to search for in the transparency hay stack
102102
:param greenValue: the green portion of the needle to search for in the transparency hay stack
103103
:param blueValue: the green portion of the needle to search for in the transparency hay stack
104-
:param globalTransparency: the overal transparency level for the layer
104+
:param globalTransparency: the overall transparency level for the layer
105105
%End
106106

107107
bool isEmpty() const;

python/core/auto_generated/validity/qgsvaliditycheckregistry.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ an empty list will be returned.
6161
The ``context`` argument gives the wider in which the check is being run.
6262

6363
The ``feedback`` argument is used to give progress reports and to support
64-
cancelation of long-running checks.
64+
cancellation of long-running checks.
6565

6666
This is a blocking call, which will run all matching checks in the main
6767
thread and only return when they have all completed.

python/gui/auto_generated/locator/qgslocator.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class QgsLocator : QObject
104104

105105
void cancelWithoutBlocking();
106106
%Docstring
107-
Triggers cancelation of any current running query without blocking. The query may
107+
Triggers cancellation of any current running query without blocking. The query may
108108
take some time to cancel after calling this.
109109
.. seealso:: cancel()
110110
%End
@@ -126,7 +126,7 @@ class QgsLocator : QObject
126126
void finished();
127127
%Docstring
128128
Emitted when locator has finished a query, either as a result
129-
of successful completion or early cancelation.
129+
of successful completion or early cancellation.
130130
%End
131131

132132
};

python/gui/auto_generated/qgsfiledownloaderdialog.sip.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ handles file downloads and user feedback.
1717

1818
Internally, it uses QgsFileDownloader to handle the download,
1919
while showing progress via a progress dialog and supporting
20-
cancelation.
20+
cancellation.
2121

2222
.. note::
2323

python/plugins/processing/script/ScriptTemplate.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ def processAlgorithm(self, parameters, context, feedback):
179179
# processing.run(...). Make sure you pass the current context and feedback
180180
# to processing.run to ensure that all temporary layer outputs are available
181181
# to the executed algorithm, and that the executed algorithm can send feedback
182-
# reports to the user (and correctly handle cancelation and progress reports!)
182+
# reports to the user (and correctly handle cancellation and progress reports!)
183183
if False:
184184
buffered_layer = processing.run("native:buffer", {
185185
'INPUT': dest_id,

scripts/spell_check/spelling.dat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,7 @@ campagin:campaign
10941094
campain:campaign
10951095
campaing:campaign
10961096
campains:campaigns
1097-
cancellation:cancelation
1097+
cancelation:cancellation
10981098
cancelled:canceled
10991099
cancelling:canceling
11001100
candadate:candidate

src/3d/terrain/qgsdemterraintileloader_p.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ static QByteArray _readDtmData( QgsRasterDataProvider *provider, const QgsRectan
153153
QElapsedTimer t;
154154
t.start();
155155

156-
// TODO: use feedback object? (but GDAL currently does not support cancelation anyway)
156+
// TODO: use feedback object? (but GDAL currently does not support cancellation anyway)
157157
QgsRasterInterface *input = provider;
158158
std::unique_ptr<QgsRasterProjector> projector;
159159
if ( provider->crs() != destCrs )

src/analysis/interpolation/qgsgridfilewriter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class ANALYSIS_EXPORT QgsGridFileWriter
4646
/**
4747
* Writes the grid file.
4848
*
49-
* An optional \a feedback object can be set for progress reports and cancelation support
49+
* An optional \a feedback object can be set for progress reports and cancellation support
5050
*
5151
* \returns 0 in case of success
5252
*/

0 commit comments

Comments
 (0)