From 371176357b8f1bb9ab5efc53912628a48dc37f7f Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Sun, 24 Feb 2019 10:15:32 +0100 Subject: [PATCH] Fix spelling errors. * cancelation -> cancellation * overal -> overall --- doc/api_break.dox | 6 +++--- doc/porting_processing.dox | 4 ++-- .../auto_generated/interpolation/qgsgridfilewriter.sip.in | 2 +- .../auto_generated/interpolation/qgsinterpolator.sip.in | 4 ++-- .../auto_generated/interpolation/qgstininterpolator.sip.in | 2 +- .../analysis/auto_generated/mesh/qgsmeshcalculator.sip.in | 2 +- .../analysis/auto_generated/raster/qgsninecellfilter.sip.in | 2 +- .../auto_generated/raster/qgsrastercalculator.sip.in | 2 +- python/analysis/auto_generated/raster/qgsrelief.sip.in | 2 +- python/core/auto_generated/locator/qgslocator.sip.in | 4 ++-- .../auto_generated/mesh/qgsmeshlayerinterpolator.sip.in | 2 +- python/core/auto_generated/mesh/qgsmeshspatialindex.sip.in | 2 +- .../auto_generated/processing/qgsprocessingalgorithm.sip.in | 2 +- python/core/auto_generated/qgsfeedback.sip.in | 6 +++--- python/core/auto_generated/qgsfiledownloader.sip.in | 2 +- python/core/auto_generated/qgshistogram.sip.in | 2 +- python/core/auto_generated/qgsmaprendererjob.sip.in | 2 +- python/core/auto_generated/qgsspatialindex.sip.in | 4 ++-- python/core/auto_generated/qgsspatialindexkdbush.sip.in | 4 ++-- python/core/auto_generated/qgsvectorlayerexporter.sip.in | 2 +- python/core/auto_generated/qgsvectorlayerutils.sip.in | 4 ++-- python/core/auto_generated/raster/qgsrasterdrawer.sip.in | 2 +- python/core/auto_generated/raster/qgsrasterinterface.sip.in | 2 +- python/core/auto_generated/raster/qgsrasteriterator.sip.in | 2 +- .../core/auto_generated/raster/qgsrastertransparency.sip.in | 2 +- .../auto_generated/validity/qgsvaliditycheckregistry.sip.in | 2 +- python/gui/auto_generated/locator/qgslocator.sip | 4 ++-- python/gui/auto_generated/qgsfiledownloaderdialog.sip.in | 2 +- python/plugins/processing/script/ScriptTemplate.py | 2 +- scripts/spell_check/spelling.dat | 2 +- src/3d/terrain/qgsdemterraintileloader_p.cpp | 2 +- src/analysis/interpolation/qgsgridfilewriter.h | 2 +- src/analysis/interpolation/qgsinterpolator.h | 4 ++-- src/analysis/interpolation/qgstininterpolator.h | 2 +- src/analysis/mesh/qgsmeshcalculator.h | 2 +- src/analysis/processing/qgsreclassifyutils.h | 2 +- src/analysis/raster/qgsalignraster.h | 2 +- src/analysis/raster/qgsninecellfilter.h | 6 +++--- src/analysis/raster/qgsrastercalculator.h | 2 +- src/analysis/raster/qgsrelief.h | 2 +- src/app/layout/qgslayoutattributetablewidget.cpp | 2 +- src/app/locator/qgslocatoroptionswidget.h | 2 +- src/core/locator/qgslocator.h | 4 ++-- src/core/mesh/qgsmeshlayerinterpolator.h | 2 +- src/core/mesh/qgsmeshlayerrenderer.h | 2 +- src/core/mesh/qgsmeshspatialindex.cpp | 2 +- src/core/mesh/qgsmeshspatialindex.h | 2 +- src/core/pal/pal.h | 2 +- src/core/processing/qgsprocessingalgorithm.h | 2 +- src/core/qgsfeedback.h | 6 +++--- src/core/qgsfiledownloader.h | 2 +- src/core/qgshistogram.h | 2 +- src/core/qgslabelingengine.cpp | 2 +- src/core/qgsmaprendererjob.h | 2 +- src/core/qgsogrutils.h | 2 +- src/core/qgsspatialindex.cpp | 2 +- src/core/qgsspatialindex.h | 4 ++-- src/core/qgsspatialindexkdbush.h | 4 ++-- src/core/qgstaskmanager.h | 2 +- src/core/qgsvectorfilewriter.h | 4 ++-- src/core/qgsvectorlayerexporter.h | 2 +- src/core/qgsvectorlayerutils.h | 4 ++-- src/core/raster/qgsrasterdrawer.h | 2 +- src/core/raster/qgsrasterinterface.h | 2 +- src/core/raster/qgsrasteriterator.h | 2 +- src/core/raster/qgsrasterlayerrenderer.h | 2 +- src/core/raster/qgsrastertransparency.h | 2 +- src/core/validity/qgsvaliditycheckregistry.h | 2 +- src/gui/qgscurveeditorwidget.h | 2 +- src/gui/qgsfieldvalueslineedit.cpp | 2 +- src/gui/qgsfiledownloaderdialog.h | 2 +- src/gui/raster/qgspalettedrendererwidget.cpp | 2 +- src/providers/gdal/qgsgdalproviderbase.cpp | 4 ++-- 73 files changed, 95 insertions(+), 95 deletions(-) diff --git a/doc/api_break.dox b/doc/api_break.dox index 53c401ecc2e..cb4a10e17a4 100644 --- a/doc/api_break.dox +++ b/doc/api_break.dox @@ -1896,7 +1896,7 @@ QgsRasterCalculator {#qgis_api_break_3_0_QgsRasterCalculator} - Cancelled (Result enum value) has been renamed to Canceled - processCalculation() now uses an optional QgsFeedback instead of QProgressDialog -for progress reports and cancelation. +for progress reports and cancellation. QgsRasterDataProvider {#qgis_api_break_3_0_QgsRasterDataProvider} --------------------- @@ -2581,7 +2581,7 @@ QgsRendererAbstractMetadata {#qgis_api_break_3_0_QgsRendererAbstractMetadata} QgsGraphDirector {#qgis_api_break_3_0_QgsGraphDirector} ---------------- -- makeGraph() now uses QgsFeedback for progress reporting and cancelation +- makeGraph() now uses QgsFeedback for progress reporting and cancellation - buildProgress() signal was removed - buildMessage() signal was removed @@ -2589,7 +2589,7 @@ QgsVectorLayerDirector {#qgis_api_break_3_0_QgsVectorLayerDirector} ---------------------- - QgsVectorLayerDirector() constructor now expects a reference to QgsFeatureSource as the first argument -- makeGraph() now uses QgsFeedback for progress reporting and cancelation +- makeGraph() now uses QgsFeedback for progress reporting and cancellation Processing {#qgis_api_break_3_0_Processing} ---------- diff --git a/doc/porting_processing.dox b/doc/porting_processing.dox index 3883e729788..3d048fd5434 100644 --- a/doc/porting_processing.dox +++ b/doc/porting_processing.dox @@ -74,7 +74,7 @@ Other porting notes - 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. -- 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. +- 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. if feedback.isCanceled(): break @@ -93,7 +93,7 @@ object to pushInfo or reportError so that the lack of features is brought to use - 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. -- 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!) +- 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!) - 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. diff --git a/python/analysis/auto_generated/interpolation/qgsgridfilewriter.sip.in b/python/analysis/auto_generated/interpolation/qgsgridfilewriter.sip.in index 1c157fc13d2..82744aaf381 100644 --- a/python/analysis/auto_generated/interpolation/qgsgridfilewriter.sip.in +++ b/python/analysis/auto_generated/interpolation/qgsgridfilewriter.sip.in @@ -31,7 +31,7 @@ The ``extent`` and ``nCols``, ``nRows`` arguments dictate the extent and size of %Docstring Writes the grid file. -An optional ``feedback`` object can be set for progress reports and cancelation support +An optional ``feedback`` object can be set for progress reports and cancellation support :return: 0 in case of success %End diff --git a/python/analysis/auto_generated/interpolation/qgsinterpolator.sip.in b/python/analysis/auto_generated/interpolation/qgsinterpolator.sip.in index c551a67a2bb..38084602ee9 100644 --- a/python/analysis/auto_generated/interpolation/qgsinterpolator.sip.in +++ b/python/analysis/auto_generated/interpolation/qgsinterpolator.sip.in @@ -82,7 +82,7 @@ Calculates interpolation value for map coordinates x, y :param x: x-coordinate (in map units) :param y: y-coordinate (in map units) -:param feedback: optional feedback object for progress and cancelation support +:param feedback: optional feedback object for progress and cancellation support :return: - 0 in case of success - result: interpolation result @@ -96,7 +96,7 @@ Calculates interpolation value for map coordinates x, y Caches the vertex and value data from the provider. All the vertex data will be held in virtual memory. -An optional ``feedback`` argument may be specified to allow cancelation and +An optional ``feedback`` argument may be specified to allow cancellation and progress reports from the cache operation. :return: Success in case of success diff --git a/python/analysis/auto_generated/interpolation/qgstininterpolator.sip.in b/python/analysis/auto_generated/interpolation/qgstininterpolator.sip.in index 9b02de445d6..68bdfccf049 100644 --- a/python/analysis/auto_generated/interpolation/qgstininterpolator.sip.in +++ b/python/analysis/auto_generated/interpolation/qgstininterpolator.sip.in @@ -32,7 +32,7 @@ Interpolation in a triangular irregular network QgsTinInterpolator( const QList &inputData, TinInterpolation interpolation = Linear, QgsFeedback *feedback = 0 ); %Docstring Constructor for QgsTinInterpolator. -The ``feedback`` object specifies an optional QgsFeedback object for progress reports and cancelation support. +The ``feedback`` object specifies an optional QgsFeedback object for progress reports and cancellation support. Ownership of ``feedback`` is not transferred and callers must ensure that it exists for the lifetime of this object. %End ~QgsTinInterpolator(); diff --git a/python/analysis/auto_generated/mesh/qgsmeshcalculator.sip.in b/python/analysis/auto_generated/mesh/qgsmeshcalculator.sip.in index 1236fecce2f..533dbdcd41a 100644 --- a/python/analysis/auto_generated/mesh/qgsmeshcalculator.sip.in +++ b/python/analysis/auto_generated/mesh/qgsmeshcalculator.sip.in @@ -83,7 +83,7 @@ Creates calculator with geometry mask %Docstring Starts the calculation, writes new dataset group to file and adds it to the mesh layer -:param feedback: The optional feedback argument for progress reporting and cancelation support +:param feedback: The optional feedback argument for progress reporting and cancellation support :return: QgsMeshCalculator.Success in case of success %End diff --git a/python/analysis/auto_generated/raster/qgsninecellfilter.sip.in b/python/analysis/auto_generated/raster/qgsninecellfilter.sip.in index 87eb133f2ee..33935e69a95 100644 --- a/python/analysis/auto_generated/raster/qgsninecellfilter.sip.in +++ b/python/analysis/auto_generated/raster/qgsninecellfilter.sip.in @@ -33,7 +33,7 @@ Constructor that takes input file, output file and output format (GDAL string) %Docstring Starts the calculation, reads from mInputFile and stores the result in mOutputFile -:param feedback: feedback object that receives update and that is checked for cancelation. +:param feedback: feedback object that receives update and that is checked for cancellation. :return: 0 in case of success %End diff --git a/python/analysis/auto_generated/raster/qgsrastercalculator.sip.in b/python/analysis/auto_generated/raster/qgsrastercalculator.sip.in index 845a253a07f..311d6c6e1ed 100644 --- a/python/analysis/auto_generated/raster/qgsrastercalculator.sip.in +++ b/python/analysis/auto_generated/raster/qgsrastercalculator.sip.in @@ -100,7 +100,7 @@ QgsRasterCalculator constructor. %Docstring Starts the calculation and writes a new raster. -The optional ``feedback`` argument can be used for progress reporting and cancelation support. +The optional ``feedback`` argument can be used for progress reporting and cancellation support. :return: QgsRasterCalculator.Success in case of success. If an error is encountered then a description of the error can be obtained by calling lastError(). diff --git a/python/analysis/auto_generated/raster/qgsrelief.sip.in b/python/analysis/auto_generated/raster/qgsrelief.sip.in index 5b5c53101d3..0930b40b13c 100644 --- a/python/analysis/auto_generated/raster/qgsrelief.sip.in +++ b/python/analysis/auto_generated/raster/qgsrelief.sip.in @@ -36,7 +36,7 @@ Produces colored relief rasters from DEM* %Docstring Starts the calculation, reads from mInputFile and stores the result in mOutputFile -:param feedback: feedback object that receives update and that is checked for cancelation. +:param feedback: feedback object that receives update and that is checked for cancellation. :return: 0 in case of success* %End diff --git a/python/core/auto_generated/locator/qgslocator.sip.in b/python/core/auto_generated/locator/qgslocator.sip.in index cf0bdbbc92c..b938047df85 100644 --- a/python/core/auto_generated/locator/qgslocator.sip.in +++ b/python/core/auto_generated/locator/qgslocator.sip.in @@ -114,7 +114,7 @@ all filters. void cancelWithoutBlocking(); %Docstring -Triggers cancelation of any current running query without blocking. The query may +Triggers cancellation of any current running query without blocking. The query may take some time to cancel after calling this. .. seealso:: :py:func:`cancel` @@ -143,7 +143,7 @@ is called. void finished(); %Docstring Emitted when locator has finished a query, either as a result -of successful completion or early cancelation. +of successful completion or early cancellation. %End }; diff --git a/python/core/auto_generated/mesh/qgsmeshlayerinterpolator.sip.in b/python/core/auto_generated/mesh/qgsmeshlayerinterpolator.sip.in index 62f1cbca7fd..c779e5fd5dc 100644 --- a/python/core/auto_generated/mesh/qgsmeshlayerinterpolator.sip.in +++ b/python/core/auto_generated/mesh/qgsmeshlayerinterpolator.sip.in @@ -43,7 +43,7 @@ from data provider and calculates triangular mesh :param transformContext: Transform context to transform layer CRS to destination CRS :param mapUnitsPerPixel: map units per pixel for block :param extent: extent of block in destination CRS -:param feedback: optional raster feedback object for cancelation/preview +:param feedback: optional raster feedback object for cancellation/preview :return: raster block with Float.64 values. None on error diff --git a/python/core/auto_generated/mesh/qgsmeshspatialindex.sip.in b/python/core/auto_generated/mesh/qgsmeshspatialindex.sip.in index 01c07e1be27..07e2438daf3 100644 --- a/python/core/auto_generated/mesh/qgsmeshspatialindex.sip.in +++ b/python/core/auto_generated/mesh/qgsmeshspatialindex.sip.in @@ -45,7 +45,7 @@ Constructor for :py:class:`QgsSpatialIndex`. Creates an empty R-tree index. %Docstring Constructor - creates R-tree and bulk loads faces from the specified mesh -The optional ``feedback`` object can be used to allow cancelation of bulk face loading. Ownership +The optional ``feedback`` object can be used to allow cancellation of bulk face loading. Ownership of ``feedback`` is not transferred, and callers must take care that the lifetime of feedback exceeds that of the spatial index construction. %End diff --git a/python/core/auto_generated/processing/qgsprocessingalgorithm.sip.in b/python/core/auto_generated/processing/qgsprocessingalgorithm.sip.in index 9c8ffd56f1c..0af1d59383f 100644 --- a/python/core/auto_generated/processing/qgsprocessingalgorithm.sip.in +++ b/python/core/auto_generated/processing/qgsprocessingalgorithm.sip.in @@ -900,7 +900,7 @@ will be added to the algorithm's output. This allows for "explode" type algorith input feature results in multiple output features. The provided ``feedback`` object can be used to push messages to the log and for giving feedback -to users. Note that handling of progress reports and algorithm cancelation is handled by +to users. Note that handling of progress reports and algorithm cancellation is handled by the base class and subclasses do not need to reimplement this logic. Algorithms can throw a QgsProcessingException if a fatal error occurred which should diff --git a/python/core/auto_generated/qgsfeedback.sip.in b/python/core/auto_generated/qgsfeedback.sip.in index 5183ea6dc15..3a6b0eba806 100644 --- a/python/core/auto_generated/qgsfeedback.sip.in +++ b/python/core/auto_generated/qgsfeedback.sip.in @@ -12,13 +12,13 @@ class QgsFeedback : QObject { %Docstring -Base class for feedback objects to be used for cancelation of something running in a worker thread. +Base class for feedback objects to be used for cancellation of something running in a worker thread. The class may be used as is or it may be subclassed for extended functionality for a particular operation (e.g. report progress or pass some data for preview). -When cancel() is called, the internal code has two options to check for cancelation state: +When cancel() is called, the internal code has two options to check for cancellation state: - if the worker thread uses an event loop (e.g. for network communication), the code can -make a queued connection to canceled() signal and handle the cancelation in its slot. +make a queued connection to canceled() signal and handle the cancellation in its slot. - if the worker thread does not use an event loop, it can poll isCanceled() method regularly to see if the operation should be canceled. diff --git a/python/core/auto_generated/qgsfiledownloader.sip.in b/python/core/auto_generated/qgsfiledownloader.sip.in index 3ec86a7b117..ee4625dd129 100644 --- a/python/core/auto_generated/qgsfiledownloader.sip.in +++ b/python/core/auto_generated/qgsfiledownloader.sip.in @@ -77,7 +77,7 @@ Emitted when data are ready to be processed void cancelDownload(); %Docstring -Call to abort the download and delete this object after the cancelation +Call to abort the download and delete this object after the cancellation has been processed. .. seealso:: :py:func:`downloadCanceled` diff --git a/python/core/auto_generated/qgshistogram.sip.in b/python/core/auto_generated/qgshistogram.sip.in index 67dc844fd43..1c53cc5b0d4 100644 --- a/python/core/auto_generated/qgshistogram.sip.in +++ b/python/core/auto_generated/qgshistogram.sip.in @@ -47,7 +47,7 @@ result of an expression. :param layer: vector layer :param fieldOrExpression: field name or expression to be evaluated -:param feedback: optional feedback object to allow cancelation of calculation +:param feedback: optional feedback object to allow cancellation of calculation :return: true if values were successfully set %End diff --git a/python/core/auto_generated/qgsmaprendererjob.sip.in b/python/core/auto_generated/qgsmaprendererjob.sip.in index 7bd7e562a57..9889c4e2ad9 100644 --- a/python/core/auto_generated/qgsmaprendererjob.sip.in +++ b/python/core/auto_generated/qgsmaprendererjob.sip.in @@ -61,7 +61,7 @@ Does nothing if the rendering is not active. virtual void cancelWithoutBlocking() = 0; %Docstring -Triggers cancelation of the rendering job without blocking. The render job will continue +Triggers cancellation of the rendering job without blocking. The render job will continue to operate until it is able to cancel, at which stage the finished() signal will be emitted. Does nothing if the rendering is not active. %End diff --git a/python/core/auto_generated/qgsspatialindex.sip.in b/python/core/auto_generated/qgsspatialindex.sip.in index b3e4f03cafe..f8192b063da 100644 --- a/python/core/auto_generated/qgsspatialindex.sip.in +++ b/python/core/auto_generated/qgsspatialindex.sip.in @@ -56,7 +56,7 @@ Constructor for QgsSpatialIndex. Creates an empty R-tree index. Constructor - creates R-tree and bulk loads it with features from the iterator. This is much faster approach than creating an empty index and then inserting features one by one. -The optional ``feedback`` object can be used to allow cancelation of bulk feature loading. Ownership +The optional ``feedback`` object can be used to allow cancellation of bulk feature loading. Ownership of ``feedback`` is not transferred, and callers must take care that the lifetime of feedback exceeds that of the spatial index construction. @@ -68,7 +68,7 @@ that of the spatial index construction. Constructor - creates R-tree and bulk loads it with features from the source. This is much faster approach than creating an empty index and then inserting features one by one. -The optional ``feedback`` object can be used to allow cancelation of bulk feature loading. Ownership +The optional ``feedback`` object can be used to allow cancellation of bulk feature loading. Ownership of ``feedback`` is not transferred, and callers must take care that the lifetime of feedback exceeds that of the spatial index construction. diff --git a/python/core/auto_generated/qgsspatialindexkdbush.sip.in b/python/core/auto_generated/qgsspatialindexkdbush.sip.in index 6de0c9e4817..e91126171ac 100644 --- a/python/core/auto_generated/qgsspatialindexkdbush.sip.in +++ b/python/core/auto_generated/qgsspatialindexkdbush.sip.in @@ -40,7 +40,7 @@ QgsSpatialIndexKDBush objects are implicitly shared and can be inexpensively cop %Docstring Constructor - creates KDBush index and bulk loads it with features from the iterator. -The optional ``feedback`` object can be used to allow cancelation of bulk feature loading. Ownership +The optional ``feedback`` object can be used to allow cancellation of bulk feature loading. Ownership of ``feedback`` is not transferred, and callers must take care that the lifetime of feedback exceeds that of the spatial index construction. @@ -51,7 +51,7 @@ Any non-single point features encountered during iteration will be ignored and n %Docstring Constructor - creates KDBush index and bulk loads it with features from the source. -The optional ``feedback`` object can be used to allow cancelation of bulk feature loading. Ownership +The optional ``feedback`` object can be used to allow cancellation of bulk feature loading. Ownership of ``feedback`` is not transferred, and callers must take care that the lifetime of feedback exceeds that of the spatial index construction. diff --git a/python/core/auto_generated/qgsvectorlayerexporter.sip.in b/python/core/auto_generated/qgsvectorlayerexporter.sip.in index 7856a89e728..46c651b423b 100644 --- a/python/core/auto_generated/qgsvectorlayerexporter.sip.in +++ b/python/core/auto_generated/qgsvectorlayerexporter.sip.in @@ -66,7 +66,7 @@ Writes the contents of vector layer to a different datasource. :param onlySelected: set to true to export only selected features :param errorMessage: if non-null, will be set to any error messages :param options: optional provider dataset options -:param feedback: optional feedback object to show progress and cancelation of export +:param feedback: optional feedback object to show progress and cancellation of export :return: NoError for a successful export, or encountered error %End diff --git a/python/core/auto_generated/qgsvectorlayerutils.sip.in b/python/core/auto_generated/qgsvectorlayerutils.sip.in index 48a18697af6..07561f7a001 100644 --- a/python/core/auto_generated/qgsvectorlayerutils.sip.in +++ b/python/core/auto_generated/qgsvectorlayerutils.sip.in @@ -113,7 +113,7 @@ Fetches all values from a specified field name or expression. :param fieldOrExpression: field name or an expression string :param ok: will be set to false if field or expression is invalid, otherwise true :param selectedOnly: set to true to get values from selected features only -:param feedback: optional feedback object to allow cancelation +:param feedback: optional feedback object to allow cancellation :return: list of fetched values @@ -132,7 +132,7 @@ invalid expression results are skipped. :param ok: will be set to false if field or expression is invalid, otherwise true :param selectedOnly: set to true to get values from selected features only :param nullCount: optional pointer to integer to store number of null values encountered in -:param feedback: optional feedback object to allow cancelation +:param feedback: optional feedback object to allow cancellation :return: list of fetched values diff --git a/python/core/auto_generated/raster/qgsrasterdrawer.sip.in b/python/core/auto_generated/raster/qgsrasterdrawer.sip.in index 0d459a93871..498d8bdf6a7 100644 --- a/python/core/auto_generated/raster/qgsrasterdrawer.sip.in +++ b/python/core/auto_generated/raster/qgsrasterdrawer.sip.in @@ -29,7 +29,7 @@ Draws raster data. :param p: destination QPainter :param viewPort: viewport to render :param qgsMapToPixel: map to pixel converter -:param feedback: optional raster feedback object for cancelation/preview. Added in QGIS 3.0. +:param feedback: optional raster feedback object for cancellation/preview. Added in QGIS 3.0. %End protected: diff --git a/python/core/auto_generated/raster/qgsrasterinterface.sip.in b/python/core/auto_generated/raster/qgsrasterinterface.sip.in index ad558290fa6..06a10109799 100644 --- a/python/core/auto_generated/raster/qgsrasterinterface.sip.in +++ b/python/core/auto_generated/raster/qgsrasterinterface.sip.in @@ -215,7 +215,7 @@ Caller is responsible to free the memory returned. :param extent: extent of block :param width: pixel width of block :param height: pixel height of block -:param feedback: optional raster feedback object for cancelation/preview. Added in QGIS 3.0. +:param feedback: optional raster feedback object for cancellation/preview. Added in QGIS 3.0. %End virtual bool setInput( QgsRasterInterface *input ); diff --git a/python/core/auto_generated/raster/qgsrasteriterator.sip.in b/python/core/auto_generated/raster/qgsrasteriterator.sip.in index 79de4ca4313..5a49c6887e2 100644 --- a/python/core/auto_generated/raster/qgsrasteriterator.sip.in +++ b/python/core/auto_generated/raster/qgsrasteriterator.sip.in @@ -32,7 +32,7 @@ Start reading of raster band. Raster data can then be retrieved by calling readN :param nCols: number of columns :param nRows: number of rows :param extent: area to read -:param feedback: optional raster feedback object for cancelation/preview. Added in QGIS 3.0. +:param feedback: optional raster feedback object for cancellation/preview. Added in QGIS 3.0. %End bool next( int bandNumber, int &columns /Out/, int &rows /Out/, int &topLeftColumn /Out/, int &topLeftRow /Out/, QgsRectangle &blockExtent /Out/ ); diff --git a/python/core/auto_generated/raster/qgsrastertransparency.sip.in b/python/core/auto_generated/raster/qgsrastertransparency.sip.in index cbad9defa65..083bea2e059 100644 --- a/python/core/auto_generated/raster/qgsrastertransparency.sip.in +++ b/python/core/auto_generated/raster/qgsrastertransparency.sip.in @@ -101,7 +101,7 @@ by the stored transparency value. :param redValue: the red portion of the needle to search for in the transparency hay stack :param greenValue: the green portion of the needle to search for in the transparency hay stack :param blueValue: the green portion of the needle to search for in the transparency hay stack -:param globalTransparency: the overal transparency level for the layer +:param globalTransparency: the overall transparency level for the layer %End bool isEmpty() const; diff --git a/python/core/auto_generated/validity/qgsvaliditycheckregistry.sip.in b/python/core/auto_generated/validity/qgsvaliditycheckregistry.sip.in index ca7fa6a7898..117870adb59 100644 --- a/python/core/auto_generated/validity/qgsvaliditycheckregistry.sip.in +++ b/python/core/auto_generated/validity/qgsvaliditycheckregistry.sip.in @@ -61,7 +61,7 @@ an empty list will be returned. The ``context`` argument gives the wider in which the check is being run. The ``feedback`` argument is used to give progress reports and to support -cancelation of long-running checks. +cancellation of long-running checks. This is a blocking call, which will run all matching checks in the main thread and only return when they have all completed. diff --git a/python/gui/auto_generated/locator/qgslocator.sip b/python/gui/auto_generated/locator/qgslocator.sip index f51b0c92eca..69b60f06a7d 100644 --- a/python/gui/auto_generated/locator/qgslocator.sip +++ b/python/gui/auto_generated/locator/qgslocator.sip @@ -104,7 +104,7 @@ class QgsLocator : QObject void cancelWithoutBlocking(); %Docstring - Triggers cancelation of any current running query without blocking. The query may + Triggers cancellation of any current running query without blocking. The query may take some time to cancel after calling this. .. seealso:: cancel() %End @@ -126,7 +126,7 @@ class QgsLocator : QObject void finished(); %Docstring Emitted when locator has finished a query, either as a result - of successful completion or early cancelation. + of successful completion or early cancellation. %End }; diff --git a/python/gui/auto_generated/qgsfiledownloaderdialog.sip.in b/python/gui/auto_generated/qgsfiledownloaderdialog.sip.in index 24bd4b95322..9766c3d1985 100644 --- a/python/gui/auto_generated/qgsfiledownloaderdialog.sip.in +++ b/python/gui/auto_generated/qgsfiledownloaderdialog.sip.in @@ -17,7 +17,7 @@ handles file downloads and user feedback. Internally, it uses QgsFileDownloader to handle the download, while showing progress via a progress dialog and supporting -cancelation. +cancellation. .. note:: diff --git a/python/plugins/processing/script/ScriptTemplate.py b/python/plugins/processing/script/ScriptTemplate.py index 453deb16936..ba5b85c71ab 100644 --- a/python/plugins/processing/script/ScriptTemplate.py +++ b/python/plugins/processing/script/ScriptTemplate.py @@ -179,7 +179,7 @@ class ExampleProcessingAlgorithm(QgsProcessingAlgorithm): # 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!) + # reports to the user (and correctly handle cancellation and progress reports!) if False: buffered_layer = processing.run("native:buffer", { 'INPUT': dest_id, diff --git a/scripts/spell_check/spelling.dat b/scripts/spell_check/spelling.dat index 88f60df07ad..a677608cc60 100644 --- a/scripts/spell_check/spelling.dat +++ b/scripts/spell_check/spelling.dat @@ -1094,7 +1094,7 @@ campagin:campaign campain:campaign campaing:campaign campains:campaigns -cancellation:cancelation +cancelation:cancellation cancelled:canceled cancelling:canceling candadate:candidate diff --git a/src/3d/terrain/qgsdemterraintileloader_p.cpp b/src/3d/terrain/qgsdemterraintileloader_p.cpp index b3dee198b25..69bf96c9a22 100644 --- a/src/3d/terrain/qgsdemterraintileloader_p.cpp +++ b/src/3d/terrain/qgsdemterraintileloader_p.cpp @@ -153,7 +153,7 @@ static QByteArray _readDtmData( QgsRasterDataProvider *provider, const QgsRectan QElapsedTimer t; t.start(); - // TODO: use feedback object? (but GDAL currently does not support cancelation anyway) + // TODO: use feedback object? (but GDAL currently does not support cancellation anyway) QgsRasterInterface *input = provider; std::unique_ptr projector; if ( provider->crs() != destCrs ) diff --git a/src/analysis/interpolation/qgsgridfilewriter.h b/src/analysis/interpolation/qgsgridfilewriter.h index 133422d2a08..4f2a6714d0d 100644 --- a/src/analysis/interpolation/qgsgridfilewriter.h +++ b/src/analysis/interpolation/qgsgridfilewriter.h @@ -46,7 +46,7 @@ class ANALYSIS_EXPORT QgsGridFileWriter /** * Writes the grid file. * - * An optional \a feedback object can be set for progress reports and cancelation support + * An optional \a feedback object can be set for progress reports and cancellation support * * \returns 0 in case of success */ diff --git a/src/analysis/interpolation/qgsinterpolator.h b/src/analysis/interpolation/qgsinterpolator.h index 538e1bf63dd..35343ccdf7f 100644 --- a/src/analysis/interpolation/qgsinterpolator.h +++ b/src/analysis/interpolation/qgsinterpolator.h @@ -111,7 +111,7 @@ class ANALYSIS_EXPORT QgsInterpolator * \param x x-coordinate (in map units) * \param y y-coordinate (in map units) * \param result interpolation result - * \param feedback optional feedback object for progress and cancelation support + * \param feedback optional feedback object for progress and cancellation support * \returns 0 in case of success */ virtual int interpolatePoint( double x, double y, double &result SIP_OUT, QgsFeedback *feedback = nullptr ) = 0; @@ -125,7 +125,7 @@ class ANALYSIS_EXPORT QgsInterpolator * Caches the vertex and value data from the provider. All the vertex data * will be held in virtual memory. * - * An optional \a feedback argument may be specified to allow cancelation and + * An optional \a feedback argument may be specified to allow cancellation and * progress reports from the cache operation. * * \returns Success in case of success diff --git a/src/analysis/interpolation/qgstininterpolator.h b/src/analysis/interpolation/qgstininterpolator.h index 25fba6f91cb..3bed129a324 100644 --- a/src/analysis/interpolation/qgstininterpolator.h +++ b/src/analysis/interpolation/qgstininterpolator.h @@ -47,7 +47,7 @@ class ANALYSIS_EXPORT QgsTinInterpolator: public QgsInterpolator /** * Constructor for QgsTinInterpolator. - * The \a feedback object specifies an optional QgsFeedback object for progress reports and cancelation support. + * The \a feedback object specifies an optional QgsFeedback object for progress reports and cancellation support. * Ownership of \a feedback is not transferred and callers must ensure that it exists for the lifetime of this object. */ QgsTinInterpolator( const QList &inputData, TinInterpolation interpolation = Linear, QgsFeedback *feedback = nullptr ); diff --git a/src/analysis/mesh/qgsmeshcalculator.h b/src/analysis/mesh/qgsmeshcalculator.h index 77cb71f36d9..bc1fde1bb4a 100644 --- a/src/analysis/mesh/qgsmeshcalculator.h +++ b/src/analysis/mesh/qgsmeshcalculator.h @@ -97,7 +97,7 @@ class ANALYSIS_EXPORT QgsMeshCalculator /** * Starts the calculation, writes new dataset group to file and adds it to the mesh layer - * \param feedback The optional feedback argument for progress reporting and cancelation support + * \param feedback The optional feedback argument for progress reporting and cancellation support * \returns QgsMeshCalculator::Success in case of success */ Result processCalculation( QgsFeedback *feedback = nullptr ); diff --git a/src/analysis/processing/qgsreclassifyutils.h b/src/analysis/processing/qgsreclassifyutils.h index b7df0758b7e..8ab7b225435 100644 --- a/src/analysis/processing/qgsreclassifyutils.h +++ b/src/analysis/processing/qgsreclassifyutils.h @@ -95,7 +95,7 @@ class ANALYSIS_EXPORT QgsReclassifyUtils * a class will be changed to the no data value. Otherwise they are saved unchanged. * * The \a feedback argument gives an optional processing feedback, for progress reports - * and cancelation. + * and cancellation. */ static void reclassify( const QVector< RasterClass > &classes, QgsRasterInterface *sourceRaster, diff --git a/src/analysis/raster/qgsalignraster.h b/src/analysis/raster/qgsalignraster.h index 212447a7e40..29b285d064c 100644 --- a/src/analysis/raster/qgsalignraster.h +++ b/src/analysis/raster/qgsalignraster.h @@ -277,7 +277,7 @@ class ANALYSIS_EXPORT QgsAlignRaster // set by the client - //! Object that facilitates reporting of progress / cancelation + //! Object that facilitates reporting of progress / cancellation ProgressHandler *mProgressHandler = nullptr; //! Last error message from run() diff --git a/src/analysis/raster/qgsninecellfilter.h b/src/analysis/raster/qgsninecellfilter.h index 63b664708b4..86449c8ab1d 100644 --- a/src/analysis/raster/qgsninecellfilter.h +++ b/src/analysis/raster/qgsninecellfilter.h @@ -40,7 +40,7 @@ class ANALYSIS_EXPORT QgsNineCellFilter /** * Starts the calculation, reads from mInputFile and stores the result in mOutputFile - * \param feedback feedback object that receives update and that is checked for cancelation. + * \param feedback feedback object that receives update and that is checked for cancellation. * \returns 0 in case of success */ int processRaster( QgsFeedback *feedback = nullptr ); @@ -99,7 +99,7 @@ class ANALYSIS_EXPORT QgsNineCellFilter /** * \brief processRasterCPU executes the computation on the CPU - * \param feedback instance of QgsFeedback, to allow for progress monitoring and cancelation + * \param feedback instance of QgsFeedback, to allow for progress monitoring and cancellation * \return an opaque integer for error codes: 0 in case of success */ int processRasterCPU( QgsFeedback *feedback = nullptr ); @@ -109,7 +109,7 @@ class ANALYSIS_EXPORT QgsNineCellFilter /** * \brief processRasterGPU executes the computation on the GPU * \param source path to the OpenCL source file - * \param feedback instance of QgsFeedback, to allow for progress monitoring and cancelation + * \param feedback instance of QgsFeedback, to allow for progress monitoring and cancellation * \return an opaque integer for error codes: 0 in case of success */ int processRasterGPU( const QString &source, QgsFeedback *feedback = nullptr ); diff --git a/src/analysis/raster/qgsrastercalculator.h b/src/analysis/raster/qgsrastercalculator.h index 0b80c954526..162ddb4f27e 100644 --- a/src/analysis/raster/qgsrastercalculator.h +++ b/src/analysis/raster/qgsrastercalculator.h @@ -120,7 +120,7 @@ class ANALYSIS_EXPORT QgsRasterCalculator /** * Starts the calculation and writes a new raster. * - * The optional \a feedback argument can be used for progress reporting and cancelation support. + * The optional \a feedback argument can be used for progress reporting and cancellation support. * * \returns QgsRasterCalculator::Success in case of success. If an error is encountered then * a description of the error can be obtained by calling lastError(). diff --git a/src/analysis/raster/qgsrelief.h b/src/analysis/raster/qgsrelief.h index 8bcb7e56557..d852798a064 100644 --- a/src/analysis/raster/qgsrelief.h +++ b/src/analysis/raster/qgsrelief.h @@ -55,7 +55,7 @@ class ANALYSIS_EXPORT QgsRelief /** * Starts the calculation, reads from mInputFile and stores the result in mOutputFile - \param feedback feedback object that receives update and that is checked for cancelation. + \param feedback feedback object that receives update and that is checked for cancellation. \returns 0 in case of success*/ int processRaster( QgsFeedback *feedback = nullptr ); diff --git a/src/app/layout/qgslayoutattributetablewidget.cpp b/src/app/layout/qgslayoutattributetablewidget.cpp index da2e37d1104..39437bc98e5 100644 --- a/src/app/layout/qgslayoutattributetablewidget.cpp +++ b/src/app/layout/qgslayoutattributetablewidget.cpp @@ -204,7 +204,7 @@ void QgsLayoutAttributeTableWidget::mAttributesPushButton_clicked() return; } - //make deep copy of current columns, so we can restore them in case of cancelation + //make deep copy of current columns, so we can restore them in case of cancellation QVector currentColumns; auto it = mTable->columns().constBegin(); for ( ; it != mTable->columns().constEnd() ; ++it ) diff --git a/src/app/locator/qgslocatoroptionswidget.h b/src/app/locator/qgslocatoroptionswidget.h index f7417368496..47eb13b5ec7 100644 --- a/src/app/locator/qgslocatoroptionswidget.h +++ b/src/app/locator/qgslocatoroptionswidget.h @@ -104,7 +104,7 @@ class QgsLocatorFiltersModel : public QAbstractTableModel QgsLocator *mLocator = nullptr; - // changes are deferred to support cancelation + // changes are deferred to support cancellation QHash< QgsLocatorFilter *, QString > mPrefixes; QHash< QgsLocatorFilter *, bool > mEnabledChanges; QHash< QgsLocatorFilter *, bool > mDefaultChanges; diff --git a/src/core/locator/qgslocator.h b/src/core/locator/qgslocator.h index bb735d3a37e..92dedaca562 100644 --- a/src/core/locator/qgslocator.h +++ b/src/core/locator/qgslocator.h @@ -128,7 +128,7 @@ class CORE_EXPORT QgsLocator : public QObject void cancel(); /** - * Triggers cancelation of any current running query without blocking. The query may + * Triggers cancellation of any current running query without blocking. The query may * take some time to cancel after calling this. * \see cancel() */ @@ -155,7 +155,7 @@ class CORE_EXPORT QgsLocator : public QObject /** * Emitted when locator has finished a query, either as a result - * of successful completion or early cancelation. + * of successful completion or early cancellation. */ void finished(); diff --git a/src/core/mesh/qgsmeshlayerinterpolator.h b/src/core/mesh/qgsmeshlayerinterpolator.h index 9a4b337900d..47bef88a2af 100644 --- a/src/core/mesh/qgsmeshlayerinterpolator.h +++ b/src/core/mesh/qgsmeshlayerinterpolator.h @@ -94,7 +94,7 @@ namespace QgsMeshUtils * \param transformContext Transform context to transform layer CRS to destination CRS * \param mapUnitsPerPixel map units per pixel for block * \param extent extent of block in destination CRS - * \param feedback optional raster feedback object for cancelation/preview + * \param feedback optional raster feedback object for cancellation/preview * \returns raster block with Float::64 values. nullptr on error * * \since QGIS 3.6 diff --git a/src/core/mesh/qgsmeshlayerrenderer.h b/src/core/mesh/qgsmeshlayerrenderer.h index d14f261cf71..1e9a4b0d1f0 100644 --- a/src/core/mesh/qgsmeshlayerrenderer.h +++ b/src/core/mesh/qgsmeshlayerrenderer.h @@ -101,7 +101,7 @@ class QgsMeshLayerRenderer : public QgsMapLayerRenderer void calculateOutputSize(); protected: - //! feedback class for cancelation + //! feedback class for cancellation std::unique_ptr mFeedback; // copy from mesh layer diff --git a/src/core/mesh/qgsmeshspatialindex.cpp b/src/core/mesh/qgsmeshspatialindex.cpp index 037f67fbe47..7930872b0e2 100644 --- a/src/core/mesh/qgsmeshspatialindex.cpp +++ b/src/core/mesh/qgsmeshspatialindex.cpp @@ -211,7 +211,7 @@ class QgsMeshSpatialIndexData : public QSharedData * Constructor for QgsSpatialIndexData which bulk loads faces from the specified mesh * \a fi. * - * The optional \a feedback object can be used to allow cancelation of bulk face loading. Ownership + * The optional \a feedback object can be used to allow cancellation of bulk face loading. Ownership * of \a feedback is not transferred, and callers must take care that the lifetime of feedback exceeds * that of the spatial index construction. */ diff --git a/src/core/mesh/qgsmeshspatialindex.h b/src/core/mesh/qgsmeshspatialindex.h index fa40ac486d4..0043bf0c97e 100644 --- a/src/core/mesh/qgsmeshspatialindex.h +++ b/src/core/mesh/qgsmeshspatialindex.h @@ -57,7 +57,7 @@ class CORE_EXPORT QgsMeshSpatialIndex /** * Constructor - creates R-tree and bulk loads faces from the specified mesh * - * The optional \a feedback object can be used to allow cancelation of bulk face loading. Ownership + * The optional \a feedback object can be used to allow cancellation of bulk face loading. Ownership * of \a feedback is not transferred, and callers must take care that the lifetime of feedback exceeds * that of the spatial index construction. */ diff --git a/src/core/pal/pal.h b/src/core/pal/pal.h index 07ac3f0b276..80bf4326646 100644 --- a/src/core/pal/pal.h +++ b/src/core/pal/pal.h @@ -253,7 +253,7 @@ namespace pal //! Callback that may be called from PAL to check whether the job has not been canceled in meanwhile FnIsCanceled fnIsCanceled; - //! Application-specific context for the cancelation check function + //! Application-specific context for the cancellation check function void *fnIsCanceledContext = nullptr; /** diff --git a/src/core/processing/qgsprocessingalgorithm.h b/src/core/processing/qgsprocessingalgorithm.h index 449067fd1ef..770dcba70eb 100644 --- a/src/core/processing/qgsprocessingalgorithm.h +++ b/src/core/processing/qgsprocessingalgorithm.h @@ -906,7 +906,7 @@ class CORE_EXPORT QgsProcessingFeatureBasedAlgorithm : public QgsProcessingAlgor * input feature results in multiple output features. * * The provided \a feedback object can be used to push messages to the log and for giving feedback - * to users. Note that handling of progress reports and algorithm cancelation is handled by + * to users. Note that handling of progress reports and algorithm cancellation is handled by * the base class and subclasses do not need to reimplement this logic. * * Algorithms can throw a QgsProcessingException if a fatal error occurred which should diff --git a/src/core/qgsfeedback.h b/src/core/qgsfeedback.h index 6565c9c5abf..09f6fb0420b 100644 --- a/src/core/qgsfeedback.h +++ b/src/core/qgsfeedback.h @@ -23,13 +23,13 @@ /** * \ingroup core - * Base class for feedback objects to be used for cancelation of something running in a worker thread. + * Base class for feedback objects to be used for cancellation of something running in a worker thread. * The class may be used as is or it may be subclassed for extended functionality * for a particular operation (e.g. report progress or pass some data for preview). * - * When cancel() is called, the internal code has two options to check for cancelation state: + * When cancel() is called, the internal code has two options to check for cancellation state: * - if the worker thread uses an event loop (e.g. for network communication), the code can - * make a queued connection to canceled() signal and handle the cancelation in its slot. + * make a queued connection to canceled() signal and handle the cancellation in its slot. * - if the worker thread does not use an event loop, it can poll isCanceled() method regularly * to see if the operation should be canceled. * diff --git a/src/core/qgsfiledownloader.h b/src/core/qgsfiledownloader.h index 052d0c5a2fb..66299e89397 100644 --- a/src/core/qgsfiledownloader.h +++ b/src/core/qgsfiledownloader.h @@ -77,7 +77,7 @@ class CORE_EXPORT QgsFileDownloader : public QObject public slots: /** - * Call to abort the download and delete this object after the cancelation + * Call to abort the download and delete this object after the cancellation * has been processed. * \see downloadCanceled() */ diff --git a/src/core/qgshistogram.h b/src/core/qgshistogram.h index 3d24ee1cebe..f53697433ce 100644 --- a/src/core/qgshistogram.h +++ b/src/core/qgshistogram.h @@ -56,7 +56,7 @@ class CORE_EXPORT QgsHistogram * result of an expression. * \param layer vector layer * \param fieldOrExpression field name or expression to be evaluated - * \param feedback optional feedback object to allow cancelation of calculation + * \param feedback optional feedback object to allow cancellation of calculation * \returns true if values were successfully set */ bool setValues( const QgsVectorLayer *layer, const QString &fieldOrExpression, QgsFeedback *feedback = nullptr ); diff --git a/src/core/qgslabelingengine.cpp b/src/core/qgslabelingengine.cpp index c76214fa26b..4eb8ef20ebd 100644 --- a/src/core/qgslabelingengine.cpp +++ b/src/core/qgslabelingengine.cpp @@ -28,7 +28,7 @@ #include "qgssymbol.h" #include "qgsexpressioncontextutils.h" -// helper function for checking for job cancelation within PAL +// helper function for checking for job cancellation within PAL static bool _palIsCanceled( void *ctx ) { return ( reinterpret_cast< QgsRenderContext * >( ctx ) )->renderingStopped(); diff --git a/src/core/qgsmaprendererjob.h b/src/core/qgsmaprendererjob.h index 4a9d2b9fee4..956c17f4486 100644 --- a/src/core/qgsmaprendererjob.h +++ b/src/core/qgsmaprendererjob.h @@ -132,7 +132,7 @@ class CORE_EXPORT QgsMapRendererJob : public QObject virtual void cancel() = 0; /** - * Triggers cancelation of the rendering job without blocking. The render job will continue + * Triggers cancellation of the rendering job without blocking. The render job will continue * to operate until it is able to cancel, at which stage the finished() signal will be emitted. * Does nothing if the rendering is not active. */ diff --git a/src/core/qgsogrutils.h b/src/core/qgsogrutils.h index 2405a1491b1..f9f5940e153 100644 --- a/src/core/qgsogrutils.h +++ b/src/core/qgsogrutils.h @@ -136,7 +136,7 @@ namespace gdal /** * Performs a fast close of an unwanted GDAL dataset handle by deleting the underlying * data store. Use when the resultant dataset is no longer required, e.g. as a result - * of user cancelation of an operation. + * of user cancellation of an operation. * * Requires a gdal \a dataset pointer, the corresponding gdal \a driver and underlying * dataset file \a path. diff --git a/src/core/qgsspatialindex.cpp b/src/core/qgsspatialindex.cpp index 845c49e6000..ddb91e5e6c9 100644 --- a/src/core/qgsspatialindex.cpp +++ b/src/core/qgsspatialindex.cpp @@ -241,7 +241,7 @@ class QgsSpatialIndexData : public QSharedData * Constructor for QgsSpatialIndexData which bulk loads features from the specified feature iterator * \a fi. * - * The optional \a feedback object can be used to allow cancelation of bulk feature loading. Ownership + * The optional \a feedback object can be used to allow cancellation of bulk feature loading. Ownership * of \a feedback is not transferred, and callers must take care that the lifetime of feedback exceeds * that of the spatial index construction. */ diff --git a/src/core/qgsspatialindex.h b/src/core/qgsspatialindex.h index 12cb6fbb7a1..749bbe22353 100644 --- a/src/core/qgsspatialindex.h +++ b/src/core/qgsspatialindex.h @@ -87,7 +87,7 @@ class CORE_EXPORT QgsSpatialIndex : public QgsFeatureSink * Constructor - creates R-tree and bulk loads it with features from the iterator. * This is much faster approach than creating an empty index and then inserting features one by one. * - * The optional \a feedback object can be used to allow cancelation of bulk feature loading. Ownership + * The optional \a feedback object can be used to allow cancellation of bulk feature loading. Ownership * of \a feedback is not transferred, and callers must take care that the lifetime of feedback exceeds * that of the spatial index construction. * @@ -99,7 +99,7 @@ class CORE_EXPORT QgsSpatialIndex : public QgsFeatureSink * Constructor - creates R-tree and bulk loads it with features from the source. * This is much faster approach than creating an empty index and then inserting features one by one. * - * The optional \a feedback object can be used to allow cancelation of bulk feature loading. Ownership + * The optional \a feedback object can be used to allow cancellation of bulk feature loading. Ownership * of \a feedback is not transferred, and callers must take care that the lifetime of feedback exceeds * that of the spatial index construction. diff --git a/src/core/qgsspatialindexkdbush.h b/src/core/qgsspatialindexkdbush.h index 93621034618..ae68c5c5a3b 100644 --- a/src/core/qgsspatialindexkdbush.h +++ b/src/core/qgsspatialindexkdbush.h @@ -57,7 +57,7 @@ class CORE_EXPORT QgsSpatialIndexKDBush /** * Constructor - creates KDBush index and bulk loads it with features from the iterator. * - * The optional \a feedback object can be used to allow cancelation of bulk feature loading. Ownership + * The optional \a feedback object can be used to allow cancellation of bulk feature loading. Ownership * of \a feedback is not transferred, and callers must take care that the lifetime of feedback exceeds * that of the spatial index construction. * @@ -68,7 +68,7 @@ class CORE_EXPORT QgsSpatialIndexKDBush /** * Constructor - creates KDBush index and bulk loads it with features from the source. * - * The optional \a feedback object can be used to allow cancelation of bulk feature loading. Ownership + * The optional \a feedback object can be used to allow cancellation of bulk feature loading. Ownership * of \a feedback is not transferred, and callers must take care that the lifetime of feedback exceeds * that of the spatial index construction. * diff --git a/src/core/qgstaskmanager.h b/src/core/qgstaskmanager.h index 93dc47e60c5..09e80e2dbd5 100644 --- a/src/core/qgstaskmanager.h +++ b/src/core/qgstaskmanager.h @@ -340,7 +340,7 @@ class CORE_EXPORT QgsTask : public QObject void completed(); /** - * Called when the task has failed, as either a result of an internal failure or via cancelation. + * Called when the task has failed, as either a result of an internal failure or via cancellation. */ void terminated(); diff --git a/src/core/qgsvectorfilewriter.h b/src/core/qgsvectorfilewriter.h index 9c7f0f519b8..9b0e914a616 100644 --- a/src/core/qgsvectorfilewriter.h +++ b/src/core/qgsvectorfilewriter.h @@ -175,7 +175,7 @@ class CORE_EXPORT QgsVectorFileWriter : public QgsFeatureSink ErrProjection, ErrFeatureWriteFailed, ErrInvalidLayer, - Canceled, //!< Writing was interrupted by manual cancelation + Canceled, //!< Writing was interrupted by manual cancellation }; enum SymbologyExport @@ -504,7 +504,7 @@ class CORE_EXPORT QgsVectorFileWriter : public QgsFeatureSink */ QgsVectorFileWriter::FieldValueConverter *fieldValueConverter = nullptr; - //! Optional feedback object allowing cancelation of layer save + //! Optional feedback object allowing cancellation of layer save QgsFeedback *feedback = nullptr; }; diff --git a/src/core/qgsvectorlayerexporter.h b/src/core/qgsvectorlayerexporter.h index 656efff6a13..cce93a3829e 100644 --- a/src/core/qgsvectorlayerexporter.h +++ b/src/core/qgsvectorlayerexporter.h @@ -75,7 +75,7 @@ class CORE_EXPORT QgsVectorLayerExporter : public QgsFeatureSink * \param onlySelected set to true to export only selected features * \param errorMessage if non-null, will be set to any error messages * \param options optional provider dataset options - * \param feedback optional feedback object to show progress and cancelation of export + * \param feedback optional feedback object to show progress and cancellation of export * \returns NoError for a successful export, or encountered error */ static ExportError exportLayer( QgsVectorLayer *layer, diff --git a/src/core/qgsvectorlayerutils.h b/src/core/qgsvectorlayerutils.h index d7315b6fa48..ed9354a3200 100644 --- a/src/core/qgsvectorlayerutils.h +++ b/src/core/qgsvectorlayerutils.h @@ -118,7 +118,7 @@ class CORE_EXPORT QgsVectorLayerUtils * \param fieldOrExpression field name or an expression string * \param ok will be set to false if field or expression is invalid, otherwise true * \param selectedOnly set to true to get values from selected features only - * \param feedback optional feedback object to allow cancelation + * \param feedback optional feedback object to allow cancellation * \returns list of fetched values * \see getDoubleValues * \since QGIS 3.0 @@ -133,7 +133,7 @@ class CORE_EXPORT QgsVectorLayerUtils * \param ok will be set to false if field or expression is invalid, otherwise true * \param selectedOnly set to true to get values from selected features only * \param nullCount optional pointer to integer to store number of null values encountered in - * \param feedback optional feedback object to allow cancelation + * \param feedback optional feedback object to allow cancellation * \returns list of fetched values * \see getValues * \since QGIS 3.0 diff --git a/src/core/raster/qgsrasterdrawer.h b/src/core/raster/qgsrasterdrawer.h index 66ae3a7a793..c8e1c4eab98 100644 --- a/src/core/raster/qgsrasterdrawer.h +++ b/src/core/raster/qgsrasterdrawer.h @@ -44,7 +44,7 @@ class CORE_EXPORT QgsRasterDrawer * \param p destination QPainter * \param viewPort viewport to render * \param qgsMapToPixel map to pixel converter - * \param feedback optional raster feedback object for cancelation/preview. Added in QGIS 3.0. + * \param feedback optional raster feedback object for cancellation/preview. Added in QGIS 3.0. */ void draw( QPainter *p, QgsRasterViewPort *viewPort, const QgsMapToPixel *qgsMapToPixel, QgsRasterBlockFeedback *feedback = nullptr ); diff --git a/src/core/raster/qgsrasterinterface.h b/src/core/raster/qgsrasterinterface.h index d7036716fcb..346b616dfa3 100644 --- a/src/core/raster/qgsrasterinterface.h +++ b/src/core/raster/qgsrasterinterface.h @@ -233,7 +233,7 @@ class CORE_EXPORT QgsRasterInterface * \param extent extent of block * \param width pixel width of block * \param height pixel height of block - * \param feedback optional raster feedback object for cancelation/preview. Added in QGIS 3.0. + * \param feedback optional raster feedback object for cancellation/preview. Added in QGIS 3.0. */ virtual QgsRasterBlock *block( int bandNo, const QgsRectangle &extent, int width, int height, QgsRasterBlockFeedback *feedback = nullptr ) = 0 SIP_FACTORY; diff --git a/src/core/raster/qgsrasteriterator.h b/src/core/raster/qgsrasteriterator.h index b0eaf530ad9..56bf4f6ca7f 100644 --- a/src/core/raster/qgsrasteriterator.h +++ b/src/core/raster/qgsrasteriterator.h @@ -46,7 +46,7 @@ class CORE_EXPORT QgsRasterIterator * \param nCols number of columns * \param nRows number of rows * \param extent area to read - * \param feedback optional raster feedback object for cancelation/preview. Added in QGIS 3.0. + * \param feedback optional raster feedback object for cancellation/preview. Added in QGIS 3.0. */ void startRasterRead( int bandNumber, int nCols, int nRows, const QgsRectangle &extent, QgsRasterBlockFeedback *feedback = nullptr ); diff --git a/src/core/raster/qgsrasterlayerrenderer.h b/src/core/raster/qgsrasterlayerrenderer.h index eab1e544e2e..69f561bc2eb 100644 --- a/src/core/raster/qgsrasterlayerrenderer.h +++ b/src/core/raster/qgsrasterlayerrenderer.h @@ -84,7 +84,7 @@ class CORE_EXPORT QgsRasterLayerRenderer : public QgsMapLayerRenderer QgsRasterPipe *mPipe = nullptr; QgsRenderContext &mContext; - //! feedback class for cancelation and preview generation + //! feedback class for cancellation and preview generation QgsRasterLayerRendererFeedback *mFeedback = nullptr; friend class QgsRasterLayerRendererFeedback; diff --git a/src/core/raster/qgsrastertransparency.h b/src/core/raster/qgsrastertransparency.h index 1fed64a3ab0..d0f0667f420 100644 --- a/src/core/raster/qgsrastertransparency.h +++ b/src/core/raster/qgsrastertransparency.h @@ -116,7 +116,7 @@ class CORE_EXPORT QgsRasterTransparency * \param redValue the red portion of the needle to search for in the transparency hay stack * \param greenValue the green portion of the needle to search for in the transparency hay stack * \param blueValue the green portion of the needle to search for in the transparency hay stack - * \param globalTransparency the overal transparency level for the layer + * \param globalTransparency the overall transparency level for the layer */ int alphaValue( double redValue, double greenValue, double blueValue, int globalTransparency = 255 ) const; diff --git a/src/core/validity/qgsvaliditycheckregistry.h b/src/core/validity/qgsvaliditycheckregistry.h index 95b17c71a33..84281a9db3e 100644 --- a/src/core/validity/qgsvaliditycheckregistry.h +++ b/src/core/validity/qgsvaliditycheckregistry.h @@ -78,7 +78,7 @@ class CORE_EXPORT QgsValidityCheckRegistry * The \a context argument gives the wider in which the check is being run. * * The \a feedback argument is used to give progress reports and to support - * cancelation of long-running checks. + * cancellation of long-running checks. * * This is a blocking call, which will run all matching checks in the main * thread and only return when they have all completed. diff --git a/src/gui/qgscurveeditorwidget.h b/src/gui/qgscurveeditorwidget.h index 2521f7e2ac3..72a0da08db4 100644 --- a/src/gui/qgscurveeditorwidget.h +++ b/src/gui/qgscurveeditorwidget.h @@ -64,7 +64,7 @@ class QgsHistogramValuesGatherer: public QThread return; } - // allow responsive cancelation + // allow responsive cancellation mFeedback = new QgsFeedback(); mHistogram.setValues( mLayer, mExpression, mFeedback ); diff --git a/src/gui/qgsfieldvalueslineedit.cpp b/src/gui/qgsfieldvalueslineedit.cpp index b8104264a58..ab8b08b4725 100644 --- a/src/gui/qgsfieldvalueslineedit.cpp +++ b/src/gui/qgsfieldvalueslineedit.cpp @@ -145,7 +145,7 @@ void QgsFieldValuesLineEditValuesGatherer::run() return; } - // allow responsive cancelation + // allow responsive cancellation mFeedback = new QgsFeedback(); // just get 100 values... maybe less/more would be useful? mValues = mLayer->uniqueStringsMatching( mAttributeIndex, mSubstring, 100, mFeedback ); diff --git a/src/gui/qgsfiledownloaderdialog.h b/src/gui/qgsfiledownloaderdialog.h index 9eddddedb7f..5373f67288f 100644 --- a/src/gui/qgsfiledownloaderdialog.h +++ b/src/gui/qgsfiledownloaderdialog.h @@ -28,7 +28,7 @@ class QgsFileDownloader; * * Internally, it uses QgsFileDownloader to handle the download, * while showing progress via a progress dialog and supporting - * cancelation. + * cancellation. * * \note Until QGIS 3.0 this functionality was available via QgsFileDownloader. * diff --git a/src/gui/raster/qgspalettedrendererwidget.cpp b/src/gui/raster/qgspalettedrendererwidget.cpp index a23aaffeb13..48f6b20d926 100644 --- a/src/gui/raster/qgspalettedrendererwidget.cpp +++ b/src/gui/raster/qgspalettedrendererwidget.cpp @@ -807,7 +807,7 @@ void QgsPalettedRendererClassGatherer::run() { mWasCanceled = false; - // allow responsive cancelation + // allow responsive cancellation mFeedback = new QgsRasterBlockFeedback(); connect( mFeedback, &QgsRasterBlockFeedback::progressChanged, this, &QgsPalettedRendererClassGatherer::progressChanged ); diff --git a/src/providers/gdal/qgsgdalproviderbase.cpp b/src/providers/gdal/qgsgdalproviderbase.cpp index 4c435e2ed46..61da703b25e 100644 --- a/src/providers/gdal/qgsgdalproviderbase.cpp +++ b/src/providers/gdal/qgsgdalproviderbase.cpp @@ -281,10 +281,10 @@ CPLErr QgsGdalProviderBase::gdalRasterIO( GDALRasterBandH hBand, GDALRWFlag eRWF INIT_RASTERIO_EXTRA_ARG( extra ); if ( false && feedback ) // disabled! { - // Currently the cancelation is disabled... When RasterIO call is canceled, + // Currently the cancellation is disabled... When RasterIO call is canceled, // GDAL returns CE_Failure with error code = 0 (CPLE_None), however one would // expect to get CPLE_UserInterrupt to clearly identify that the failure was - // caused by the cancelation and not that something dodgy is going on. + // caused by the cancellation and not that something dodgy is going on. // Are both error codes acceptable? extra.pfnProgress = _gdalProgressFnWithFeedback; extra.pProgressData = ( void * ) feedback;