From b81d306047d85201b32e6773f6e84703e521ed9d Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Fri, 25 Oct 2019 21:51:21 +0200 Subject: [PATCH] spelling fixes (closes #32408) --- CMakeLists.txt | 2 +- NEWS | 108 +++++------ debian/copyright | 10 +- doc/news.html | 108 +++++------ doc/news.t2t | 86 ++++----- doc/qgsquick.dox | 2 +- .../layertree/qgslayertreemodel.sip.in | 2 +- .../qgslayertreeregistrybridge.sip.in | 2 +- .../layout/qgslayoutitemnodeitem.sip.in | 2 +- .../mesh/qgsmeshtimesettings.sip.in | 2 +- .../core/auto_generated/qgscredentials.sip.in | 2 +- .../core/auto_generated/qgsstringutils.sip.in | 2 +- .../gui/auto_generated/qgscolorwidgets.sip.in | 2 +- .../qgsexpressionbuilderwidget.sip.in | 2 +- .../auto_generated/qgsfieldcombobox.sip.in | 2 +- .../qgsfieldexpressionwidget.sip.in | 2 +- python/gui/auto_generated/qgsmapcanvas.sip.in | 2 +- .../auto_generated/qgsmaplayercombobox.sip.in | 2 +- .../qgsscalevisibilitydialog.sip.in | 2 +- .../symbology/qgssymbolselectordialog.sip.in | 2 +- .../db_manager/db_plugins/oracle/TODO.md | 2 +- .../db_manager/db_plugins/oracle/connector.py | 2 +- .../grass7/description/v.net.centrality.txt | 2 +- .../algs/otb/OtbAlgorithmProvider.py | 2 +- .../processing/algs/qgis/FieldsMapper.py | 4 +- .../algs/qgis/KNearestConcaveHull.py | 6 +- .../plugins/processing/algs/qgis/voronoi.py | 2 +- .../description/ModifedQuadraticShepard.txt | 12 -- python/plugins/processing/gui/TestTools.py | 2 +- .../processing/gui/wrappers_postgis.py | 2 +- python/plugins/processing/tools/vector.py | 2 +- .../auto_generated/qgsserverapiutils.sip.in | 2 +- qgis.dtd | 2 +- .../function_help/json/collect_geometries | 2 +- resources/function_help/json/make_line | 2 +- .../json/sqlite_fetch_and_increment | 2 +- resources/server/api/ogc/schema.json | 2 +- scripts/spell_check/.agignore | 8 +- scripts/spell_check/spelling.dat | 149 ++++++++++++++- scripts/tsstat.pl | 2 +- src/3d/qgs3dmapscene.cpp | 2 +- .../interpolation/CloughTocherInterpolator.h | 2 +- src/analysis/interpolation/MathUtils.h | 4 +- .../interpolation/NormVecDecorator.cpp | 4 +- src/analysis/raster/qgsrastercalculator.cpp | 2 +- src/app/decorations/qgsdecorationgrid.h | 2 +- src/app/dwg/qgsdwgimporter.cpp | 4 +- src/app/main.cpp | 2 +- src/app/qgsappbrowserproviders.h | 2 +- src/app/qgsmapsavedialog.cpp | 2 +- src/app/qgspluginregistry.cpp | 2 +- src/app/qgsprojectproperties.cpp | 2 +- src/app/qgsrasterlayerproperties.cpp | 4 +- src/app/qgsrelationmanagerdialog.cpp | 2 +- src/auth/oauth2/cmake/DownloadO2.cmake | 2 +- src/auth/oauth2/qgsauthoauth2method.cpp | 4 +- src/core/auth/qgsauthmanager.cpp | 2 +- .../qgsclassificationequalinterval.cpp | 2 +- src/core/diagram/qgstextdiagram.cpp | 2 +- src/core/expression/qgsexpressionnodeimpl.cpp | 2 +- src/core/geometry/qgsgeometrymakevalid.cpp | 2 +- src/core/geometry/qgsgeometryutils.cpp | 2 +- src/core/geometry/qgspoint.cpp | 2 +- src/core/gps/qgsqtlocationconnection.cpp | 2 +- src/core/layertree/qgslayertreemodel.h | 2 +- .../layertree/qgslayertreemodellegendnode.cpp | 4 +- .../layertree/qgslayertreeregistrybridge.h | 2 +- src/core/layout/qgslayoutitemnodeitem.h | 2 +- src/core/mesh/qgsmeshrenderersettings.h | 8 +- src/core/mesh/qgsmeshtimesettings.h | 2 +- src/core/providers/gdal/qgsgdalprovider.cpp | 4 +- .../meshmemory/qgsmeshmemorydataprovider.h | 4 +- src/core/providers/ogr/qgsogrprovider.cpp | 6 +- src/core/qgsclipper.h | 4 +- src/core/qgscolorramp.cpp | 2 +- src/core/qgscredentials.h | 2 +- src/core/qgsgmlschema.cpp | 2 +- src/core/qgslabelfeature.h | 2 +- src/core/qgsogcutils.cpp | 14 +- src/core/qgsproject.cpp | 2 +- src/core/qgsprojectproperty.cpp | 2 +- src/core/qgssqlexpressioncompiler.h | 2 +- src/core/qgsstringutils.h | 2 +- src/core/qgsvectorfilewriter.cpp | 2 +- src/core/qgsvectorlayercache.cpp | 2 +- src/core/raster/qgsmultibandcolorrenderer.cpp | 4 +- src/core/raster/qgsrasternuller.h | 4 +- src/core/raster/qgsrasterrenderer.cpp | 2 +- src/core/raster/qgsrastertransparency.h | 2 +- src/core/raster/qgssinglebandgrayrenderer.cpp | 5 +- src/core/symbology/qgsarrowsymbollayer.cpp | 8 +- src/core/symbology/qgssymbol.cpp | 2 +- src/core/symbology/qgssymbollayerutils.cpp | 4 +- src/gui/auth/qgsauthconfigedit.cpp | 2 +- .../core/qgseditorwidgetwrapper.cpp | 2 +- src/gui/editorwidgets/qgsdatetimeedit.cpp | 2 +- .../layout/qgslayoutviewtooladdnodeitem.cpp | 2 +- src/gui/qgscolorwidgets.h | 2 +- src/gui/qgsexpressionbuilderwidget.h | 2 +- src/gui/qgsfieldcombobox.h | 2 +- src/gui/qgsfieldexpressionwidget.h | 2 +- src/gui/qgsmapcanvas.h | 2 +- src/gui/qgsmaplayercombobox.h | 2 +- src/gui/qgsprojectionselectiontreewidget.cpp | 2 +- src/gui/qgsscalevisibilitydialog.h | 2 +- src/gui/symbology/qgssymbolselectordialog.h | 2 +- .../evisdatabaselayerfieldselectiongui.cpp | 2 +- .../georeferencer/qgsgeorefplugingui.cpp | 4 +- src/plugins/georeferencer/qgsimagewarper.cpp | 2 +- .../CMakeModules/OsgEarthMacroUtils.cmake | 2 +- src/plugins/grass/qgsgrassmapcalc.cpp | 2 +- src/plugins/grass/qgsgrassmapcalc.h | 2 +- src/plugins/grass/qgsgrassmoduleinput.cpp | 2 +- src/plugins/grass/qgsgrassmoduleparam.h | 2 +- src/plugins/grass/qtermwidget/History.cpp | 2 +- src/plugins/grass/qtermwidget/Screen.cpp | 2 +- .../grass/scripts/v.class.mlpy.qgis.py | 2 +- .../grass/qgsgrassfeatureiterator.cpp | 4 +- src/providers/grass/qgsgrassgislib.cpp | 4 +- src/providers/grass/qgsgrassgislib.h | 4 +- src/providers/grass/qgsgrassprovider.cpp | 8 +- src/providers/oracle/qgsoracleprovider.h | 2 +- .../postgres/qgspostgresprovider.cpp | 2 +- src/providers/wcs/qgswcsprovider.cpp | 4 +- .../qgsbackgroundcachedfeatureiterator.cpp | 2 +- src/providers/wfs/qgsbasenetworkrequest.cpp | 2 +- src/providers/wfs/qgswfscapabilities.cpp | 8 +- src/providers/wfs/qgswfsfeatureiterator.cpp | 2 +- src/providers/wfs/qgswfsfeatureiterator.h | 2 +- src/providers/wfs/qgswfsprovider.cpp | 2 +- src/providers/wfs/qgswfsshareddata.cpp | 2 +- src/quickgui/plugin/ios/qmldir | 2 +- src/quickgui/plugin/qmldir | 2 +- src/quickgui/qgsquickfeaturehighlight.h | 2 +- src/quickgui/qgsquickmaptransform.h | 2 +- src/quickgui/qgsquickscalebarkit.h | 2 +- src/quickgui/qgsquickutils.h | 2 +- src/server/qgsserverapiutils.h | 2 +- src/server/services/wfs3/openapi.json | 6 +- tests/bench/README | 2 +- tests/code_layout/CMakeLists.txt | 2 +- tests/src/analysis/testqgsprocessing.cpp | 4 +- tests/src/core/testqgsexpression.cpp | 4 +- tests/src/core/testqgsexpressioncontext.cpp | 2 +- tests/src/core/testqgsgeometry.cpp | 2 +- tests/src/core/testqgslabelingengine.cpp | 2 +- tests/src/core/testqgslayout.cpp | 2 +- tests/src/core/testqgstranslateproject.cpp | 4 +- .../gui/testqgsvaluerelationwidgetwrapper.cpp | 170 +++++++++--------- tests/src/python/offlineditingtestbase.py | 2 +- .../python/test_authmanager_pki_postgres.py | 2 +- tests/src/python/test_db_manager_postgis.py | 2 +- tests/src/python/test_layer_dependencies.py | 2 +- tests/src/python/test_provider_shapefile.py | 2 +- tests/src/python/test_qgsdistancearea.py | 2 +- tests/src/python/test_qgsellipsoidutils.py | 2 +- tests/src/python/test_qgspallabeling_tests.py | 8 +- tests/src/python/test_qgsstringutils.py | 2 +- .../src/python/test_qgssymbollayer_readsld.py | 2 +- .../testdata/font/QGIS-Vera/RELEASENOTES.TXT | 2 +- .../api/test_wfs3_api_project.json | 2 +- 161 files changed, 596 insertions(+), 460 deletions(-) delete mode 100644 python/plugins/processing/algs/saga/description/ModifedQuadraticShepard.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 4490b07f2b3..9c88c24a06a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,7 @@ IF (USE_OPENCL) FIND_PACKAGE(OpenCL) IF(${OpenCL_FOUND}) SET(HAVE_OPENCL TRUE) - # Fixup for standard FindOpenCL module not assinging proper framework headers directory + # Fixup for standard FindOpenCL module not assigning proper framework headers directory IF (APPLE AND "${OpenCL_INCLUDE_DIR}" MATCHES "OpenCL\\.framework/?$") SET(OpenCL_INCLUDE_DIR "${OpenCL_INCLUDE_DIR}/Headers" CACHE PATH "" FORCE) SET(OpenCL_INCLUDE_DIRS ${OpenCL_INCLUDE_DIR}) diff --git a/NEWS b/NEWS index f22a96a5f92..384641ac5ac 100644 --- a/NEWS +++ b/NEWS @@ -20,17 +20,17 @@ Friday October 25, 2019 12. What's new in Version 2.8 'Wien'? 13. What's new in Version 2.6.0 'Brighton'? 14. What's new in Version 2.4.0 'Chugiak'? - 15. Whats new in Version 2.2.0 'Valmiera'? - 16. Whats new in Version 2.0.1 'Dufour'? - 17. Whats new in Version 2.0.0 'Dufour'? - 18. Whats new in Version 1.8.0 'Lisboa'? - 19. Whats new in Version 1.7.2 'Wroclaw'? - 20. Whats new in Version 1.7.1 'Wroclaw'? - 21. Whats new in Version 1.7.0 'Wroclaw'? - 22. Whats new in Version 1.6.0 'Capiapo'? - 23. Whats new in Version 1.5.0? - 24. Whats new in Version 1.4.0 'Enceladus'? - 25. Whats new in Version 1.3.0 'Mimas'? + 15. What's new in Version 2.2.0 'Valmiera'? + 16. What's new in Version 2.0.1 'Dufour'? + 17. What's new in Version 2.0.0 'Dufour'? + 18. What's new in Version 1.8.0 'Lisboa'? + 19. What's new in Version 1.7.2 'Wroclaw'? + 20. What's new in Version 1.7.1 'Wroclaw'? + 21. What's new in Version 1.7.0 'Wroclaw'? + 22. What's new in Version 1.6.0 'Capiapo'? + 23. What's new in Version 1.5.0? + 24. What's new in Version 1.4.0 'Enceladus'? + 25. What's new in Version 1.3.0 'Mimas'? 26. Version 1.2.0 'Daphnis' 27. Version 1.0.0 'Kore' 28. Version 0.11.0 'Metis' @@ -61,16 +61,16 @@ This release has following new features: - Symbology: Improved copy/paste of symbols - Symbology: "Center of segment" placement mode for marker and hash line symbol layers - Symbology: Allow array values as a valid result for data defined offset -- Labelling: Allow creation and editing of text formats and label settings through style manager dialog -- Labelling: New text "background" setting for marker symbol backgrounds -- Labelling: Callouts support -- Labelling: Add multiline alignment property to the change label tool -- Labelling: Allow display of unplaced labels -- Labelling: Add "overrun distance" setting for line labels -- Labelling: Allow data defined control over "label every part of multipart features" setting -- Labelling: Expose "label all parts" option via label properties tool -- Labelling: Support vertical text orientation -- Labelling: Expose font kerning setting +- Labeling: Allow creation and editing of text formats and label settings through style manager dialog +- Labeling: New text "background" setting for marker symbol backgrounds +- Labeling: Callouts support +- Labeling: Add multiline alignment property to the change label tool +- Labeling: Allow display of unplaced labels +- Labeling: Add "overrun distance" setting for line labels +- Labeling: Allow data defined control over "label every part of multipart features" setting +- Labeling: Expose "label all parts" option via label properties tool +- Labeling: Support vertical text orientation +- Labeling: Expose font kerning setting - Rendering: Allow rendering raster layers outside the reported extent - Rendering: Add option to georeference PDFs and TIFs to save map canvas as image/PDF - Rendering: new map canvas image decoration @@ -92,7 +92,7 @@ This release has following new features: - Print Layouts: "fit segment size" mode for map grid interval - Print Layouts: layout map item extent to an existing bookmark - Expressions: New expression functions -- Digitising: GPS timestamp support +- Digitizing: GPS timestamp support - Data Management: Composite Foreign Keys - Data Management: Add circular data dependencies - Analysis Tools: Stored filter expressions @@ -141,8 +141,8 @@ This release has following new features: - Symbology: Allow strings for font markers - Symbology: Offset setting for point pattern fill symbol layer - Symbology: Average line angles for marker and hashed line -- Digitising: Floating widget for advanced input next to cursor -- Digitising: Chanied add vertex at endpoint +- Digitizing: Floating widget for advanced input next to cursor +- Digitizing: Chanied add vertex at endpoint - Forms and Widgets: Allow browsing feature list - Analysis Tools: New aggregate method: concatenate_unique - Processing: Add "Save layer styles into GeoPackage" option for Package Layers algorithm @@ -183,8 +183,8 @@ This release has following new features: - Symbology: Option to merge categories in categorized renderer - Symbology: Show Project Colors in color bound data defined buttons - Symbology: Style manager dialog improvements -- Digitising: Georeferencer enhancements -- Digitising: New option to avoid minimizing georeferencer when adding points +- Digitizing: Georeferencer enhancements +- Digitizing: New option to avoid minimizing georeferencer when adding points - Data Management: Comment option in db manager - Forms and Widgets: New form widget for binary (blob) fields - Map Composer: Grid frame improvements @@ -259,14 +259,14 @@ This release has following new features: - User Interface: QML chart and drawings widget - Symbology: Mesh layer styling - Symbology: Classify symmetric in graduated renderer -- Digitising: GPS tracking improvements -- Digitising: More angle choices in advanced digitizing dock -- Digitising: Vertex tool can work on the current layer only -- Digitising: Add reverse line maptools -- Digitising: Geometry Precision -- Digitising: Automatically remove duplicate nodes -- Digitising: Check for geometry validity -- Digitising: Topology checks while editing +- Digitizing: GPS tracking improvements +- Digitizing: More angle choices in advanced digitizing dock +- Digitizing: Vertex tool can work on the current layer only +- Digitizing: Add reverse line maptools +- Digitizing: Geometry Precision +- Digitizing: Automatically remove duplicate nodes +- Digitizing: Check for geometry validity +- Digitizing: Topology checks while editing - Data Management: Translation of QGIS projects - Data Management: Switch Attribute Table dock mode on demand - Data Management: New locator filter to search across all layers @@ -289,7 +289,7 @@ This release has following new features: - Processing: Line substring algorithm - Processing: "Interpolate point on line" algorithm - Processing: k-neighbour concave hull -- Processing: Python scripts which implement algorithms now execute the algorithm on drag and drop and browser double click +- Processing: Python scripts which implement algorithms now execute the algorithm on drag and drop and browser double-click - Processing: New GDAL's rearrange band algorithm - Processing: "Precalculated" values for model algorithm parameters - Processing: "Categorize a layer using a style XML file" algorithm @@ -299,7 +299,7 @@ This release has following new features: - Data Providers: OAuth2 authentication method plugin - Data Providers: Mesh layer: New mesh layer format support - Data Providers: Mesh layer: add function to identify value on mesh layers -- Data Providers: Mesh layer: allow to choose different vector and scalar dataset +- Data Providers: Mesh layer: allow choosing different vector and scalar dataset - Data Providers: Mesh layer: allow render vectors/arrows on the user-defined grid - Data Providers: JSON/JSONB Type support - Data Providers: ESRI Token Authentication support @@ -956,7 +956,7 @@ This is the minor release sports a number of great new features: - New Inverted Polygon renderer - 15. Whats new in Version 2.2.0 'Valmiera'? + 15. What's new in Version 2.2.0 'Valmiera'? ========================================== This is the minor release sports a number of great new features: @@ -997,7 +997,7 @@ This is the minor release sports a number of great new features: - 'Processing' can be used headless in scripts. - 16. Whats new in Version 2.0.1 'Dufour'? + 16. What's new in Version 2.0.1 'Dufour'? ======================================== This is a small bugfix release to address the missing copyright / credits for @@ -1005,7 +1005,7 @@ our new splash screen and to update supporting documentation. The spanish translation was also updated. - 17. Whats new in Version 2.0.0 'Dufour'? + 17. What's new in Version 2.0.0 'Dufour'? ======================================== This is a new major release. Building on the foundation of @@ -1091,7 +1091,7 @@ key new features. you to explore the software and discover them all! - 18. Whats new in Version 1.8.0 'Lisboa'? + 18. What's new in Version 1.8.0 'Lisboa'? ======================================== This is a new feature release. Building on the foundation of @@ -1116,7 +1116,7 @@ key new features. - New scale selector with predefined scales - Option to add layers to selected or active group - Pan To Selected tool -- New tools in Vector menu - densify geoemtries, Build spatial index +- New tools in Vector menu - densify geometries, Build spatial index - Export/add geometry column tool can export info using layer CRS, project CRS or ellipsoidal measurements - Model/view based tree for rules in rule-based renderer - Updated CRS selector dialog @@ -1146,7 +1146,7 @@ added gdal_fillnodata to GDALTools plugin - Support for nesting projects within other projects - 19. Whats new in Version 1.7.2 'Wroclaw'? + 19. What's new in Version 1.7.2 'Wroclaw'? ========================================= This is a bugfix release over version 1.7.1. The following changes @@ -1193,7 +1193,7 @@ were made. - Fix broken Assign projection functionality in GDALTools and improve handling output file extension - 20. Whats new in Version 1.7.1 'Wroclaw'? + 20. What's new in Version 1.7.1 'Wroclaw'? ========================================= This is a bugfix release over version 1.7.0. The following changes @@ -1256,7 +1256,7 @@ http://linfiniti.com/2011/08/improvements-to-raster-performance-in-qgis-master/] - Fixed a bug where map= was not being published in onlineresource url when project files are not in the same dir as cgi - 21. Whats new in Version 1.7.0 'Wroclaw'? + 21. What's new in Version 1.7.0 'Wroclaw'? ========================================= This release is named after the town of Wroclaw in Poland. The Department of @@ -1390,7 +1390,7 @@ changed so we will just provide a bullet list of key new features here. - Undo/Redo support for the print composer - 22. Whats new in Version 1.6.0 'Capiapo'? + 22. What's new in Version 1.6.0 'Capiapo'? ========================================= Please note that this is a release in our 'cutting edge' release series. As @@ -1483,7 +1483,7 @@ position dialog. - Sorting for composer attribute table (several columns and ascending / descending). - 23. Whats new in Version 1.5.0? + 23. What's new in Version 1.5.0? =============================== Please note that this is a release in our 'cutting edge' release series. As @@ -1583,7 +1583,7 @@ variables. More paths can be passed, separated by semicolon. - Support more GEOS operators - 24. Whats new in Version 1.4.0 'Enceladus'? + 24. What's new in Version 1.4.0 'Enceladus'? =========================================== Please note that this is a release in our 'cutting edge' release series. As @@ -1641,7 +1641,7 @@ For power users, you can now create customizable attribute forms using Qt Designer dialog UIs. - 25. Whats new in Version 1.3.0 'Mimas'? + 25. What's new in Version 1.3.0 'Mimas'? ======================================= This release includes over 30 bug fixes and several useful new features: @@ -2471,7 +2471,7 @@ Added setZOrder which will be used in next commit to fix projection zorder probl 2004-06-20 [ts] 0.3.0devel43 -Fix anoying 'mapcanvas isn't freezing while loading rasters' bug +Fix annoying 'mapcanvas isn't freezing while loading rasters' bug 2004-06-19 [ts] 0.3.0devel42 @@ -2591,7 +2591,7 @@ Added "Show in overview" option to vector popup menu. Removed overview stuff from debug only version of qgisapp. -Did plumbing for enableing disabling layers in overview from popup context menu. +Did plumbing for enabling disabling layers in overview from popup context menu. Whoopdeedooo. :-) @@ -2789,7 +2789,7 @@ Added URL parsing and attribute fields for route and track GPX layers 2004-05-17 [ts] 0.2.0devel22 Added support to Save As Image to save in any QImageIO supported format. File->SaveAsImage dialog filter list now generated automagically by -interrogating QImageIO for its supportted formats. File->SaveAsImage remembers +interrogating QImageIO for its supported formats. File->SaveAsImage remembers last dir used (stored in qsettings). Its supposed to remember last filter used but there is an issue with that that needs to be resolved. @@ -3096,7 +3096,7 @@ started moving splashscreen to a global so other classes diring the startup Refactored QgsField to use new coding conventions Documented QgsField (added docs to qgsfield.h) Updated doxygen mainpage section in qgis.h -Added Whats this? help to main application window +Added What's this? help to main application window Added providers/delimitedtext and associated source files to CVS 2004-02-27 [gs] 0.1.0devel4 @@ -3208,7 +3208,7 @@ Version 0.0.8-alpha December 11, 2002 has changed *Changes to layer properites aren't effective until the Layer Properties dialog is closed -*Canceling the Layer Propeties dialog cancels changes +*Canceling the Layer Properties dialog cancels changes Version 0.0.7-alpha November 30, 2002 *Changes to the build system to allow building with/without PostgeSQL @@ -3235,7 +3235,7 @@ Version 0.0.5-alpha October 5, 2002 * Zoom out now works * Zoom Previous added to toolbar * Toolbar has been rearranged and new icons added - * Help|About QGis now contains Version, Whats New, and License information + * Help|About QGis now contains Version, What's New, and License information Version 0.0.4-alpha August 15, 2002 * Added Layer Properties dialog diff --git a/debian/copyright b/debian/copyright index 89eb6f9662e..fb9f4617c8d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -184,7 +184,7 @@ Comment: Reed-Solomon codec A condition of such distribution is that the author's contribution be acknowledged by his name being left in the comments heading the program, however no responsibility is accepted for any financial or other loss which - may result from some unforseen errors or malfunctioning of the program + may result from some unforeseen errors or malfunctioning of the program during use. Simon Rockliff, 26th June 1991 License: GPL-2+ @@ -1036,7 +1036,7 @@ License: CC-BY-3.0 be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a - moving image ("synching") will be considered an Adaptation for the + moving image ("syncing") will be considered an Adaptation for the purpose of this License. . b. "Collection" means a collection of literary or artistic works, such @@ -1237,7 +1237,7 @@ License: CC-BY-3.0 UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, - INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, + INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE @@ -1373,7 +1373,7 @@ License: CC-BY-SA-3.0 be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a - moving image ("synching") will be considered an Adaptation for the + moving image ("syncing") will be considered an Adaptation for the purpose of this License. . b. "Collection" means a collection of literary or artistic works, such @@ -1616,7 +1616,7 @@ License: CC-BY-SA-3.0 UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, - INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, + INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE diff --git a/doc/news.html b/doc/news.html index a5c0b20a56e..58ad69f3252 100644 --- a/doc/news.html +++ b/doc/news.html @@ -97,17 +97,17 @@ label{ background-color: #FFFFCC;
  • What's new in Version 2.8 'Wien'?
  • What's new in Version 2.6.0 'Brighton'?
  • What's new in Version 2.4.0 'Chugiak'? -
  • Whats new in Version 2.2.0 'Valmiera'? -
  • Whats new in Version 2.0.1 'Dufour'? -
  • Whats new in Version 2.0.0 'Dufour'? -
  • Whats new in Version 1.8.0 'Lisboa'? -
  • Whats new in Version 1.7.2 'Wroclaw'? -
  • Whats new in Version 1.7.1 'Wroclaw'? -
  • Whats new in Version 1.7.0 'Wroclaw'? -
  • Whats new in Version 1.6.0 'Capiapo'? -
  • Whats new in Version 1.5.0? -
  • Whats new in Version 1.4.0 'Enceladus'? -
  • Whats new in Version 1.3.0 'Mimas'? +
  • What's new in Version 2.2.0 'Valmiera'? +
  • What's new in Version 2.0.1 'Dufour'? +
  • What's new in Version 2.0.0 'Dufour'? +
  • What's new in Version 1.8.0 'Lisboa'? +
  • What's new in Version 1.7.2 'Wroclaw'? +
  • What's new in Version 1.7.1 'Wroclaw'? +
  • What's new in Version 1.7.0 'Wroclaw'? +
  • What's new in Version 1.6.0 'Capiapo'? +
  • What's new in Version 1.5.0? +
  • What's new in Version 1.4.0 'Enceladus'? +
  • What's new in Version 1.3.0 'Mimas'?
  • Version 1.2.0 'Daphnis'
  • Version 1.0.0 'Kore'
  • Version 0.11.0 'Metis' @@ -141,16 +141,16 @@ This release has following new features:
  • Symbology: Improved copy/paste of symbols
  • Symbology: "Center of segment" placement mode for marker and hash line symbol layers
  • Symbology: Allow array values as a valid result for data defined offset -
  • Labelling: Allow creation and editing of text formats and label settings through style manager dialog -
  • Labelling: New text "background" setting for marker symbol backgrounds -
  • Labelling: Callouts support -
  • Labelling: Add multiline alignment property to the change label tool -
  • Labelling: Allow display of unplaced labels -
  • Labelling: Add "overrun distance" setting for line labels -
  • Labelling: Allow data defined control over "label every part of multipart features" setting -
  • Labelling: Expose "label all parts" option via label properties tool -
  • Labelling: Support vertical text orientation -
  • Labelling: Expose font kerning setting +
  • Labeling: Allow creation and editing of text formats and label settings through style manager dialog +
  • Labeling: New text "background" setting for marker symbol backgrounds +
  • Labeling: Callouts support +
  • Labeling: Add multiline alignment property to the change label tool +
  • Labeling: Allow display of unplaced labels +
  • Labeling: Add "overrun distance" setting for line labels +
  • Labeling: Allow data defined control over "label every part of multipart features" setting +
  • Labeling: Expose "label all parts" option via label properties tool +
  • Labeling: Support vertical text orientation +
  • Labeling: Expose font kerning setting
  • Rendering: Allow rendering raster layers outside the reported extent
  • Rendering: Add option to georeference PDFs and TIFs to save map canvas as image/PDF
  • Rendering: new map canvas image decoration @@ -172,7 +172,7 @@ This release has following new features:
  • Print Layouts: "fit segment size" mode for map grid interval
  • Print Layouts: layout map item extent to an existing bookmark
  • Expressions: New expression functions -
  • Digitising: GPS timestamp support +
  • Digitizing: GPS timestamp support
  • Data Management: Composite Foreign Keys
  • Data Management: Add circular data dependencies
  • Analysis Tools: Stored filter expressions @@ -224,8 +224,8 @@ This release has following new features:
  • Symbology: Allow strings for font markers
  • Symbology: Offset setting for point pattern fill symbol layer
  • Symbology: Average line angles for marker and hashed line -
  • Digitising: Floating widget for advanced input next to cursor -
  • Digitising: Chanied add vertex at endpoint +
  • Digitizing: Floating widget for advanced input next to cursor +
  • Digitizing: Chanied add vertex at endpoint
  • Forms and Widgets: Allow browsing feature list
  • Analysis Tools: New aggregate method: concatenate_unique
  • Processing: Add "Save layer styles into GeoPackage" option for Package Layers algorithm @@ -269,8 +269,8 @@ This release has following new features:
  • Symbology: Option to merge categories in categorized renderer
  • Symbology: Show Project Colors in color bound data defined buttons
  • Symbology: Style manager dialog improvements -
  • Digitising: Georeferencer enhancements -
  • Digitising: New option to avoid minimizing georeferencer when adding points +
  • Digitizing: Georeferencer enhancements +
  • Digitizing: New option to avoid minimizing georeferencer when adding points
  • Data Management: Comment option in db manager
  • Forms and Widgets: New form widget for binary (blob) fields
  • Map Composer: Grid frame improvements @@ -348,14 +348,14 @@ This release has following new features:
  • User Interface: QML chart and drawings widget
  • Symbology: Mesh layer styling
  • Symbology: Classify symmetric in graduated renderer -
  • Digitising: GPS tracking improvements -
  • Digitising: More angle choices in advanced digitizing dock -
  • Digitising: Vertex tool can work on the current layer only -
  • Digitising: Add reverse line maptools -
  • Digitising: Geometry Precision -
  • Digitising: Automatically remove duplicate nodes -
  • Digitising: Check for geometry validity -
  • Digitising: Topology checks while editing +
  • Digitizing: GPS tracking improvements +
  • Digitizing: More angle choices in advanced digitizing dock +
  • Digitizing: Vertex tool can work on the current layer only +
  • Digitizing: Add reverse line maptools +
  • Digitizing: Geometry Precision +
  • Digitizing: Automatically remove duplicate nodes +
  • Digitizing: Check for geometry validity +
  • Digitizing: Topology checks while editing
  • Data Management: Translation of QGIS projects
  • Data Management: Switch Attribute Table dock mode on demand
  • Data Management: New locator filter to search across all layers @@ -378,7 +378,7 @@ This release has following new features:
  • Processing: Line substring algorithm
  • Processing: "Interpolate point on line" algorithm
  • Processing: k-neighbour concave hull -
  • Processing: Python scripts which implement algorithms now execute the algorithm on drag and drop and browser double click +
  • Processing: Python scripts which implement algorithms now execute the algorithm on drag and drop and browser double-click
  • Processing: New GDAL's rearrange band algorithm
  • Processing: "Precalculated" values for model algorithm parameters
  • Processing: "Categorize a layer using a style XML file" algorithm @@ -388,7 +388,7 @@ This release has following new features:
  • Data Providers: OAuth2 authentication method plugin
  • Data Providers: Mesh layer: New mesh layer format support
  • Data Providers: Mesh layer: add function to identify value on mesh layers -
  • Data Providers: Mesh layer: allow to choose different vector and scalar dataset +
  • Data Providers: Mesh layer: allow choosing different vector and scalar dataset
  • Data Providers: Mesh layer: allow render vectors/arrows on the user-defined grid
  • Data Providers: JSON/JSONB Type support
  • Data Providers: ESRI Token Authentication support @@ -1076,7 +1076,7 @@ This is the minor release sports a number of great new features: -

    15. Whats new in Version 2.2.0 'Valmiera'?

    +

    15. What's new in Version 2.2.0 'Valmiera'?

    This is the minor release sports a number of great new features: @@ -1120,7 +1120,7 @@ This is the minor release sports a number of great new features: -

    16. Whats new in Version 2.0.1 'Dufour'?

    +

    16. What's new in Version 2.0.1 'Dufour'?

    This is a small bugfix release to address the missing copyright / credits for @@ -1129,7 +1129,7 @@ translation was also updated.

    -

    17. Whats new in Version 2.0.0 'Dufour'?

    +

    17. What's new in Version 2.0.0 'Dufour'?

    This is a new major release. Building on the foundation of @@ -1218,7 +1218,7 @@ key new features. -

    18. Whats new in Version 1.8.0 'Lisboa'?

    +

    18. What's new in Version 1.8.0 'Lisboa'?

    This is a new feature release. Building on the foundation of @@ -1245,7 +1245,7 @@ key new features.

  • New scale selector with predefined scales
  • Option to add layers to selected or active group
  • Pan To Selected tool -
  • New tools in Vector menu - densify geoemtries, Build spatial index +
  • New tools in Vector menu - densify geometries, Build spatial index
  • Export/add geometry column tool can export info using layer CRS, project CRS or ellipsoidal measurements
  • Model/view based tree for rules in rule-based renderer
  • Updated CRS selector dialog @@ -1276,7 +1276,7 @@ added gdal_fillnodata to GDALTools plugin -

    19. Whats new in Version 1.7.2 'Wroclaw'?

    +

    19. What's new in Version 1.7.2 'Wroclaw'?

    This is a bugfix release over version 1.7.1. The following changes @@ -1326,7 +1326,7 @@ were made. -

    20. Whats new in Version 1.7.1 'Wroclaw'?

    +

    20. What's new in Version 1.7.1 'Wroclaw'?

    This is a bugfix release over version 1.7.0. The following changes @@ -1392,7 +1392,7 @@ were made. -

    21. Whats new in Version 1.7.0 'Wroclaw'?

    +

    21. What's new in Version 1.7.0 'Wroclaw'?

    This release is named after the town of Wroclaw in Poland. The Department of @@ -1534,7 +1534,7 @@ changed so we will just provide a bullet list of key new features here. -

    22. Whats new in Version 1.6.0 'Capiapo'?

    +

    22. What's new in Version 1.6.0 'Capiapo'?

    Please note that this is a release in our 'cutting edge' release series. As @@ -1629,7 +1629,7 @@ position dialog. -

    23. Whats new in Version 1.5.0?

    +

    23. What's new in Version 1.5.0?

    Please note that this is a release in our 'cutting edge' release series. As @@ -1731,7 +1731,7 @@ variables. More paths can be passed, separated by semicolon. -

    24. Whats new in Version 1.4.0 'Enceladus'?

    +

    24. What's new in Version 1.4.0 'Enceladus'?

    Please note that this is a release in our 'cutting edge' release series. As @@ -1799,7 +1799,7 @@ Designer dialog UIs.

    -

    25. Whats new in Version 1.3.0 'Mimas'?

    +

    25. What's new in Version 1.3.0 'Mimas'?

    This release includes over 30 bug fixes and several useful new features: @@ -2665,7 +2665,7 @@ Added setZOrder which will be used in next commit to fix projection zorder probl

    2004-06-20 [ts] 0.3.0devel43

    -Fix anoying 'mapcanvas isn't freezing while loading rasters' bug +Fix annoying 'mapcanvas isn't freezing while loading rasters' bug

    2004-06-19 [ts] 0.3.0devel42

    @@ -2813,7 +2813,7 @@ Added "Show in overview" option to vector popup menu. Removed overview stuff from debug only version of qgisapp.

    -Did plumbing for enableing disabling layers in overview from popup context menu. +Did plumbing for enabling disabling layers in overview from popup context menu.

    Whoopdeedooo. :-) @@ -3061,7 +3061,7 @@ Added URL parsing and attribute fields for route and track GPX layers 2004-05-17 [ts] 0.2.0devel22 Added support to Save As Image to save in any QImageIO supported format. File->SaveAsImage dialog filter list now generated automagically by -interrogating QImageIO for its supportted formats. File->SaveAsImage remembers +interrogating QImageIO for its supported formats. File->SaveAsImage remembers last dir used (stored in qsettings). Its supposed to remember last filter used but there is an issue with that that needs to be resolved.

    @@ -3446,7 +3446,7 @@ started moving splashscreen to a global so other classes diring the startup Refactored QgsField to use new coding conventions Documented QgsField (added docs to qgsfield.h) Updated doxygen mainpage section in qgis.h -Added Whats this? help to main application window +Added What's this? help to main application window Added providers/delimitedtext and associated source files to CVS

    2004-02-27 [gs] 0.1.0devel4 @@ -3566,7 +3566,7 @@ Version 0.0.8-alpha December 11, 2002 has changed *Changes to layer properites aren't effective until the Layer Properties dialog is closed -*Canceling the Layer Propeties dialog cancels changes +*Canceling the Layer Properties dialog cancels changes

    Version 0.0.7-alpha November 30, 2002 @@ -3597,7 +3597,7 @@ Version 0.0.5-alpha October 5, 2002 * Zoom out now works * Zoom Previous added to toolbar * Toolbar has been rearranged and new icons added - * Help|About QGis now contains Version, Whats New, and License information + * Help|About QGis now contains Version, What's New, and License information

    Version 0.0.4-alpha August 15, 2002 diff --git a/doc/news.t2t b/doc/news.t2t index f242a30bf69..5b4e4d5cde9 100644 --- a/doc/news.t2t +++ b/doc/news.t2t @@ -48,16 +48,16 @@ This release has following new features: - Symbology: Improved copy/paste of symbols - Symbology: "Center of segment" placement mode for marker and hash line symbol layers - Symbology: Allow array values as a valid result for data defined offset -- Labelling: Allow creation and editing of text formats and label settings through style manager dialog -- Labelling: New text "background" setting for marker symbol backgrounds -- Labelling: Callouts support -- Labelling: Add multiline alignment property to the change label tool -- Labelling: Allow display of unplaced labels -- Labelling: Add "overrun distance" setting for line labels -- Labelling: Allow data defined control over "label every part of multipart features" setting -- Labelling: Expose "label all parts" option via label properties tool -- Labelling: Support vertical text orientation -- Labelling: Expose font kerning setting +- Labeling: Allow creation and editing of text formats and label settings through style manager dialog +- Labeling: New text "background" setting for marker symbol backgrounds +- Labeling: Callouts support +- Labeling: Add multiline alignment property to the change label tool +- Labeling: Allow display of unplaced labels +- Labeling: Add "overrun distance" setting for line labels +- Labeling: Allow data defined control over "label every part of multipart features" setting +- Labeling: Expose "label all parts" option via label properties tool +- Labeling: Support vertical text orientation +- Labeling: Expose font kerning setting - Rendering: Allow rendering raster layers outside the reported extent - Rendering: Add option to georeference PDFs and TIFs to save map canvas as image/PDF - Rendering: new map canvas image decoration @@ -79,7 +79,7 @@ This release has following new features: - Print Layouts: "fit segment size" mode for map grid interval - Print Layouts: layout map item extent to an existing bookmark - Expressions: New expression functions -- Digitising: GPS timestamp support +- Digitizing: GPS timestamp support - Data Management: Composite Foreign Keys - Data Management: Add circular data dependencies - Analysis Tools: Stored filter expressions @@ -128,8 +128,8 @@ This release has following new features: - Symbology: Allow strings for font markers - Symbology: Offset setting for point pattern fill symbol layer - Symbology: Average line angles for marker and hashed line -- Digitising: Floating widget for advanced input next to cursor -- Digitising: Chanied add vertex at endpoint +- Digitizing: Floating widget for advanced input next to cursor +- Digitizing: Chanied add vertex at endpoint - Forms and Widgets: Allow browsing feature list - Analysis Tools: New aggregate method: concatenate_unique - Processing: Add "Save layer styles into GeoPackage" option for Package Layers algorithm @@ -170,8 +170,8 @@ This release has following new features: - Symbology: Option to merge categories in categorized renderer - Symbology: Show Project Colors in color bound data defined buttons - Symbology: Style manager dialog improvements -- Digitising: Georeferencer enhancements -- Digitising: New option to avoid minimizing georeferencer when adding points +- Digitizing: Georeferencer enhancements +- Digitizing: New option to avoid minimizing georeferencer when adding points - Data Management: Comment option in db manager - Forms and Widgets: New form widget for binary (blob) fields - Map Composer: Grid frame improvements @@ -246,14 +246,14 @@ This release has following new features: - User Interface: QML chart and drawings widget - Symbology: Mesh layer styling - Symbology: Classify symmetric in graduated renderer -- Digitising: GPS tracking improvements -- Digitising: More angle choices in advanced digitizing dock -- Digitising: Vertex tool can work on the current layer only -- Digitising: Add reverse line maptools -- Digitising: Geometry Precision -- Digitising: Automatically remove duplicate nodes -- Digitising: Check for geometry validity -- Digitising: Topology checks while editing +- Digitizing: GPS tracking improvements +- Digitizing: More angle choices in advanced digitizing dock +- Digitizing: Vertex tool can work on the current layer only +- Digitizing: Add reverse line maptools +- Digitizing: Geometry Precision +- Digitizing: Automatically remove duplicate nodes +- Digitizing: Check for geometry validity +- Digitizing: Topology checks while editing - Data Management: Translation of QGIS projects - Data Management: Switch Attribute Table dock mode on demand - Data Management: New locator filter to search across all layers @@ -276,7 +276,7 @@ This release has following new features: - Processing: Line substring algorithm - Processing: "Interpolate point on line" algorithm - Processing: k-neighbour concave hull -- Processing: Python scripts which implement algorithms now execute the algorithm on drag and drop and browser double click +- Processing: Python scripts which implement algorithms now execute the algorithm on drag and drop and browser double-click - Processing: New GDAL's rearrange band algorithm - Processing: "Precalculated" values for model algorithm parameters - Processing: "Categorize a layer using a style XML file" algorithm @@ -286,7 +286,7 @@ This release has following new features: - Data Providers: OAuth2 authentication method plugin - Data Providers: Mesh layer: New mesh layer format support - Data Providers: Mesh layer: add function to identify value on mesh layers -- Data Providers: Mesh layer: allow to choose different vector and scalar dataset +- Data Providers: Mesh layer: allow choosing different vector and scalar dataset - Data Providers: Mesh layer: allow render vectors/arrows on the user-defined grid - Data Providers: JSON/JSONB Type support - Data Providers: ESRI Token Authentication support @@ -940,7 +940,7 @@ This is the minor release sports a number of great new features: - New Inverted Polygon renderer - -= Whats new in Version 2.2.0 'Valmiera'? = += What's new in Version 2.2.0 'Valmiera'? = This is the minor release sports a number of great new features: @@ -980,13 +980,13 @@ This is the minor release sports a number of great new features: - 'Processing' can be used headless in scripts. - -= Whats new in Version 2.0.1 'Dufour'? = += What's new in Version 2.0.1 'Dufour'? = This is a small bugfix release to address the missing copyright / credits for our new splash screen and to update supporting documentation. The spanish translation was also updated. -= Whats new in Version 2.0.0 'Dufour'? = += What's new in Version 2.0.0 'Dufour'? = This is a new major release. Building on the foundation of QGIS 1.x.x releases, QGIS Dufour introduces many new features, @@ -1071,7 +1071,7 @@ key new features. you to explore the software and discover them all! -= Whats new in Version 1.8.0 'Lisboa'? = += What's new in Version 1.8.0 'Lisboa'? = This is a new feature release. Building on the foundation of QGIS 1.7.x releases, Lisboa introduces many new features, @@ -1095,7 +1095,7 @@ key new features. - New scale selector with predefined scales - Option to add layers to selected or active group - Pan To Selected tool -- New tools in Vector menu - densify geoemtries, Build spatial index +- New tools in Vector menu - densify geometries, Build spatial index - Export/add geometry column tool can export info using layer CRS, project CRS or ellipsoidal measurements - Model/view based tree for rules in rule-based renderer - Updated CRS selector dialog @@ -1125,7 +1125,7 @@ added gdal_fillnodata to GDALTools plugin - Support for nesting projects within other projects - -= Whats new in Version 1.7.2 'Wroclaw'? = += What's new in Version 1.7.2 'Wroclaw'? = This is a bugfix release over version 1.7.1. The following changes were made. @@ -1173,7 +1173,7 @@ were made. -= Whats new in Version 1.7.1 'Wroclaw'? = += What's new in Version 1.7.1 'Wroclaw'? = This is a bugfix release over version 1.7.0. The following changes were made. @@ -1236,7 +1236,7 @@ http://linfiniti.com/2011/08/improvements-to-raster-performance-in-qgis-master/] -=Whats new in Version 1.7.0 'Wroclaw'?= +=What's new in Version 1.7.0 'Wroclaw'?= This release is named after the town of Wroclaw in Poland. The Department of Climatology and Atmosphere Protection, University of Wroclaw kindly hosted our @@ -1359,7 +1359,7 @@ changed so we will just provide a bullet list of key new features here. - Undo/Redo support for the print composer - -=Whats new in Version 1.6.0 'Capiapo'?= +=What's new in Version 1.6.0 'Capiapo'?= Please note that this is a release in our 'cutting edge' release series. As such it contains new features and extends the programmatic interface over QGIS @@ -1445,7 +1445,7 @@ position dialog. - Sorting for composer attribute table (several columns and ascending / descending). - -=Whats new in Version 1.5.0?= +=What's new in Version 1.5.0?= Please note that this is a release in our 'cutting edge' release series. As such it contains new features and extends the programmatic interface over QGIS @@ -1543,7 +1543,7 @@ variables. More paths can be passed, separated by semicolon. - Support more GEOS operators - -=Whats new in Version 1.4.0 'Enceladus'?= +=What's new in Version 1.4.0 'Enceladus'?= Please note that this is a release in our 'cutting edge' release series. As @@ -1612,7 +1612,7 @@ Designer dialog UIs. -=Whats new in Version 1.3.0 'Mimas'?= +=What's new in Version 1.3.0 'Mimas'?= This release includes over 30 bug fixes and several useful new features: @@ -2415,7 +2415,7 @@ Added setZOrder which will be used in next commit to fix projection zorder probl 2004-06-20 [ts] 0.3.0devel43 -Fix anoying 'mapcanvas isn't freezing while loading rasters' bug +Fix annoying 'mapcanvas isn't freezing while loading rasters' bug 2004-06-19 [ts] 0.3.0devel42 @@ -2536,7 +2536,7 @@ Added "Show in overview" option to vector popup menu. Removed overview stuff from debug only version of qgisapp. -Did plumbing for enableing disabling layers in overview from popup context menu. +Did plumbing for enabling disabling layers in overview from popup context menu. Whoopdeedooo. :-) @@ -2736,7 +2736,7 @@ Added URL parsing and attribute fields for route and track GPX layers 2004-05-17 [ts] 0.2.0devel22 Added support to Save As Image to save in any QImageIO supported format. File->SaveAsImage dialog filter list now generated automagically by -interrogating QImageIO for its supportted formats. File->SaveAsImage remembers +interrogating QImageIO for its supported formats. File->SaveAsImage remembers last dir used (stored in qsettings). Its supposed to remember last filter used but there is an issue with that that needs to be resolved. @@ -3044,7 +3044,7 @@ started moving splashscreen to a global so other classes diring the startup Refactored QgsField to use new coding conventions Documented QgsField (added docs to qgsfield.h) Updated doxygen mainpage section in qgis.h -Added Whats this? help to main application window +Added What's this? help to main application window Added providers/delimitedtext and associated source files to CVS 2004-02-27 [gs] 0.1.0devel4 @@ -3154,7 +3154,7 @@ Version 0.0.8-alpha December 11, 2002 has changed *Changes to layer properites aren't effective until the Layer Properties dialog is closed -*Canceling the Layer Propeties dialog cancels changes +*Canceling the Layer Properties dialog cancels changes Version 0.0.7-alpha November 30, 2002 *Changes to the build system to allow building with/without PostgeSQL @@ -3181,7 +3181,7 @@ Version 0.0.5-alpha October 5, 2002 * Zoom out now works * Zoom Previous added to toolbar * Toolbar has been rearranged and new icons added - * Help|About QGis now contains Version, Whats New, and License information + * Help|About QGis now contains Version, What's New, and License information Version 0.0.4-alpha August 15, 2002 * Added Layer Properties dialog diff --git a/doc/qgsquick.dox b/doc/qgsquick.dox index 728df420deb..450c0e6aea3 100644 --- a/doc/qgsquick.dox +++ b/doc/qgsquick.dox @@ -65,7 +65,7 @@ it is necessary to either use QQmlEngine::addImportPath() to add that directory \section qgsquick_demo_app Demo application -A demo application with some basic componets and functionality is available on https://github.com/lutraconsulting/qgis-quick-demo-app +A demo application with some basic components and functionality is available on https://github.com/lutraconsulting/qgis-quick-demo-app The demo application repository contains also instructions on how to build the application, QGIS Quick and other dependencies on Android. diff --git a/python/core/auto_generated/layertree/qgslayertreemodel.sip.in b/python/core/auto_generated/layertree/qgslayertreemodel.sip.in index 9b03d481877..acd6502b63c 100644 --- a/python/core/auto_generated/layertree/qgslayertreemodel.sip.in +++ b/python/core/auto_generated/layertree/qgslayertreemodel.sip.in @@ -283,7 +283,7 @@ Returns the current map settings used for the current legend filter (or ``None`` void setLegendMapViewData( double mapUnitsPerPixel, int dpi, double scale ); %Docstring Give the layer tree model hints about the currently associated map view -so that legend nodes that use map units can be scaled currectly +so that legend nodes that use map units can be scaled correctly .. versionadded:: 2.6 %End diff --git a/python/core/auto_generated/layertree/qgslayertreeregistrybridge.sip.in b/python/core/auto_generated/layertree/qgslayertreeregistrybridge.sip.in index 798941fd33a..524db132d1c 100644 --- a/python/core/auto_generated/layertree/qgslayertreeregistrybridge.sip.in +++ b/python/core/auto_generated/layertree/qgslayertreeregistrybridge.sip.in @@ -35,7 +35,7 @@ from the map layer registry. { InsertionPoint( QgsLayerTreeGroup *group, int position ); %Docstring -Construcs an insertion point as layer tree group with its corresponding position. +Constructs an insertion point as layer tree group with its corresponding position. %End QgsLayerTreeGroup *group; int position; diff --git a/python/core/auto_generated/layout/qgslayoutitemnodeitem.sip.in b/python/core/auto_generated/layout/qgslayoutitemnodeitem.sip.in index 326331ded6c..cf35ff440a3 100644 --- a/python/core/auto_generated/layout/qgslayoutitemnodeitem.sip.in +++ b/python/core/auto_generated/layout/qgslayoutitemnodeitem.sip.in @@ -168,7 +168,7 @@ the shape is resized thanks to the rubber band. double computeDistance( QPointF pt1, QPointF pt2 ) const; %Docstring -Compute an euclidian distance between 2 nodes. +Compute an euclidean distance between 2 nodes. %End void updateSceneRect(); diff --git a/python/core/auto_generated/mesh/qgsmeshtimesettings.sip.in b/python/core/auto_generated/mesh/qgsmeshtimesettings.sip.in index 3b5a19de597..33935738bc1 100644 --- a/python/core/auto_generated/mesh/qgsmeshtimesettings.sip.in +++ b/python/core/auto_generated/mesh/qgsmeshtimesettings.sip.in @@ -25,7 +25,7 @@ Represents a mesh time settings for mesh datasets public: QgsMeshTimeSettings(); %Docstring -Default constructor for relative time formate and 0 offset +Default constructor for relative time format and 0 offset %End QgsMeshTimeSettings( double relativeTimeOffsetHours, const QString &relativeTimeFormat ); %Docstring diff --git a/python/core/auto_generated/qgscredentials.sip.in b/python/core/auto_generated/qgscredentials.sip.in index ff6c33dc1e9..061b1627e4a 100644 --- a/python/core/auto_generated/qgscredentials.sip.in +++ b/python/core/auto_generated/qgscredentials.sip.in @@ -73,7 +73,7 @@ retrieves instance void lock(); %Docstring -Lock the instance against access from multiple threads. This does not really lock access to get/put methds, +Lock the instance against access from multiple threads. This does not really lock access to get/put methods, it will just prevent other threads to lock the instance and continue the execution. When the class is used from non-GUI threads, they should call lock() before the get/put calls to avoid race conditions. diff --git a/python/core/auto_generated/qgsstringutils.sip.in b/python/core/auto_generated/qgsstringutils.sip.in index 3569a08d44d..cf9358f75ac 100644 --- a/python/core/auto_generated/qgsstringutils.sip.in +++ b/python/core/auto_generated/qgsstringutils.sip.in @@ -283,7 +283,7 @@ Returns a string with characters having vertical representation form substituted :param string: input string -:return: string with substition applied +:return: string with substitution applied .. versionadded:: 3.10 %End diff --git a/python/gui/auto_generated/qgscolorwidgets.sip.in b/python/gui/auto_generated/qgscolorwidgets.sip.in index 06a83a75ab7..ac2c8600c6a 100644 --- a/python/gui/auto_generated/qgscolorwidgets.sip.in +++ b/python/gui/auto_generated/qgscolorwidgets.sip.in @@ -178,7 +178,7 @@ as QColor returns a hue of -1 if the color's hue is ambiguous (e.g., if the satu void alterColor( QColor &color, QgsColorWidget::ColorComponent component, int newValue ) const; %Docstring -Alters a color by modifiying the value of a specific color component +Alters a color by modifying the value of a specific color component :param color: color to alter :param component: color component to alter diff --git a/python/gui/auto_generated/qgsexpressionbuilderwidget.sip.in b/python/gui/auto_generated/qgsexpressionbuilderwidget.sip.in index 06ca6318903..b724ff64487 100644 --- a/python/gui/auto_generated/qgsexpressionbuilderwidget.sip.in +++ b/python/gui/auto_generated/qgsexpressionbuilderwidget.sip.in @@ -203,7 +203,7 @@ preview result and for populating the list of available functions and variables. %Docstring Registers a node item for the expression builder. -:param group: The group the item will be show in the tree view. If the group doesn't exsit it will be created. +:param group: The group the item will be show in the tree view. If the group doesn't exist it will be created. :param label: The label that is show to the user for the item in the tree. :param expressionText: The text that is inserted into the expression area when the user double clicks on the item. :param helpText: The help text that the user will see when item is selected. diff --git a/python/gui/auto_generated/qgsfieldcombobox.sip.in b/python/gui/auto_generated/qgsfieldcombobox.sip.in index 3756cd287df..78578825e6c 100644 --- a/python/gui/auto_generated/qgsfieldcombobox.sip.in +++ b/python/gui/auto_generated/qgsfieldcombobox.sip.in @@ -36,7 +36,7 @@ The layer can be either manually given or dynamically set by connecting the sign void setFilters( QgsFieldProxyModel::Filters filters ); %Docstring -setFilters allows fitering according to the type of field +setFilters allows filtering according to the type of field %End QgsFieldProxyModel::Filters filters() const; diff --git a/python/gui/auto_generated/qgsfieldexpressionwidget.sip.in b/python/gui/auto_generated/qgsfieldexpressionwidget.sip.in index 78507a7f29e..c26cb0c5a40 100644 --- a/python/gui/auto_generated/qgsfieldexpressionwidget.sip.in +++ b/python/gui/auto_generated/qgsfieldexpressionwidget.sip.in @@ -54,7 +54,7 @@ Returns the title used for the expression dialog void setFilters( QgsFieldProxyModel::Filters filters ); %Docstring -setFilters allows fitering according to the type of field +setFilters allows filtering according to the type of field %End void setAllowEmptyFieldName( bool allowEmpty ); diff --git a/python/gui/auto_generated/qgsmapcanvas.sip.in b/python/gui/auto_generated/qgsmapcanvas.sip.in index ea8c28897bb..600485dfe79 100644 --- a/python/gui/auto_generated/qgsmapcanvas.sip.in +++ b/python/gui/auto_generated/qgsmapcanvas.sip.in @@ -513,7 +513,7 @@ used to determine if anti-aliasing is enabled or not bool antiAliasingEnabled() const; %Docstring -``True`` if antialising is enabled +``True`` if antialiasing is enabled %End void enableMapTileRendering( bool flag ); diff --git a/python/gui/auto_generated/qgsmaplayercombobox.sip.in b/python/gui/auto_generated/qgsmaplayercombobox.sip.in index 07dfca545d7..ad762e420f8 100644 --- a/python/gui/auto_generated/qgsmaplayercombobox.sip.in +++ b/python/gui/auto_generated/qgsmaplayercombobox.sip.in @@ -32,7 +32,7 @@ The layers can be filtered and/or ordered. void setFilters( QgsMapLayerProxyModel::Filters filters ); %Docstring -setFilters allows fitering according to layer type and/or geometry type. +setFilters allows filtering according to layer type and/or geometry type. %End QgsMapLayerProxyModel::Filters filters() const; diff --git a/python/gui/auto_generated/qgsscalevisibilitydialog.sip.in b/python/gui/auto_generated/qgsscalevisibilitydialog.sip.in index 805c4672560..cf88ced67a6 100644 --- a/python/gui/auto_generated/qgsscalevisibilitydialog.sip.in +++ b/python/gui/auto_generated/qgsscalevisibilitydialog.sip.in @@ -29,7 +29,7 @@ within the dialog. bool hasScaleVisibility() const; %Docstring -Returns ``True`` if scale based visibilty is enabled. +Returns ``True`` if scale based visibility is enabled. %End double minimumScale() const; diff --git a/python/gui/auto_generated/symbology/qgssymbolselectordialog.sip.in b/python/gui/auto_generated/symbology/qgssymbolselectordialog.sip.in index 8726dc680f8..0ad0e97410e 100644 --- a/python/gui/auto_generated/symbology/qgssymbolselectordialog.sip.in +++ b/python/gui/auto_generated/symbology/qgssymbolselectordialog.sip.in @@ -142,7 +142,7 @@ alters tree and sets proper widget when Layer Type is changed void symbolModified(); %Docstring -Emiited when a symbol is modified in the widget. +Emitted when a symbol is modified in the widget. %End }; diff --git a/python/plugins/db_manager/db_plugins/oracle/TODO.md b/python/plugins/db_manager/db_plugins/oracle/TODO.md index f67df147478..ed7cf551ed7 100644 --- a/python/plugins/db_manager/db_plugins/oracle/TODO.md +++ b/python/plugins/db_manager/db_plugins/oracle/TODO.md @@ -91,7 +91,7 @@ * Disable move Table to another schema (impossible in Oracle, you have to import/export). * Find how to load Unknown WKBGeometryType layers. * Spatial index creation. - * Edit dialog fully functionnal. + * Edit dialog fully functional. * Edit Table opens. * Remove Vacuum operation in Table menu. * Fix: Add SRID when creating table. diff --git a/python/plugins/db_manager/db_plugins/oracle/connector.py b/python/plugins/db_manager/db_plugins/oracle/connector.py index 06dd2256370..b5747c2f8d5 100644 --- a/python/plugins/db_manager/db_plugins/oracle/connector.py +++ b/python/plugins/db_manager/db_plugins/oracle/connector.py @@ -305,7 +305,7 @@ class OracleDBConnector(DBConnector): if self.hasCache(): return self.getSchemasCache() - # Use cache if avalaible: + # Use cache if available: metatable = (u"all_objects WHERE object_type IN " u"('TABLE','VIEW','SYNONYM')") if self.geometryColumnsOnly: diff --git a/python/plugins/processing/algs/grass7/description/v.net.centrality.txt b/python/plugins/processing/algs/grass7/description/v.net.centrality.txt index 84e6fd7fea3..9dc1ea67f3f 100644 --- a/python/plugins/processing/algs/grass7/description/v.net.centrality.txt +++ b/python/plugins/processing/algs/grass7/description/v.net.centrality.txt @@ -1,5 +1,5 @@ v.net.centrality -Computes degree, centrality, betweeness, closeness and eigenvector centrality measures in the network. +Computes degree, centrality, betweenness, closeness and eigenvector centrality measures in the network. Vector (v.*) QgsProcessingParameterFeatureSource|input|Input vector line layer (network)|1|None|False QgsProcessingParameterFeatureSource|points|Centers point layer (nodes)|0|None|False diff --git a/python/plugins/processing/algs/otb/OtbAlgorithmProvider.py b/python/plugins/processing/algs/otb/OtbAlgorithmProvider.py index f7af4238f2c..1c156867c98 100755 --- a/python/plugins/processing/algs/otb/OtbAlgorithmProvider.py +++ b/python/plugins/processing/algs/otb/OtbAlgorithmProvider.py @@ -172,7 +172,7 @@ class OtbAlgorithmProvider(QgsProcessingProvider): self.setActive(False) raise ValueError(self.tr("'{}' does not exist. OTB provider will be disabled".format(v))) - #isValid is True if there is atleast one valid otb application is given path + #isValid is True if there is at least one valid otb application is given path isValid = False descr_folder = self.descrFolder(folder) for app_dir in otb_app_dirs: diff --git a/python/plugins/processing/algs/qgis/FieldsMapper.py b/python/plugins/processing/algs/qgis/FieldsMapper.py index c600eee94a6..1425ee54cc6 100644 --- a/python/plugins/processing/algs/qgis/FieldsMapper.py +++ b/python/plugins/processing/algs/qgis/FieldsMapper.py @@ -120,12 +120,12 @@ class FieldsMapper(QgisFeatureBasedAlgorithm): def outputFields(self, inputFields): return self.fields - def processAlgorithm(self, parameters, context, feeback): + def processAlgorithm(self, parameters, context, feedback): for expression in self.expressions: if expression is not None: expression.prepare(self.expr_context) self._row_number = 0 - return super().processAlgorithm(parameters, context, feeback) + return super().processAlgorithm(parameters, context, feedback) def processFeature(self, feature, context, feedback): attributes = [] diff --git a/python/plugins/processing/algs/qgis/KNearestConcaveHull.py b/python/plugins/processing/algs/qgis/KNearestConcaveHull.py index 8d911db9493..546fdfdfbbd 100644 --- a/python/plugins/processing/algs/qgis/KNearestConcaveHull.py +++ b/python/plugins/processing/algs/qgis/KNearestConcaveHull.py @@ -240,9 +240,9 @@ def remove_point(vector, element): return vector -def euclidian_distance(point1, point2): +def euclidean_distance(point1, point2): """ - Returns the euclidian distance of the 2 given points. + Returns the euclidean distance of the 2 given points. :param point1: tuple (x, y) :param point2: tuple (x, y) @@ -266,7 +266,7 @@ def nearest_points(list_of_points, point, k): # their respective index of list *list_of_distances* list_of_distances = [] for index in range(len(list_of_points)): - list_of_distances.append((euclidian_distance(list_of_points[index], point), index)) + list_of_distances.append((euclidean_distance(list_of_points[index], point), index)) # sort distances in ascending order list_of_distances.sort() diff --git a/python/plugins/processing/algs/qgis/voronoi.py b/python/plugins/processing/algs/qgis/voronoi.py index fbd46674f43..1ac66105638 100755 --- a/python/plugins/processing/algs/qgis/voronoi.py +++ b/python/plugins/processing/algs/qgis/voronoi.py @@ -664,7 +664,7 @@ class EdgeList(object): break i += 1 - # Now search linear list of halfedges for the corect one + # Now search linear list of halfedges for the correct one if (he is self.leftend) or (he is not self.rightend and he.isPointRightOf(pt)): he = he.right while he is not self.rightend and he.isPointRightOf(pt): diff --git a/python/plugins/processing/algs/saga/description/ModifedQuadraticShepard.txt b/python/plugins/processing/algs/saga/description/ModifedQuadraticShepard.txt deleted file mode 100644 index 89fa4a793ba..00000000000 --- a/python/plugins/processing/algs/saga/description/ModifedQuadraticShepard.txt +++ /dev/null @@ -1,12 +0,0 @@ -Modifed Quadratic Shepard -grid_gridding -QgsProcessingParameterFeatureSource|SHAPES|Points|-1|None|False -QgsProcessingParameterField|FIELD|Attribute|None|SHAPES|-1|False|False -Hardcoded|-TARGET_DEFINITION 0 -QgsProcessingParameterExtent|TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX|Output extent|None|True -QgsProcessingParameterNumber|TARGET_USER_SIZE|Cellsize|QgsProcessingParameterNumber.Double|1.000000|False|0.000000|None -QgsProcessingParameterEnum|TARGET_USER_FITS|Fit|[0] nodes;[1] cells|False|0 -QgsProcessingParameterRasterLayer|TARGET_TEMPLATE|Target System|None|True -QgsProcessingParameterRasterDestination|TARGET_OUT_GRID|Target Grid -QgsProcessingParameterNumber|QUADRATIC_NEIGHBORS|Quadratic Neighbors|QgsProcessingParameterNumber.Integer|13|False|5|None -QgsProcessingParameterNumber|WEIGHTING_NEIGHBORS|Weighting Neighbors|QgsProcessingParameterNumber.Integer|19|False|3|None diff --git a/python/plugins/processing/gui/TestTools.py b/python/plugins/processing/gui/TestTools.py index cc66c14806c..cfeb8910e86 100755 --- a/python/plugins/processing/gui/TestTools.py +++ b/python/plugins/processing/gui/TestTools.py @@ -57,7 +57,7 @@ from qgis.PyQt.QtWidgets import QDialog, QVBoxLayout, QTextEdit, QMessageBox def extractSchemaPath(filepath): """ - Trys to find where the file is relative to the QGIS source code directory. + Tries to find where the file is relative to the QGIS source code directory. If it is already placed in the processing or QGIS testdata directory it will return an appropriate schema and relative filepath diff --git a/python/plugins/processing/gui/wrappers_postgis.py b/python/plugins/processing/gui/wrappers_postgis.py index 8423a5fae3d..570413c37f0 100644 --- a/python/plugins/processing/gui/wrappers_postgis.py +++ b/python/plugins/processing/gui/wrappers_postgis.py @@ -103,7 +103,7 @@ class SchemaWidgetWrapper(WidgetWrapper): def setConnection(self, connection): self._connection = connection - # when there is NO connection (yet), this get's called with a ''-connection + # when there is NO connection (yet), this gets called with a ''-connection if isinstance(connection, str) and connection != '': self._database = GeoDB.from_name(connection) else: diff --git a/python/plugins/processing/tools/vector.py b/python/plugins/processing/tools/vector.py index 00a79f25b66..5566500cfa0 100644 --- a/python/plugins/processing/tools/vector.py +++ b/python/plugins/processing/tools/vector.py @@ -53,7 +53,7 @@ def values(source, *attributes): Returns a dict of lists, with the passed field identifiers as keys. It considers the existing selection. - It assummes fields are numeric or contain values that can be parsed + It assumes fields are numeric or contain values that can be parsed to a number. """ ret = {} diff --git a/python/server/auto_generated/qgsserverapiutils.sip.in b/python/server/auto_generated/qgsserverapiutils.sip.in index d9dbf2743ac..d5fc1f0a46d 100644 --- a/python/server/auto_generated/qgsserverapiutils.sip.in +++ b/python/server/auto_generated/qgsserverapiutils.sip.in @@ -28,7 +28,7 @@ The QgsServerApiUtils class contains helper functions to handle common API opera static QgsRectangle parseBbox( const QString &bbox ); %Docstring -Parses a comma separated ``bbox`` into a (possibily empty) :py:class:`QgsRectangle`. +Parses a comma separated ``bbox`` into a (possibly empty) :py:class:`QgsRectangle`. .. note:: diff --git a/qgis.dtd b/qgis.dtd index 437775abacd..8fe7eea2c57 100644 --- a/qgis.dtd +++ b/qgis.dtd @@ -89,7 +89,7 @@ outlinecolor,outlinestyle,outlinewidth,fillcolor,fillpattern) > -- --> - + diff --git a/resources/function_help/json/collect_geometries b/resources/function_help/json/collect_geometries index 78009226ee8..25b2330019d 100644 --- a/resources/function_help/json/collect_geometries +++ b/resources/function_help/json/collect_geometries @@ -4,7 +4,7 @@ "description": "Collects a set of geometries into a multi-part geometry object.", "variants": [ { "variant": "List of arguments variant", - "variant_description": "Geometry parts are specified as seperate arguments to the function.", + "variant_description": "Geometry parts are specified as separate arguments to the function.", "variableLenArguments": true, "arguments": [ {"arg":"geometry1", "syntaxOnly": true}, {"arg":"geometry2", "syntaxOnly": true}, diff --git a/resources/function_help/json/make_line b/resources/function_help/json/make_line index 75ffbffee3d..382922b9359 100644 --- a/resources/function_help/json/make_line +++ b/resources/function_help/json/make_line @@ -4,7 +4,7 @@ "description": "Creates a line geometry from a series of point geometries.", "variants": [ { "variant": "List of arguments variant", - "variant_description": "Line vertices are specified as seperate arguments to the function.", + "variant_description": "Line vertices are specified as separate arguments to the function.", "variableLenArguments": true, "arguments": [ {"arg":"point1", "syntaxOnly": true}, diff --git a/resources/function_help/json/sqlite_fetch_and_increment b/resources/function_help/json/sqlite_fetch_and_increment index b4522b4b373..536cfbebe88 100644 --- a/resources/function_help/json/sqlite_fetch_and_increment +++ b/resources/function_help/json/sqlite_fetch_and_increment @@ -1,7 +1,7 @@ { "name": "sqlite_fetch_and_increment", "type": "function", - "description": "Manage autoincrementing values in sqlite databases.

    SQlite default values can only be applied on insert and not prefetched.

    This makes it impossible to acquire an incremented primary key via AUTO_INCREMENT before creating the row in the database. Sidenote: with postgres, this works via the option evaluate default values.

    When adding new features with relations, it is really nice to be able to already add children for a parent, while the parents form is still open and hence the parent feature uncommitted.

    To get around this limitation, this function can be used to manage sequence values in a separate table on sqlite based formats like gpkg.

    The sequence table will be filtered for a sequence id (filter_attribute and filter_value) and the current value of the id_field will be incremented by 1 ond the incremented value returned.

    If additional columns require values to be specified, the default_value map can be used for this purpose.

    Note
    This function modifies the target sqlite table. It is intended for usage with default value configurations for attributes.

    When the database parameter is a layer and the layer is in transaction mode, the value will only be retrieved once during the lifetime of a transaction and cached and incremented. This makes it unsafe to work on the same database from several processes in parallel.

    ", + "description": "Manage autoincrementing values in sqlite databases.

    SQlite default values can only be applied on insert and not prefetched.

    This makes it impossible to acquire an incremented primary key via AUTO_INCREMENT before creating the row in the database. Sidenote: with postgres, this works via the option evaluate default values.

    When adding new features with relations, it is really nice to be able to already add children for a parent, while the parents form is still open and hence the parent feature uncommitted.

    To get around this limitation, this function can be used to manage sequence values in a separate table on sqlite based formats like gpkg.

    The sequence table will be filtered for a sequence id (filter_attribute and filter_value) and the current value of the id_field will be incremented by 1 and the incremented value returned.

    If additional columns require values to be specified, the default_value map can be used for this purpose.

    Note
    This function modifies the target sqlite table. It is intended for usage with default value configurations for attributes.

    When the database parameter is a layer and the layer is in transaction mode, the value will only be retrieved once during the lifetime of a transaction and cached and incremented. This makes it unsafe to work on the same database from several processes in parallel.

    ", "arguments": [ {"arg":"database", "description":"Path to the sqlite file or geopackage layer"}, {"arg":"table", "description":"Name of the table that manages the sequences"}, diff --git a/resources/server/api/ogc/schema.json b/resources/server/api/ogc/schema.json index ced198e4720..7e894972814 100644 --- a/resources/server/api/ogc/schema.json +++ b/resources/server/api/ogc/schema.json @@ -144,7 +144,7 @@ "href" : "http://example.com/concepts/buildings.html", "rel" : "describedBy", "type" : "text/html", - "title" : "Feature catalogue for buildings" + "title" : "Feature catalog for buildings" } ], "items" : { "$ref" : "#/components/schemas/link" diff --git a/scripts/spell_check/.agignore b/scripts/spell_check/.agignore index 21484136536..2ab34f384bd 100644 --- a/scripts/spell_check/.agignore +++ b/scripts/spell_check/.agignore @@ -1,8 +1,8 @@ # Folders .build*/ ci/ +debian/build/ debian/build.*/ -debian/build*/ debian/.*/usr/ i18n/ external/* @@ -15,7 +15,6 @@ src/app/gps/qwtpolar-1.1.1/ src/core/pal src/plugins/grass/qtermwidget/ - #Extensions *.*.orig *.*.sortinc @@ -23,8 +22,6 @@ src/plugins/grass/qtermwidget/ *.*.prepare *.sld .agignore -*.json - #Specific files ChangeLog @@ -32,6 +29,7 @@ debian/qgis.desktop debian/qgis-plugin-grass.lintian-overrides debian/qgis-provider-grass.lintian-overrides doc/contributors.json +doc/TRANSLATORS Exception_to_GPL_for_Qt.txt images/svg/symbol/blue-marker.svg images/svg/symbol/red-marker.svg @@ -56,9 +54,11 @@ resources/cpt-city-qgis-min/ocal/portugese-flag.svg resources/cpt-city-qgis-min/selections/div.xml resources/cpt-city-qgis-min/selections/reds.xml resources/cpt-city-qgis-min/wkp/schwarzwald/COPYING.xml +resources/data/world_map_generalize.model3 scripts/spell_check/spelling.dat scripts/spell_check/test.sh src/server/qgis_wms.xmi +src/plugins/grass/modules/v.generalize.qgm tests/testdata/qgis_server_accesscontrol/Hello.qml tests/testdata/qgis_server_accesscontrol/project.qgs tests/testdata/qgis_server/ets-wms13/project.qgs diff --git a/scripts/spell_check/spelling.dat b/scripts/spell_check/spelling.dat index d0c0eacc8dc..43efe806c09 100644 --- a/scripts/spell_check/spelling.dat +++ b/scripts/spell_check/spelling.dat @@ -172,6 +172,7 @@ acomplishment:accomplishment acomplishments:accomplishments acording:according acordingly:accordingly +acounts:accounts acquaintence:acquaintance acquaintences:acquaintances acquiantence:acquaintance @@ -251,6 +252,7 @@ adherance:adherence aditional:additional:* aditionally:additionally:* aditionaly:additionally +adjustements:adjustments admendment:amendment admininistrative:administrative adminstered:administered @@ -274,12 +276,14 @@ adresable:addressable adresing:addressing adress:address adressable:addressable +adresse:address adressed:addressed adresses:addresses adressing:addressing adventrous:adventurous advertisment:advertisement advertisments:advertisements +advertize:advertise advesary:adversary adviced:advised aeriel:aerial @@ -344,6 +348,7 @@ aircrafts:aircraft airporta:airports airrcraft:aircraft aisian:asian +ajust:adjust albiet:albeit albumns:albums alchohol:alcohol @@ -370,6 +375,7 @@ algorrithm:algorithm algorritm:algorithm algorythm:algorithm alientating:alienating +alighnment:alignment alignemnt:alignment alignemnts:alignments alledge:allege:* @@ -389,15 +395,19 @@ allignments:alignments alligns:aligns alliviate:alleviate allmost:almost +alloced:allocated allopone:allophone allopones:allophones +alloted:allotted allow one to (\S+):allow %sing +allow to choose:allow choosing allow to (\S+):allow %sing allowd:allowed:* allows one to (\S+):allows %sing allows to (\S+):allows %sing allpication:application allready:already +allright:alright allthough:although alltime:all-time alltogether:altogether @@ -470,6 +480,7 @@ an other:another analagous:analogous analise:analyze analitic:analytic +analitically:analytically analogeous:analogous analysator:analyzer analysies:analyzes @@ -507,6 +518,7 @@ anomoly:anomaly anonimity:anonymity anounced:announced anouncement:announcement +anoying:annoying ansalisation:nasalisation ansalization:nasalization ansestors:ancestors @@ -514,6 +526,7 @@ antartic:antarctic anthromorphization:anthropomorphization anthropolgist:anthropologist anthropolgy:anthropology +antialising:antialiasing anual:annual anulled:annulled anway:anyway @@ -606,6 +619,7 @@ aquisition:acquisition aquitted:acquitted aranged:arranged arangement:arrangement +arays:arrays arbitarily:arbitrarily arbitary:arbitrary arbitray:arbitrary @@ -644,12 +658,14 @@ argments:arguments argubly:arguably arguement:argument arguements:arguments +argumnet:argument aribitary:arbitrary aribtrarily:arbitrarily aribtrary:arbitrary arised:arose:* arithmatic:arithmetic arithmentic:arithmetic +arithmetics:arithmetic aritmetic:arithmetic arival:arrival armamant:armament @@ -712,6 +728,7 @@ assignement:assignment assignements:assignments assignemnt:assignment assignemnts:assignments +assinging:assigning assisnate:assassinate assistent:assistant assit:assist @@ -743,6 +760,7 @@ asssassans:assassins asssertion:assertion assualt:assault assualted:assaulted +assummes:assumes assymetric:asymmetric assymetrical:asymmetrical asteriod:asteroid @@ -766,6 +784,7 @@ athenean:athenian atheneans:athenians athiesm:atheism athiest:atheist +atleast:at least atomatically:automatically atomical:atomic atomicly:atomically @@ -848,6 +867,7 @@ autor:author autorisation:authorisation autority:authority autorization:authorization +autors:authors auxilary:auxiliary auxiliar:auxiliary auxillaries:auxiliaries @@ -869,6 +889,7 @@ availiable:available availibility:availability availible:available avalable:available +avalaible:available avalance:avalanche avaliable:available avaluate:evaluate @@ -890,6 +911,7 @@ awared:awarded aweful:awful awefully:awfully awya:away +bacause:because baceause:because backgorund:background backgroud:background @@ -973,7 +995,9 @@ beseige:besiege beseiged:besieged beseiging:besieging beteen:between +beteween:between betweeen:between +betweeness:betweenness betwen:between beween:between bewteen:between @@ -992,6 +1016,7 @@ bombardement:bombardment bombarment:bombardment bondary:boundary Bonnano:Bonanno +boomark:bookmark bootsrap:bootstrap bootstap:bootstrap bootstapped:bootstrapped @@ -999,6 +1024,7 @@ bootstapping:bootstrapping bootstaps:bootstraps boradcast:broadcast borke:broke +borken:broken boudaries:boundaries boudary:boundary bouding:bounding @@ -1037,6 +1063,8 @@ bugus:bogus buid:build buisness:business buisnessman:businessman +buit:built +buld:build bulding:building bulid:build buliding:building @@ -1049,7 +1077,9 @@ burried:buried busines:business busineses:business busness:business +busses:buses bussiness:business +cachable:cacheable cacheing:caching cacluate:calculate cacluated:calculated @@ -1078,6 +1108,7 @@ calculs:calculus calender:calendar calenders:calendars caligraphy:calligraphy +calles:calls caluclate:calculate caluclated:calculated caluculate:calculate @@ -1116,6 +1147,7 @@ canonalizing:canonicalizing cant:can't canvase:canvas:* caost:coast +capabable:capable capabilies:capabilities capabilites:capabilities capatibilities:capabilities @@ -1303,6 +1335,7 @@ clasifying:classifying classess:classes classs:class:* classses:classes +cleare:cleared cleareance:clearance clearified:clarified clearifies:clarifies @@ -1416,6 +1449,7 @@ commisioned:commissioned commisioner:commissioner commisioning:commissioning commisions:commissions +commited:committed commited:committed:* commitee:committee:* commiter:committer:* @@ -1507,6 +1541,7 @@ compliles:compiles compliling:compiling compling:compiling componant:component +componets:components compontent:component compontents:components comprable:comparable @@ -1523,6 +1558,7 @@ computarized:computerized comression:compression comsumer:consumer comsumers:consumers +comsuming:consuming comunication:communication conain:contain conained:contained @@ -1657,6 +1693,7 @@ consonents:consonants consorcium:consortium conspiracys:conspiracies conspiriator:conspirator +constains:contains constaints:constraints constanly:constantly constarnation:consternation @@ -1666,6 +1703,7 @@ constituant:constituent constituants:constituents constituion:constitution constituional:constitutional +construcs:constructs constructes:constructs constructred:constructed construtor:constructor @@ -1711,9 +1749,11 @@ continiously:continuously continous:continuous continously:continuously continueing:continuing +contiue:continue contiuguous:contiguous contoller:controller contollers:controllers +contrained:constrained contraints:constraints contravercial:controversial contraversy:controversy @@ -1743,6 +1783,7 @@ contructor:constructor contructors:constructors contructs:constructs contry:country +contstraint:constraint contstruction:construction conveinent:convenient convenant:covenant @@ -1762,6 +1803,7 @@ convet:convert conveted:converted conveting:converting convets:converts +convexe:convex conveyer:conveyor conviced:convinced convience:convenience @@ -1774,6 +1816,9 @@ coodinate:coordinate coodinates:coordinates coordiante:coordinate coordiantion:coordination +coordindates:coordinates +coordintes:coordinates +coorinates:coordinates coorperation:corporation coorperations:corporations copmetitors:competitors @@ -1783,6 +1828,7 @@ copyrigth:copyright copyrigthed:copyrighted copyrigths:copyrights copywrite:copyright +corect:correct corected:corrected corespond:correspond coresponded:corresponded @@ -1875,11 +1921,13 @@ critized:criticized critizing:criticizing crockodiles:crocodiles crolls:scrolls +cros:cross crowm:crown crtical:critical crticised:criticised crucifiction:crucifixion crusies:cruises +crutial:crucial cryptocraphic:cryptographic crystalisation:crystallisation ctificates:certificates @@ -1892,6 +1940,8 @@ curcumstance:circumstance curcumstances:circumstances curent:current curently:currently +currect:correct +currectly:correctly currenly:currently curriculem:curriculum currnt:current @@ -1975,6 +2025,7 @@ defenitions:definitions defered:deferred deffensively:defensively defferent:different +defferred:deferred deffine:define deffined:defined defiend:defined @@ -1988,6 +2039,7 @@ defininition:definition defininitions:definitions definintion:definition definit:definite +definitio:definition definitly:definitely definiton:definition defintion:definition @@ -2039,6 +2091,7 @@ depdendencies:dependencies depdendency:dependency depedencies:dependencies depedency:dependency +depencencies:dependencies depencies:dependencies depency:dependency dependance:dependence @@ -2048,6 +2101,7 @@ dependant:dependent dependecies:dependencies dependecy:dependency dependend:dependent +dependening:depending depenencies:dependencies depenency:dependency deployement:deployment @@ -2199,6 +2253,7 @@ dicovered:discovered dicovering:discovering dicovers:discovers dicovery:discovery +dicrete:discrete dictionarys:dictionaries:* dictionay:dictionary dictionnary:dictionary @@ -2225,6 +2280,7 @@ differentiatiations:differentiations differents:different differnet:different differnt:different +diffferent:different difficulity:difficulty diffreent:different diffrent:different @@ -2243,6 +2299,7 @@ dimenions:dimensions dimention:dimension dimentional:dimensional dimentions:dimensions +dimesions:dimensions dimesnional:dimensional diminuitive:diminutive dimunitive:diminutive @@ -2258,6 +2315,7 @@ dipthong:diphthong dipthongs:diphthongs dirctories:directories dirctory:directory +direcly:directly direcories:directories direcory:directory directores:directories @@ -2478,6 +2536,7 @@ ecomonic:economic ecspecially:especially ect:etc edditable:editable +editted:edited editting:editing eearly:early efect:effect @@ -2507,6 +2566,7 @@ electricty:electricity elemenet:element elemenets:elements elementay:elementary +elemets:elements eleminated:eliminated eleminating:eliminating eles:else @@ -2544,6 +2604,7 @@ embeddeding:embedding embeded:embedded embezelled:embezzled emblamatic:emblematic +emiited:emitted eminate:emanate:* eminated:emanated emision:emission @@ -2582,6 +2643,7 @@ emtpy:empty emty:empty emtying:emptying enableds:enabled +enableing:enabling enameld:enameled enbale:enable enbaled:enabled @@ -2690,6 +2752,7 @@ equilibrum:equilibrium equiped:equipped equippment:equipment equitorial:equatorial +equivalance:equivalence equivelant:equivalent equivelent:equivalent equivilant:equivalent @@ -2732,6 +2795,7 @@ estbalishment:establishment ethnocentricm:ethnocentrism etsablishment:establishment etsbalishment:establishment +euclidian:euclidean Europian:European Europians:Europeans Eurpean:European @@ -2744,6 +2808,7 @@ evalute:evaluate evaluted:evaluated evalutes:evaluates evaluting:evaluating +evaulated:evaluated evenhtually:eventually eventally:eventually eventhough:even though @@ -2905,6 +2970,7 @@ exprimental:experimental expropiated:expropriated expropiation:expropriation exressed:expressed +exsit:exist extemely:extremely extened:extended extensability:extensibility @@ -2941,6 +3007,7 @@ facinated:fascinated facist:fascist faild:failed faile:failed +failes:fails failue:failure failuer:failure failues:failures @@ -2970,6 +3037,7 @@ feautures:features Febuary:February Feburary:February fedreally:federally +feeback:feedback feeded:fed femminist:feminist feromone:pheromone @@ -3007,6 +3075,7 @@ firends:friends firts:first fisionable:fissionable fisrt:first +fitering:filtering fitler:filter fitlers:filters flaged:flagged @@ -3055,6 +3124,7 @@ Formalhaut:Fomalhaut formallize:formalize formallized:formalized formaly:formally +formate:format formated:formatted:* formating:formatting formelly:formerly @@ -3114,6 +3184,7 @@ fuctions:functions fufill:fulfill fufilled:fulfilled fulfiled:fulfilled +fullfiled:fulfilled fullfill:fulfill fullfilled:fulfilled fullfilling:fulfilling @@ -3127,6 +3198,7 @@ functino:function functins:functions functionallity:functionality functionaly:functionally +functionnal:functional functionnality:functionality functios:functions functiosn:functions @@ -3193,6 +3265,7 @@ genreated:generated genreates:generates genreating:generating genric:generic +geoemtries:geometries geoemtry:geometry geographich:geographic geographicial:geographical @@ -3200,6 +3273,7 @@ geometrician:geometer geometricians:geometers geomtry:geometry gerat:great +get's:gets geting:getting Ghandi:Gandhi gived:given @@ -3459,6 +3533,7 @@ humurous:humorous husban:husband hvae:have hvaing:having +hve:have hvea:have hwihc:which hwile:while @@ -3523,6 +3598,7 @@ imigrant:immigrant imigrated:immigrated imigration:immigration iminent:imminent +imlemented:implemented immeadiately:immediately immedate:immediate immedately:immediately @@ -3579,6 +3655,7 @@ implentation:implementation implentations:implementations implicitely:implicitly implicity:implicitly:* +implictly:implicitly impliment:implement implimented:implemented implimenting:implementing @@ -3770,11 +3847,13 @@ infilitrate:infiltrate infilitrated:infiltrated infilitration:infiltration infinit:infinite +infinte:infinite inflamation:inflammation inflexable:inflexible influencial:influential influented:influenced infomation:information +infor:info inforce:enforce inforced:enforced informaion:information @@ -3960,6 +4039,7 @@ intergration:integration interm:interim:* intermidiate:intermediate intermittant:intermittent +internaly:internally internation:international:* internel:internal internels:internals @@ -3980,6 +4060,7 @@ interrugum:interregnum interruped:interrupted interruping:interrupting interrups:interrupts +interruptable:interruptible intersecton:intersection intersectons:intersections intertaining:entertaining @@ -3987,6 +4068,7 @@ interupt:interrupt interupted:interrupted interupting:interrupting interupts:interrupts +intervall:interval intervines:intervenes intevene:intervene intiailise:initialise @@ -4076,6 +4158,7 @@ isssue:issue isssues:issues issueing:issuing istead:instead +iterater:iterator iterface:interface iterfaces:interfaces itialise:initialize:* @@ -4093,6 +4176,7 @@ itslef:itself iunior:junior iwll:will iwth:with +januar:january Janurary:January Januray:January Japanes:Japanese:* @@ -4244,6 +4328,7 @@ litterally:literally liuke:like livley:lively lmits:limits +localtion:location loev:love loger:logger loggging:logging @@ -4266,6 +4351,7 @@ lukid:likud lveo:love lvoe:love Lybia:Libya +mabe:maybe mach:match machanism:mechanism machanisms:mechanisms @@ -4337,6 +4423,8 @@ manully:manually manupulation:manipulation manupulations:manipulations manuver:maneuver +maped:mapped +maping:mapping mapp:map mappping:mapping mapppings:mappings @@ -4395,6 +4483,7 @@ ment:meant mentiond:mentioned mentionned:mentioned mercentile:mercantile +merchantibility:merchantability mesage:message mesages:messages mesaureed:measured @@ -4407,16 +4496,19 @@ messge:message messges:messages messsage:message messsages:messages +mesures:measures metalic:metallic metalurgic:metallurgic metalurgical:metallurgical metalurgy:metallurgy metamorphysis:metamorphosis metaphoricial:metaphorical +metdata:metadata meterologist:meteorologist meterology:meteorology methaphor:metaphor methaphors:metaphors +methds:methods metres:meters mial:mail Michagan:Michigan @@ -4429,6 +4521,7 @@ milennium:millennium mileu:milieu miliary:military miligram:milligram +milimeters:millimeters milion:million:* miliraty:military milisecond:millisecond @@ -4522,6 +4615,8 @@ modifed:modified modifer:modifier modifes:modifies modifing:modifying +modifiy:modify +modifyable:modifiable modle:model moduel:module moduels:modules @@ -4639,6 +4734,7 @@ neeeded:needed neeeding:needing neeeds:needs nees:needs +negativ:negative negitive:negative neglible:negligible negligable:negligible @@ -4786,6 +4882,7 @@ occuring:occurring occurr:occur occurrance:occurrence occurrances:occurrences +oclock:o'clock octohedra:octahedra octohedral:octahedral octohedron:octahedron @@ -4815,6 +4912,7 @@ offseting:offsetting oftenly:often ofthe:of the oging:going +oldes:oldest olny:only omision:omission omited:omitted @@ -4831,6 +4929,7 @@ ommitting:omitting:* omniverous:omnivorous omniverously:omnivorously omre:more +ond:and onot:not onself:oneself onthe:on the @@ -4867,6 +4966,7 @@ opthamologist:ophthalmologist optinal:optional optinally:optionally optio:option +optionall:optional optionaly:optionally optionnal:optional optmization:optimization @@ -4907,9 +5007,11 @@ oscilate:oscillate oscilated:oscillated oscilating:oscillating otehr:other +othere:other otherise:otherwise otherwhise:otherwise othwerwise:otherwise +otpion:option oublisher:publisher ouevre:oeuvre ouptut:output @@ -4919,6 +5021,7 @@ ouputted:outputted ouputting:outputting oustanding:outstanding outputing:outputting +outupt:output outut:output oveerun:overrun oveflow:overflow @@ -4948,6 +5051,7 @@ overthere:over there overun:overrun overwelming:overwhelming overwheliming:overwhelming +overwise:otherwise overwite:overwrite overwites:overwrites overwitten:overwritten @@ -5210,6 +5314,7 @@ poisin:poison poiter:pointer poiters:pointers polical:political +poligon:polygon polinator:pollinator polinators:pollinators politican:politician @@ -5225,6 +5330,7 @@ polysaccaride:polysaccharide polysaccharid:polysaccharide pomegranite:pomegranate pomotion:promotion +poperties:properties poportional:proportional popoulation:population popularaty:popularity @@ -5236,7 +5342,6 @@ portait:portrait portayed:portrayed portraing:portraying Portugese:Portuguese -portugese:Portuguese portuguease:portuguese portugues:Portuguese posess:possess @@ -5250,6 +5355,7 @@ posibility:possibility posible:possible posion:poison positionned:positioned +positiv:positive positon:position positons:positions positve:positive @@ -5265,6 +5371,7 @@ possibile:possible possibilites:possibilities possibilties:possibilities possibilty:possibility +possibily:possibly possiblility:possibility possiblilty:possibility possiblities:possibilities @@ -5409,6 +5516,7 @@ privilige:privilege priviliges:privileges privledge:privilege privte:private +probabaly:probably probabilaty:probability probablistic:probabilistic probablly:probably @@ -5506,6 +5614,7 @@ proove:prove prooved:proved properies:properties propery:property +propeties:properties prophacy:prophecy propietary:proprietary propigate:propagate @@ -5764,6 +5873,7 @@ referencs:references referenece:reference refereneced:referenced refereneces:references +referes:refers referiang:referring refering:referring refernce:reference @@ -5842,6 +5952,7 @@ relasing:releasing relatiopnship:relationship relativly:relatively relavent:relevant +releas:release releasse:release releated:related relected:reelected @@ -6068,15 +6179,18 @@ resursive:recursive resursively:recursively retalitated:retaliated retalitation:retaliation +retangles:rectangles retieve:retrieve retore:restore:* retored:restored retores:restores retoring:restoring retransmited:retransmitted +retreival:retrieval retreive:retrieve retreived:retrieved retreiving:retrieving +retriev:retrieve retrive:retrieve retrived:retrieved retrives:retrieves @@ -6235,6 +6349,7 @@ secion:section secions:sections seciton:section secitons:sections +seconday:secondary secratary:secretary secretery:secretary sectionning:sectioning @@ -6473,6 +6588,7 @@ spainish:Spanish spaw:spawn spawed:spawned spawing:spawning +spawnve:spawn spaws:spawns speach:speech spearator:separator @@ -6614,6 +6730,7 @@ structered:structured structre:structure structres:structures structual:structural +struture:structure stubborness:stubbornness stuct:struct stucts:structs @@ -6637,6 +6754,7 @@ subdirectorys:subdirectories subexpresssion:subexpression subexpresssions:subexpressions subjudgation:subjugation +sublcasses:subclasses suble:subtle submachne:submachine subpecies:subspecies @@ -6644,12 +6762,14 @@ subseqent:subsequent subsequest:subsequent subsidary:subsidiary subsiduary:subsidiary +subsitute:substitute subsituting:substituting subsquent:subsequent subsquently:subsequently substace:substance substancial:substantial substatial:substantial +substition:substitution substitude:substitute substituded:substituted substitudes:substitutes @@ -6756,6 +6876,7 @@ suppoed:supposed suppored:supported supportd:supported supportin:supporting +supportted:supported supposingly:supposedly suppoted:supported suppport:support @@ -6843,6 +6964,7 @@ symmetricaly:symmetrically symobl:symbol synagouge:synagogue synax:syntax +synching:syncing synchonisation:synchronisation synchonise:synchronise synchonised:synchronised @@ -6886,6 +7008,7 @@ tahn:than taht:that talekd:talked tangeant:tangent +targer:target targetted:targeted targetting:targeting tast:taste @@ -6916,7 +7039,12 @@ temperarily:temporarily temperment:temperament tempertaure:temperature temperture:temperature +temporarely:temporarily +temporay:temporary +tempory:temporary +temprarily:temporarily temprary:temporary +temprorary:temporary tenacle:tentacle tenacles:tentacles tenative:tentative @@ -6941,6 +7069,7 @@ tesselate:tessellate tesselation:tessellation tesselator:tessellator testiclular:testicular +testin:testing testomony:testimony texual:textual texually:textually @@ -6979,6 +7108,7 @@ thna:than thne:then thnig:thing thnigs:things +thos:those thoughout:throughout threashold:threshold threasholds:thresholds @@ -7023,6 +7153,7 @@ timne:time timout:timeout tiome:time tipically:typically +titel:title tje:the tjhe:the tjpanishad:upanishad @@ -7156,7 +7287,10 @@ trucated:truncated trucates:truncates trucating:truncating truely:truly +# trun:turn trustworthyness:trustworthiness +trys:tries +tupel:tuple tupple:tuple tupples:tuples turnk:trunk @@ -7252,9 +7386,11 @@ unflaged:unflagged unforetunately:unfortunately unforgetable:unforgettable unforgiveable:unforgivable +unforseen:unforeseen unfortunatelly:unfortunately unfortunatley:unfortunately unfortunatly:unfortunately +unfortunetly:unfortunately unforunate:unfortunate unforunately:unfortunately unfourtunately:unfortunately @@ -7322,6 +7458,7 @@ unplease:displease unplesant:unpleasant unprecendented:unprecedented unprecidented:unprecedented +unqiue:unique unqoute:unquote unqouted:unquoted unqoutes:unquotes @@ -7359,6 +7496,7 @@ unsuprizingly:unsurprisingly unsurprized:unsurprised unsurprizing:unsurprising unsurprizingly:unsurprisingly +unter:under untill:until untranslateable:untranslatable unusal:unusual @@ -7367,6 +7505,7 @@ unuseable:unusable unuseful:useless unusuable:unusable unvailable:unavailable +# unvalid:invalid unversionned:unversioned unversoned:unversioned unviersity:university @@ -7382,11 +7521,13 @@ upcomming:upcoming updat:update updateing:updating upgradded:upgraded +upgrate:upgrade uppstream:upstream upsream:upstream upsteam:upstream upstrema:upstream upto:up to +uptodate:up-to-date usal:usual usally:usually useable:usable @@ -7402,6 +7543,7 @@ usetnet:Usenet usuable:usable usualy:usually ususally:usually +utilies:utilities utilise:utilize utilites:utilities utillities:utilities @@ -7501,11 +7643,13 @@ visability:visibility visable:visible:* visably:visibly visibile:visible +visibilty:visibility visiters:visitors visting:visiting vistors:visitors vitories:victories vitual:virtual +vlaues:values vlues:values volcanoe:volcano voleyball:volleyball @@ -7560,6 +7704,7 @@ whan:when whant:want whants:wants whataver:whatever +whats:what's whcih:which whenver:whenever wheras:whereas @@ -7577,6 +7722,7 @@ whlch:which whn:when wholey:wholly wholy:wholly +whoose:whose whta:what whther:whether wich:which @@ -7590,6 +7736,7 @@ wihout:without wiht:with wihtin:within wiil:will +wil:will wilcard:wildcard wilcards:wildcards wille:will diff --git a/scripts/tsstat.pl b/scripts/tsstat.pl index cc92ea4ec9a..63755008b6c 100755 --- a/scripts/tsstat.pl +++ b/scripts/tsstat.pl @@ -58,7 +58,7 @@ my $translators= { 'hu' => 'Zoltan Siki, Zoltan Toldi', 'hr' => 'Zoran Jankovic', 'is' => 'Ásta Kristín Óladóttir, Thordur Ivarsson, Sveinn í Felli', - 'id' => 'Emir Hartato, Muhammad Iqnaul Haq Siregar, Trias Aditya, Januar V. Simarmata, I Made Anombawa', + 'id' => 'Emir Hartato, Muhammad Iqnaul Haq Siregar, Trias Aditya, Januar V. Simarmata, I Made Anombawa', #spellok 'it' => 'Marco Grisolia, Roberto Angeletti, Michele Beneventi, Marco Braida, Stefano Campus, Luca Casagrande, Paolo Cavallini, Giuliano Curti, Luca Delucchi, Alessandro Fanna, Michele Ferretti, Matteo Ghetta, Anne Gishla, Maurizio Napolitano, Flavio Rigolon', 'ja' => 'BABA Yoshihiko, Yoichi Kayama, Minoru Akagi, Takayuki Nuimura, Takayuki Mizutani, Norihiro Yamate, Kohei Tomita', 'ka' => 'Shota Murtskhvaladze, George Machitidze', diff --git a/src/3d/qgs3dmapscene.cpp b/src/3d/qgs3dmapscene.cpp index ba764c2605a..bc06c513f40 100644 --- a/src/3d/qgs3dmapscene.cpp +++ b/src/3d/qgs3dmapscene.cpp @@ -312,7 +312,7 @@ bool Qgs3DMapScene::updateCameraNearFarPlanes() if ( fnear == 1e9 && ffar == 0 ) { // the update didn't work out... this should not happen - // well at least temprarily use some conservative starting values + // well at least temporarily use some conservative starting values qDebug() << "oops... this should not happen! couldn't determine near/far plane. defaulting to 1...1e9"; fnear = 1; ffar = 1e9; diff --git a/src/analysis/interpolation/CloughTocherInterpolator.h b/src/analysis/interpolation/CloughTocherInterpolator.h index 20683841394..adc774942ed 100644 --- a/src/analysis/interpolation/CloughTocherInterpolator.h +++ b/src/analysis/interpolation/CloughTocherInterpolator.h @@ -35,7 +35,7 @@ class ANALYSIS_EXPORT CloughTocherInterpolator : public TriangleInterpolator protected: //! Association with a triangulation object NormVecDecorator *mTIN = nullptr; - //! Tolerance of the barycentric coordinates at the borders of the triangles (to prevent errors because of very small negativ baricentric coordinates) + //! Tolerance of the barycentric coordinates at the borders of the triangles (to prevent errors because of very small negative baricentric coordinates) double mEdgeTolerance = 0.00001; //! First point of the triangle in x-,y-,z-coordinates QgsPoint point1 = QgsPoint( 0, 0, 0 ); diff --git a/src/analysis/interpolation/MathUtils.h b/src/analysis/interpolation/MathUtils.h index e35500d5fc9..39dcc0ca796 100644 --- a/src/analysis/interpolation/MathUtils.h +++ b/src/analysis/interpolation/MathUtils.h @@ -48,7 +48,7 @@ namespace MathUtils bool ANALYSIS_EXPORT inCircle( QgsPoint *testp, QgsPoint *p1, QgsPoint *p2, QgsPoint *p3 ); //! Tests, whether 'point' is inside the diametral circle through 'p1' and 'p2' bool ANALYSIS_EXPORT inDiametral( QgsPoint *p1, QgsPoint *p2, QgsPoint *point ); - //! Returns whether 'thepoint' is left or right of the line from 'p1' to 'p2'. Negativ values mean left and positiv values right. There may be numerical instabilities, so a threshold may be useful + //! Returns whether 'thepoint' is left or right of the line from 'p1' to 'p2'. Negative values mean left and positive values right. There may be numerical instabilities, so a threshold may be useful double ANALYSIS_EXPORT leftOf( const QgsPoint &thepoint, const QgsPoint *p1, const QgsPoint *p2 ); //! Returns TRUE, if line1 (p1 to p2) and line2 (p3 to p4) intersect. If the lines have an endpoint in common, FALSE is returned bool ANALYSIS_EXPORT lineIntersection( QgsPoint *p1, QgsPoint *p2, QgsPoint *p3, QgsPoint *p4 ); @@ -56,7 +56,7 @@ namespace MathUtils bool ANALYSIS_EXPORT lineIntersection( QgsPoint *p1, QgsPoint *p2, QgsPoint *p3, QgsPoint *p4, QgsPoint *intersection_point ); //! Lower function int ANALYSIS_EXPORT lower( int n, int i ); - //! Returns the area of a triangle. If the points are ordered counterclockwise, the value will be positiv. If they are ordered clockwise, the value will be negativ + //! Returns the area of a triangle. If the points are ordered counterclockwise, the value will be positive. If they are ordered clockwise, the value will be negative double ANALYSIS_EXPORT triArea( QgsPoint *pa, QgsPoint *pb, QgsPoint *pc ); //! Calculates the z-component of a vector with coordinates 'x' and 'y'which is in the same tangent plane as the tangent vectors 'v1' and 'v2'. The result is assigned to 'result' bool ANALYSIS_EXPORT derVec( const Vector3D *v1, const Vector3D *v2, Vector3D *result, double x, double y ); diff --git a/src/analysis/interpolation/NormVecDecorator.cpp b/src/analysis/interpolation/NormVecDecorator.cpp index c5d9f167b25..b816d88d8f0 100644 --- a/src/analysis/interpolation/NormVecDecorator.cpp +++ b/src/analysis/interpolation/NormVecDecorator.cpp @@ -254,7 +254,7 @@ bool NormVecDecorator::getTriangle( double x, double y, QgsPoint &p1, Vector3D * int nr2 = 0; int nr3 = 0; - if ( TriDecorator::getTriangle( x, y, p1, nr1, p2, nr2, p3, nr3 ) )//everything allright + if ( TriDecorator::getTriangle( x, y, p1, nr1, p2, nr2, p3, nr3 ) )//everything alright { if ( ( *mNormVec )[ nr1 ] && ( *mNormVec )[ nr2 ] && ( *mNormVec )[ nr3 ] ) { @@ -308,7 +308,7 @@ bool NormVecDecorator::getTriangle( double x, double y, QgsPoint &p1, int &ptn1, { if ( v1 && v2 && v3 && state1 && state2 && state3 ) { - if ( TriDecorator::getTriangle( x, y, p1, ptn1, p2, ptn2, p3, ptn3 ) )//everything allright + if ( TriDecorator::getTriangle( x, y, p1, ptn1, p2, ptn2, p3, ptn3 ) )//everything alright { v1->setX( ( *mNormVec )[( ptn1 )]->getX() ); v1->setY( ( *mNormVec )[( ptn1 )]->getY() ); diff --git a/src/analysis/raster/qgsrastercalculator.cpp b/src/analysis/raster/qgsrastercalculator.cpp index 7806587b223..fc8a778cf1c 100644 --- a/src/analysis/raster/qgsrastercalculator.cpp +++ b/src/analysis/raster/qgsrastercalculator.cpp @@ -153,7 +153,7 @@ QgsRasterCalculator::Result QgsRasterCalculator::processCalculation( QgsFeedback GDALSetRasterNoDataValue( outputRasterBand, outputNodataValue ); // Check if we need to read the raster as a whole (which is memory inefficient - // and not interruptable by the user) by checking if any raster matrix nodes are + // and not interruptible by the user) by checking if any raster matrix nodes are // in the expression bool requiresMatrix = ! calcNode->findNodes( QgsRasterCalcNode::Type::tMatrix ).isEmpty(); diff --git a/src/app/decorations/qgsdecorationgrid.h b/src/app/decorations/qgsdecorationgrid.h index ffcbdfaad3f..d34c1cf21d5 100644 --- a/src/app/decorations/qgsdecorationgrid.h +++ b/src/app/decorations/qgsdecorationgrid.h @@ -110,7 +110,7 @@ class APP_EXPORT QgsDecorationGrid: public QgsDecorationItem void setGridAnnotationDirection( GridAnnotationDirection d ) {mGridAnnotationDirection = d;} GridAnnotationDirection gridAnnotationDirection() const {return mGridAnnotationDirection;} - //! Sets length of the cros segments (if grid style is cross) + //! Sets length of the cross segments (if grid style is cross) /* void setCrossLength( double l ) {mCrossLength = l;} */ /* double crossLength() {return mCrossLength;} */ diff --git a/src/app/dwg/qgsdwgimporter.cpp b/src/app/dwg/qgsdwgimporter.cpp index c9896143efa..d936ac52b20 100644 --- a/src/app/dwg/qgsdwgimporter.cpp +++ b/src/app/dwg/qgsdwgimporter.cpp @@ -209,7 +209,7 @@ bool QgsDwgImporter::import( const QString &drawing, QString &error, bool doExpa return false; } - // Check whether database is uptodate + // Check whether database is up-to-date OGRLayerH layer = OGR_DS_GetLayerByName( mDs.get(), "drawing" ); if ( !layer ) { @@ -245,7 +245,7 @@ bool QgsDwgImporter::import( const QString &drawing, QString &error, bool doExpa QString path = QString::fromUtf8( OGR_F_GetFieldAsString( f, pathIdx ) ); if ( path == fi.canonicalPath() && fi.lastModified() <= lastModified ) { - LOG( tr( "Drawing already uptodate in database." ) ); + LOG( tr( "Drawing already up-to-date in database." ) ); OGR_F_Destroy( f ); return true; } diff --git a/src/app/main.cpp b/src/app/main.cpp index 048c3881d08..a67c95e3b52 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -864,7 +864,7 @@ int main( int argc, char *argv[] ) "You are seeing this message most likely because you " "have no DISPLAY environment variable set.\n" ).toUtf8().constData(); - exit( 1 ); //exit for now until a version of qgis is capabable of running non interactive + exit( 1 ); //exit for now until a version of qgis is capable of running non interactive } // GUI customization is enabled according to settings (loaded when instance is created) diff --git a/src/app/qgsappbrowserproviders.h b/src/app/qgsappbrowserproviders.h index 1653acd5f4b..ef3c0d3bd89 100644 --- a/src/app/qgsappbrowserproviders.h +++ b/src/app/qgsappbrowserproviders.h @@ -290,7 +290,7 @@ class APP_EXPORT QgsBookmarksItem : public QgsDataCollectionItem QVector createChildren() override; - //! Icon for boomark manager container + //! Icon for bookmark manager container static QIcon iconBookmarks(); QVariant sortKey() const override; diff --git a/src/app/qgsmapsavedialog.cpp b/src/app/qgsmapsavedialog.cpp index f626abc17b3..7b634172e52 100644 --- a/src/app/qgsmapsavedialog.cpp +++ b/src/app/qgsmapsavedialog.cpp @@ -325,7 +325,7 @@ void QgsMapSaveDialog::applyMapSettings( QgsMapSettings &mapSettings ) switch ( mDialogType ) { case Pdf: - mapSettings.setFlag( QgsMapSettings::Antialiasing, true ); // hardcode antialising when saving as PDF + mapSettings.setFlag( QgsMapSettings::Antialiasing, true ); // hardcode antialiasing when saving as PDF break; case Image: diff --git a/src/app/qgspluginregistry.cpp b/src/app/qgspluginregistry.cpp index 05dcfbc59f9..53da76b77f4 100644 --- a/src/app/qgspluginregistry.cpp +++ b/src/app/qgspluginregistry.cpp @@ -616,7 +616,7 @@ bool QgsPluginRegistry::checkPythonPlugin( const QString &packageName ) QString pluginName, description, /*category,*/ version; // get information from the plugin - // if there are some problems, don't continue with metadata retreival + // if there are some problems, don't continue with metadata retrieval pluginName = mPythonUtils->getPluginMetadata( packageName, QStringLiteral( "name" ) ); description = mPythonUtils->getPluginMetadata( packageName, QStringLiteral( "description" ) ); version = mPythonUtils->getPluginMetadata( packageName, QStringLiteral( "version" ) ); diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp index 0ad82149d40..2f91746c058 100644 --- a/src/app/qgsprojectproperties.cpp +++ b/src/app/qgsprojectproperties.cpp @@ -296,7 +296,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa cbxAbsolutePath->setCurrentIndex( QgsProject::instance()->readBoolEntry( QStringLiteral( "Paths" ), QStringLiteral( "/Absolute" ), true ) ? 0 : 1 ); // populate combo box with ellipsoids - // selection of the ellipsoid from settings is defferred to a later point, because it would + // selection of the ellipsoid from settings is deferred to a later point, because it would // be overridden in the meanwhile by the projection selector populateEllipsoidList(); if ( !QgsProject::instance()->crs().isValid() ) diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp index 11e51142ad0..309ab345eb3 100644 --- a/src/app/qgsrasterlayerproperties.cpp +++ b/src/app/qgsrasterlayerproperties.cpp @@ -1826,7 +1826,7 @@ void QgsRasterLayerProperties::loadDefaultStyle_clicked() void QgsRasterLayerProperties::saveDefaultStyle_clicked() { - apply(); // make sure the style to save is uptodate + apply(); // make sure the style to save is up-to-date // a flag passed by reference bool defaultSavedFlag = false; @@ -1898,7 +1898,7 @@ void QgsRasterLayerProperties::saveStyleAs_clicked() // ensure the user never omits the extension from the file name outputFileName = QgsFileUtils::ensureFileNameHasExtension( outputFileName, QStringList() << QStringLiteral( "qml" ) ); - apply(); // make sure the style to save is uptodate + apply(); // make sure the style to save is up-to-date // then export style bool defaultLoadedFlag = false; diff --git a/src/app/qgsrelationmanagerdialog.cpp b/src/app/qgsrelationmanagerdialog.cpp index de721de3e00..dccb69e6081 100644 --- a/src/app/qgsrelationmanagerdialog.cpp +++ b/src/app/qgsrelationmanagerdialog.cpp @@ -177,7 +177,7 @@ QList< QgsRelation > QgsRelationManagerDialog::relations() for ( int i = 0; i < rows; ++i ) { QgsRelation relation = mRelationsTable->item( i, 0 )->data( Qt::UserRole ).value(); - // The name can be editted in the table, so apply this one + // The name can be edited in the table, so apply this one relation.setName( mRelationsTable->item( i, 0 )->data( Qt::DisplayRole ).toString() ); relations << relation; } diff --git a/src/auth/oauth2/cmake/DownloadO2.cmake b/src/auth/oauth2/cmake/DownloadO2.cmake index f0cb5539fd9..252009f34f3 100644 --- a/src/auth/oauth2/cmake/DownloadO2.cmake +++ b/src/auth/oauth2/cmake/DownloadO2.cmake @@ -8,7 +8,7 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -# NOTE: These is a temporary source code commit checkout, until a releas with +# NOTE: These is a temporary source code commit checkout, until a release with # recent commits is available via common platform packaging set(_o2_commit 31ceafb3f0c3b605110ddd20aeebd3288504ee1f) set(_o2_url "https://github.com/pipacs/o2/archive/${_o2_commit}.tar.gz") diff --git a/src/auth/oauth2/qgsauthoauth2method.cpp b/src/auth/oauth2/qgsauthoauth2method.cpp index 583f2c44f55..f8d902056d9 100644 --- a/src/auth/oauth2/qgsauthoauth2method.cpp +++ b/src/auth/oauth2/qgsauthoauth2method.cpp @@ -160,7 +160,7 @@ bool QgsAuthOAuth2Method::updateNetworkRequest( QNetworkRequest &request, const QEventLoop rloop( nullptr ); connect( o2, &QgsO2::refreshFinished, &rloop, &QEventLoop::quit ); - // add singlshot timer to quit refresh after an alloted timeout + // add single shot timer to quit refresh after an allotted timeout // this should keep the local event loop from blocking forever QTimer r_timer( nullptr ); int r_reqtimeout = o2->oauth2config()->requestTimeout() * 1000; @@ -214,7 +214,7 @@ bool QgsAuthOAuth2Method::updateNetworkRequest( QNetworkRequest &request, const connect( o2, &QgsO2::linkingFailed, &loop, &QEventLoop::quit ); connect( o2, &QgsO2::linkingSucceeded, &loop, &QEventLoop::quit ); - // add singlshot timer to quit linking after an alloted timeout + // add single shot timer to quit linking after an allotted timeout // this should keep the local event loop from blocking forever QTimer timer( nullptr ); timer.setInterval( reqtimeout * 5 ); diff --git a/src/core/auth/qgsauthmanager.cpp b/src/core/auth/qgsauthmanager.cpp index 7752bbc9a70..72c5649ce65 100644 --- a/src/core/auth/qgsauthmanager.cpp +++ b/src/core/auth/qgsauthmanager.cpp @@ -960,7 +960,7 @@ void QgsAuthManager::updateConfigAuthMethods() if ( query.isActive() ) { - QgsDebugMsg( QStringLiteral( "Synching existing auth config and their auth methods" ) ); + QgsDebugMsg( QStringLiteral( "Syncing existing auth config and their auth methods" ) ); mConfigAuthMethods.clear(); QStringList cfgmethods; while ( query.next() ) diff --git a/src/core/classification/qgsclassificationequalinterval.cpp b/src/core/classification/qgsclassificationequalinterval.cpp index 0d9e2198bbd..f2054196d70 100644 --- a/src/core/classification/qgsclassificationequalinterval.cpp +++ b/src/core/classification/qgsclassificationequalinterval.cpp @@ -54,7 +54,7 @@ QList QgsClassificationEqualInterval::calculateBreaks( double minimum, d value += step; breaks << value; } - // floating point arithmetics is not precise: + // floating point arithmetic is not precise: // set the last break to be exactly maximum so we do not miss it breaks[nclasses - 1] = maximum; } diff --git a/src/core/diagram/qgstextdiagram.cpp b/src/core/diagram/qgstextdiagram.cpp index d06bb290b40..c1e7aff209a 100644 --- a/src/core/diagram/qgstextdiagram.cpp +++ b/src/core/diagram/qgstextdiagram.cpp @@ -207,7 +207,7 @@ void QgsTextDiagram::renderDiagram( const QgsFeature &feature, QgsRenderContext QgsExpression *expression = getExpression( s.categoryAttributes.at( i ), expressionContext ); QString val = expression->evaluate( &expressionContext ).toString(); - //find out dimesions + //find out dimensions double textWidth = fontMetrics.width( val ); double textHeight = fontMetrics.height(); diff --git a/src/core/expression/qgsexpressionnodeimpl.cpp b/src/core/expression/qgsexpressionnodeimpl.cpp index 665d41e1057..81e3fba4bc8 100644 --- a/src/core/expression/qgsexpressionnodeimpl.cpp +++ b/src/core/expression/qgsexpressionnodeimpl.cpp @@ -203,7 +203,7 @@ QVariant QgsExpressionNodeBinaryOperator::evalNode( QgsExpression *parent, const return QVariant(); else if ( mOp != boDiv && QgsExpressionUtils::isIntSafe( vL ) && QgsExpressionUtils::isIntSafe( vR ) ) { - // both are integers - let's use integer arithmetics + // both are integers - let's use integer arithmetic qlonglong iL = QgsExpressionUtils::getIntValue( vL, parent ); ENSURE_NO_EVAL_ERROR; qlonglong iR = QgsExpressionUtils::getIntValue( vR, parent ); diff --git a/src/core/geometry/qgsgeometrymakevalid.cpp b/src/core/geometry/qgsgeometrymakevalid.cpp index 128513a1540..9cc66807c5a 100644 --- a/src/core/geometry/qgsgeometrymakevalid.cpp +++ b/src/core/geometry/qgsgeometrymakevalid.cpp @@ -585,7 +585,7 @@ static GEOSGeometry *LWGEOM_GEOS_makeValidPolygon( const GEOSGeometry *gin, QStr if ( GEOSisEmpty_r( handle, new_area ) ) { - // no more rings can be build with thes edges + // no more rings can be build with the edges GEOSGeom_destroy_r( handle, new_area ); break; } diff --git a/src/core/geometry/qgsgeometryutils.cpp b/src/core/geometry/qgsgeometryutils.cpp index 0f6c77b4b85..27560617d41 100644 --- a/src/core/geometry/qgsgeometryutils.cpp +++ b/src/core/geometry/qgsgeometryutils.cpp @@ -1143,7 +1143,7 @@ QDomElement QgsGeometryUtils::pointsToGML2( const QgsPointSequence &points, QDom // coordinate separator QString cs = QStringLiteral( "," ); - // tupel separator + // tuple separator QString ts = QStringLiteral( " " ); elemCoordinates.setAttribute( QStringLiteral( "cs" ), cs ); diff --git a/src/core/geometry/qgspoint.cpp b/src/core/geometry/qgspoint.cpp index 2a4c794e3e4..e34d4b258d2 100644 --- a/src/core/geometry/qgspoint.cpp +++ b/src/core/geometry/qgspoint.cpp @@ -252,7 +252,7 @@ QDomElement QgsPoint::asGml2( QDomDocument &doc, int precision, const QString &n // coordinate separator QString cs = QStringLiteral( "," ); - // tupel separator + // tuple separator QString ts = QStringLiteral( " " ); elemCoordinates.setAttribute( QStringLiteral( "cs" ), cs ); diff --git a/src/core/gps/qgsqtlocationconnection.cpp b/src/core/gps/qgsqtlocationconnection.cpp index 4343731239a..fe9aa995b07 100644 --- a/src/core/gps/qgsqtlocationconnection.cpp +++ b/src/core/gps/qgsqtlocationconnection.cpp @@ -47,7 +47,7 @@ void QgsQtLocationConnection::broadcastConnectionAvailable() } } -//TODO: Temporarely needed to workaround https://sourceforge.net/p/necessitas/tickets/147/ +//TODO: Temporarily needed to workaround https://sourceforge.net/p/necessitas/tickets/147/ void QgsQtLocationConnection::positionUpdated( const QGeoPositionInfo &info ) { mInfo = info; diff --git a/src/core/layertree/qgslayertreemodel.h b/src/core/layertree/qgslayertreemodel.h index 44080406554..852a187afc1 100644 --- a/src/core/layertree/qgslayertreemodel.h +++ b/src/core/layertree/qgslayertreemodel.h @@ -251,7 +251,7 @@ class CORE_EXPORT QgsLayerTreeModel : public QAbstractItemModel /** * Give the layer tree model hints about the currently associated map view - * so that legend nodes that use map units can be scaled currectly + * so that legend nodes that use map units can be scaled correctly * \since QGIS 2.6 */ void setLegendMapViewData( double mapUnitsPerPixel, int dpi, double scale ); diff --git a/src/core/layertree/qgslayertreemodellegendnode.cpp b/src/core/layertree/qgslayertreemodellegendnode.cpp index 60da9e66dcc..9251067dc9d 100644 --- a/src/core/layertree/qgslayertreemodellegendnode.cpp +++ b/src/core/layertree/qgslayertreemodellegendnode.cpp @@ -67,7 +67,7 @@ QgsLayerTreeModelLegendNode::ItemMetrics QgsLayerTreeModelLegendNode::draw( cons double textHeight = settings.fontHeightCharacterMM( symbolLabelFont, QChar( '0' ) ); // itemHeight here is not really item height, it is only for symbol // vertical alignment purpose, i.e. OK take single line height - // if there are more lines, thos run under the symbol + // if there are more lines, those run under the symbol double itemHeight = std::max( static_cast< double >( settings.symbolSize().height() ), textHeight ); ItemMetrics im; @@ -568,7 +568,7 @@ QSizeF QgsSymbolLegendNode::drawSymbol( const QgsLegendSettings &settings, ItemC const int maxBleed = static_cast< int >( std::ceil( QgsSymbolLayerUtils::estimateMaxSymbolBleed( s, *context ) ) ); //semi transparent layer, so need to draw symbol to an image (to flatten it first) - //create image which is same size as legend rect, in case symbol bleeds outside its alloted space + //create image which is same size as legend rect, in case symbol bleeds outside its allotted space const QSize symbolSize( static_cast< int >( std::round( width * dotsPerMM ) ), static_cast( std::round( height * dotsPerMM ) ) ); const QSize tempImageSize( symbolSize.width() + maxBleed * 2, symbolSize.height() + maxBleed * 2 ); QImage tempImage = QImage( tempImageSize, QImage::Format_ARGB32 ); diff --git a/src/core/layertree/qgslayertreeregistrybridge.h b/src/core/layertree/qgslayertreeregistrybridge.h index de808b0ffd4..a7735b604c4 100644 --- a/src/core/layertree/qgslayertreeregistrybridge.h +++ b/src/core/layertree/qgslayertreeregistrybridge.h @@ -53,7 +53,7 @@ class CORE_EXPORT QgsLayerTreeRegistryBridge : public QObject */ struct InsertionPoint { - //! Construcs an insertion point as layer tree group with its corresponding position. + //! Constructs an insertion point as layer tree group with its corresponding position. InsertionPoint( QgsLayerTreeGroup *group, int position ) : group( group ), position( position ) {} diff --git a/src/core/layout/qgslayoutitemnodeitem.h b/src/core/layout/qgslayoutitemnodeitem.h index f30a988e540..6f68128e0da 100644 --- a/src/core/layout/qgslayoutitemnodeitem.h +++ b/src/core/layout/qgslayoutitemnodeitem.h @@ -158,7 +158,7 @@ class CORE_EXPORT QgsLayoutNodesItem: public QgsLayoutItem */ void rescaleToFitBoundingBox(); - //! Compute an euclidian distance between 2 nodes. + //! Compute an euclidean distance between 2 nodes. double computeDistance( QPointF pt1, QPointF pt2 ) const; //! Update the current scene rectangle for this item. diff --git a/src/core/mesh/qgsmeshrenderersettings.h b/src/core/mesh/qgsmeshrenderersettings.h index 1ee9401d0cb..4f7afb90894 100644 --- a/src/core/mesh/qgsmeshrenderersettings.h +++ b/src/core/mesh/qgsmeshrenderersettings.h @@ -267,15 +267,15 @@ class CORE_EXPORT QgsMeshRendererVectorSettings void readXml( const QDomElement &elem ); private: - double mLineWidth = DEFAULT_LINE_WIDTH; //in milimeters + double mLineWidth = DEFAULT_LINE_WIDTH; //in millimeters QColor mColor = Qt::black; double mFilterMin = -1; //disabled double mFilterMax = -1; //disabled QgsMeshRendererVectorSettings::ArrowScalingMethod mShaftLengthMethod = QgsMeshRendererVectorSettings::ArrowScalingMethod::MinMax; - double mMinShaftLength = 0.8; //in milimeters - double mMaxShaftLength = 10; //in milimeters + double mMinShaftLength = 0.8; //in millimeters + double mMaxShaftLength = 10; //in millimeters double mScaleFactor = 10; - double mFixedShaftLength = 20; //in milimeters + double mFixedShaftLength = 20; //in millimeters double mArrowHeadWidthRatio = 0.15; double mArrowHeadLengthRatio = 0.40; bool mOnUserDefinedGrid = false; diff --git a/src/core/mesh/qgsmeshtimesettings.h b/src/core/mesh/qgsmeshtimesettings.h index d81b4e270d8..6a0cf440c8d 100644 --- a/src/core/mesh/qgsmeshtimesettings.h +++ b/src/core/mesh/qgsmeshtimesettings.h @@ -35,7 +35,7 @@ class CORE_EXPORT QgsMeshTimeSettings { public: - //! Default constructor for relative time formate and 0 offset + //! Default constructor for relative time format and 0 offset QgsMeshTimeSettings(); //! Constructs relative time format settings with defined offset in hours QgsMeshTimeSettings( double relativeTimeOffsetHours, const QString &relativeTimeFormat ); diff --git a/src/core/providers/gdal/qgsgdalprovider.cpp b/src/core/providers/gdal/qgsgdalprovider.cpp index bafe7e41be1..632f2f17e83 100644 --- a/src/core/providers/gdal/qgsgdalprovider.cpp +++ b/src/core/providers/gdal/qgsgdalprovider.cpp @@ -1672,7 +1672,7 @@ QString QgsGdalProvider::buildPyramids( const QList &rasterPyr { QMutexLocker locker( mpMutex ); - //TODO: Consider making rasterPyramidList modifyable by this method to indicate if the pyramid exists after build attempt + //TODO: Consider making rasterPyramidList modifiable by this method to indicate if the pyramid exists after build attempt //without requiring the user to rebuild the pyramid list to get the updated information // @@ -2812,7 +2812,7 @@ void QgsGdalProvider::initBaseDataset() } // It may happen that nodata value given by GDAL is wrong and it has to be // disabled by user, in that case we need another value to be used for nodata - // (for reprojection for example) -> always internaly represent as wider type + // (for reprojection for example) -> always internally represent as wider type // with mInternalNoDataValue in reserve. // Not used #if 0 diff --git a/src/core/providers/meshmemory/qgsmeshmemorydataprovider.h b/src/core/providers/meshmemory/qgsmeshmemorydataprovider.h index 786e542c319..028ec28584b 100644 --- a/src/core/providers/meshmemory/qgsmeshmemorydataprovider.h +++ b/src/core/providers/meshmemory/qgsmeshmemorydataprovider.h @@ -77,7 +77,7 @@ class CORE_EXPORT QgsMeshMemoryDataProvider: public QgsMeshDataProvider /** * Construct a mesh in-memory data provider from data string * - * Data string constains simple definition of vertices and faces + * Data string contains simple definition of vertices and faces * Each entry is separated by "\n" sign and section deliminer "---" * vertex is x and y coordinate separated by comma * face is list of vertex indexes, numbered from 0 @@ -111,7 +111,7 @@ class CORE_EXPORT QgsMeshMemoryDataProvider: public QgsMeshDataProvider /** * Adds dataset to a mesh in-memory data provider from data string * - * Data string constains simple definition of datasets + * Data string contains simple definition of datasets * Each entry is separated by "\n" sign and section deliminer "---" * First section defines the dataset group: Vertex/Face Vector/Scalar Name * Second section defines the group metadata: key: value pairs diff --git a/src/core/providers/ogr/qgsogrprovider.cpp b/src/core/providers/ogr/qgsogrprovider.cpp index 2018cac1171..2019fd2b85d 100644 --- a/src/core/providers/ogr/qgsogrprovider.cpp +++ b/src/core/providers/ogr/qgsogrprovider.cpp @@ -514,7 +514,7 @@ QgsOgrProvider::QgsOgrProvider( QString const &uri, const ProviderOptions &optio { pszDataTypes = GDALGetMetadataItem( mOgrOrigLayer->driver(), GDAL_DMD_CREATIONFIELDDATATYPES, nullptr ); } - // For drivers that advertize their data type, use that instead of the + // For drivers that advertise their data type, use that instead of the // above hardcoded defaults. if ( pszDataTypes ) { @@ -2557,7 +2557,7 @@ bool QgsOgrProvider::doInitialActionsForEdition() // If mUpdateModeStackDepth > 0, it means that an updateMode is already active and that we have write access if ( mUpdateModeStackDepth == 0 ) { - QgsDebugMsg( QStringLiteral( "Enter update mode implictly" ) ); + QgsDebugMsg( QStringLiteral( "Enter update mode implicitly" ) ); if ( !_enterUpdateMode( true ) ) return false; } @@ -3941,7 +3941,7 @@ GDALDatasetH QgsOgrProviderUtils::GDALOpenWrapper( const char *pszPath, bool bUp // For GeoPackage, we force opening of the file in WAL (Write Ahead Log) // mode so as to avoid readers blocking writer(s), and vice-versa. // https://www.sqlite.org/wal.html - // But only do that on a local file since WAL is advertized not to work + // But only do that on a local file since WAL is advertised not to work // on network shares CPLSetThreadLocalConfigOption( "OGR_SQLITE_JOURNAL", "WAL" ); bIsLocalGpkg = true; diff --git a/src/core/qgsclipper.h b/src/core/qgsclipper.h index 1b24fc438ea..72d59f811d8 100644 --- a/src/core/qgsclipper.h +++ b/src/core/qgsclipper.h @@ -50,7 +50,7 @@ class CORE_EXPORT QgsClipper // values are +/-32767, but we allow a little bit of space for // rounding errors. - // You may wonder why the clipping is done to these coordindates + // You may wonder why the clipping is done to these coordinates // rather than the boundaries of the qgis canvas. Reasons include: // - making the boundaries static const allows the compiler to // optimise the code that uses these values more than if they changed @@ -110,7 +110,7 @@ class CORE_EXPORT QgsClipper private: - // Used when testing for equivalance to 0.0 + // Used when testing for equivalence to 0.0 static const double SMALL_NUM; // Trims the given feature to the given boundary. Returns the diff --git a/src/core/qgscolorramp.cpp b/src/core/qgscolorramp.cpp index 7ea318df993..a6ea688a8d3 100644 --- a/src/core/qgscolorramp.cpp +++ b/src/core/qgscolorramp.cpp @@ -739,7 +739,7 @@ bool QgsCptCityColorRamp::loadFile() mFileLoaded = false; mStops.clear(); QMap >::const_iterator it, prev; - // first detect if file is gradient is continuous or dicrete + // first detect if file is gradient is continuous or discrete // discrete: stop contains 2 colors and first color is identical to previous second // multi: stop contains 2 colors and no relation with previous stop mDiscrete = false; diff --git a/src/core/qgscredentials.h b/src/core/qgscredentials.h index 9aab8ddc6e7..ea73caff6bb 100644 --- a/src/core/qgscredentials.h +++ b/src/core/qgscredentials.h @@ -84,7 +84,7 @@ class CORE_EXPORT QgsCredentials static QgsCredentials *instance(); /** - * Lock the instance against access from multiple threads. This does not really lock access to get/put methds, + * Lock the instance against access from multiple threads. This does not really lock access to get/put methods, * it will just prevent other threads to lock the instance and continue the execution. When the class is used * from non-GUI threads, they should call lock() before the get/put calls to avoid race conditions. * \since QGIS 2.4 diff --git a/src/core/qgsgmlschema.cpp b/src/core/qgsgmlschema.cpp index 00ec83152c8..6f10ae26df1 100644 --- a/src/core/qgsgmlschema.cpp +++ b/src/core/qgsgmlschema.cpp @@ -88,7 +88,7 @@ bool QgsGmlSchema::parseXSD( const QByteArray &xml ) QList elementElements = domElements( docElem, QStringLiteral( "element" ) ); - //QgsDebugMsg( QStringLiteral( "%1 elemets read" ).arg( elementElements.size() ) ); + //QgsDebugMsg( QStringLiteral( "%1 elements read" ).arg( elementElements.size() ) ); const auto constElementElements = elementElements; for ( const QDomElement &elementElement : constElementElements ) diff --git a/src/core/qgslabelfeature.h b/src/core/qgslabelfeature.h index bbffddd57b1..34e06d336af 100644 --- a/src/core/qgslabelfeature.h +++ b/src/core/qgslabelfeature.h @@ -359,7 +359,7 @@ class CORE_EXPORT QgsLabelFeature //! Sets text of the label void setLabelText( const QString &text ) { mLabelText = text; } - //! Gets additional infor required for curved label placement. Returns NULLPTR if not set + //! Gets additional info required for curved label placement. Returns NULLPTR if not set pal::LabelInfo *curvedLabelInfo() const { return mInfo; } //! takes ownership of the instance void setCurvedLabelInfo( pal::LabelInfo *info ) { mInfo = info; } diff --git a/src/core/qgsogcutils.cpp b/src/core/qgsogcutils.cpp index 3a8c2144105..e4dd7b183c2 100644 --- a/src/core/qgsogcutils.cpp +++ b/src/core/qgsogcutils.cpp @@ -856,24 +856,24 @@ bool QgsOgcUtils::readGMLCoordinates( QgsPolylineXY &coords, const QDomElement & } QStringList tupels = elem.text().split( tupelSeparator, QString::SkipEmptyParts ); - QStringList tupel_coords; + QStringList tuple_coords; double x, y; bool conversionSuccess; QStringList::const_iterator it; for ( it = tupels.constBegin(); it != tupels.constEnd(); ++it ) { - tupel_coords = ( *it ).split( coordSeparator, QString::SkipEmptyParts ); - if ( tupel_coords.size() < 2 ) + tuple_coords = ( *it ).split( coordSeparator, QString::SkipEmptyParts ); + if ( tuple_coords.size() < 2 ) { continue; } - x = tupel_coords.at( 0 ).toDouble( &conversionSuccess ); + x = tuple_coords.at( 0 ).toDouble( &conversionSuccess ); if ( !conversionSuccess ) { return true; } - y = tupel_coords.at( 1 ).toDouble( &conversionSuccess ); + y = tuple_coords.at( 1 ).toDouble( &conversionSuccess ); if ( !conversionSuccess ) { return true; @@ -1141,7 +1141,7 @@ QDomElement QgsOgcUtils::geometryToGML( const QgsGeometry &geometry, QDomDocumen // coordinate separator QString cs = QStringLiteral( "," ); - // tupel separator + // tuple separator QString ts = QStringLiteral( " " ); // coord element tagname QDomElement baseCoordElem; @@ -1668,7 +1668,7 @@ static const QMap BINARY_OPERATORS_TAG_NAMES_MAP { QStringLiteral( "PropertyIsLessThan" ), QgsExpressionNodeBinaryOperator::boLT }, { QStringLiteral( "PropertyIsGreaterThan" ), QgsExpressionNodeBinaryOperator::boGT }, { QStringLiteral( "PropertyIsLike" ), QgsExpressionNodeBinaryOperator::boLike }, - // arithmetics + // arithmetic { QStringLiteral( "Add" ), QgsExpressionNodeBinaryOperator::boPlus }, { QStringLiteral( "Sub" ), QgsExpressionNodeBinaryOperator::boMinus }, { QStringLiteral( "Mul" ), QgsExpressionNodeBinaryOperator::boMul }, diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp index 0d4759228cb..d1fafb4d0eb 100644 --- a/src/core/qgsproject.cpp +++ b/src/core/qgsproject.cpp @@ -94,7 +94,7 @@ QStringList makeKeyTokens_( const QString &scope, const QString &key ) // be sure to include the canonical root node keyTokens.push_front( QStringLiteral( "properties" ) ); - //check validy of keys since an unvalid xml name will will be dropped upon saving the xml file. If not valid, we print a message to the console. + //check validy of keys since an invalid xml name will will be dropped upon saving the xml file. If not valid, we print a message to the console. for ( int i = 0; i < keyTokens.size(); ++i ) { QString keyToken = keyTokens.at( i ); diff --git a/src/core/qgsprojectproperty.cpp b/src/core/qgsprojectproperty.cpp index 643a40ce612..4b1558ad31d 100644 --- a/src/core/qgsprojectproperty.cpp +++ b/src/core/qgsprojectproperty.cpp @@ -220,7 +220,7 @@ bool QgsProjectPropertyValue::readXml( const QDomNode &keyNode ) #endif default : - QgsDebugMsg( QStringLiteral( "unsupported value type %1 .. not propertly translated to QVariant" ).arg( typeString ) ); + QgsDebugMsg( QStringLiteral( "unsupported value type %1 .. not properly translated to QVariant" ).arg( typeString ) ); } return true; diff --git a/src/core/qgssqlexpressioncompiler.h b/src/core/qgssqlexpressioncompiler.h index ebbaf3cb41b..8a4c289febe 100644 --- a/src/core/qgssqlexpressioncompiler.h +++ b/src/core/qgssqlexpressioncompiler.h @@ -111,7 +111,7 @@ class CORE_EXPORT QgsSqlExpressionCompiler * Returns a quoted attribute value, in the format expected by the provider. * Derived classes should override this if special handling of attribute values is required. * \param value value to quote - * \param ok wil be set to TRUE if value can be compiled + * \param ok will be set to TRUE if value can be compiled * \see quotedIdentifier() */ virtual QString quotedValue( const QVariant &value, bool &ok ); diff --git a/src/core/qgsstringutils.h b/src/core/qgsstringutils.h index 487d0309b06..2b71dafceb5 100644 --- a/src/core/qgsstringutils.h +++ b/src/core/qgsstringutils.h @@ -279,7 +279,7 @@ class CORE_EXPORT QgsStringUtils /** * Returns a string with characters having vertical representation form substituted. * \param string input string - * \returns string with substition applied + * \returns string with substitution applied * \since QGIS 3.10 */ static QString substituteVerticalCharacters( QString string ); diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp index a539f1f177f..187a8882953 100644 --- a/src/core/qgsvectorfilewriter.cpp +++ b/src/core/qgsvectorfilewriter.cpp @@ -3266,7 +3266,7 @@ QList< QgsVectorFileWriter::DriverDetails > QgsVectorFileWriter::ogrDriverList( // OGR SQLite driver is compiled with SpatiaLite support. // We have HAVE_SPATIALITE in QGIS, but that may differ from OGR // http://lists.osgeo.org/pipermail/gdal-dev/2012-November/034580.html - // -> test if creation failes + // -> test if creation fails QString option = QStringLiteral( "SPATIALITE=YES" ); char *options[2] = { CPLStrdup( option.toLocal8Bit().constData() ), nullptr }; OGRSFDriverH poDriver; diff --git a/src/core/qgsvectorlayercache.cpp b/src/core/qgsvectorlayercache.cpp index 3b9ecd0f26c..01295f2b3b3 100644 --- a/src/core/qgsvectorlayercache.cpp +++ b/src/core/qgsvectorlayercache.cpp @@ -378,7 +378,7 @@ bool QgsVectorLayerCache::canUseCacheForRequest( const QgsFeatureRequest &featur QgsFeatureIterator QgsVectorLayerCache::getFeatures( const QgsFeatureRequest &featureRequest ) { QgsFeatureIterator it; - bool requiresWriterIt = true; // If a not yet cached, but cachable request is made, this stays true. + bool requiresWriterIt = true; // If a not yet cached, but cacheable request is made, this stays true. if ( checkInformationCovered( featureRequest ) ) { diff --git a/src/core/raster/qgsmultibandcolorrenderer.cpp b/src/core/raster/qgsmultibandcolorrenderer.cpp index 43d5676384b..f738a6af3e9 100644 --- a/src/core/raster/qgsmultibandcolorrenderer.cpp +++ b/src/core/raster/qgsmultibandcolorrenderer.cpp @@ -189,7 +189,7 @@ QgsRasterBlock *QgsMultiBandColorRenderer::block( int bandNo, QgsRectangle cons bandBlocks[*bandIt] = mInput->block( *bandIt, extent, width, height, feedback ); if ( !bandBlocks[*bandIt] ) { - // We should free the alloced mem from block(). + // We should free the allocated mem from block(). QgsDebugMsg( QStringLiteral( "No input band" ) ); --bandIt; for ( ; bandIt != bands.constBegin(); --bandIt ) @@ -427,7 +427,7 @@ void QgsMultiBandColorRenderer::toSld( QDomDocument &doc, QDomElement &element, #if 0 // TODO: the following jumped code is necessary to avoid to export channelSelection in // case it's set as default value. The drawback is that it's necessary to calc band - // statistics that can be really slow depending on dataProvider and rastr localtion. + // statistics that can be really slow depending on dataProvider and rastr location. // this is the reason this part of code is commented and the channelSelection is // always exported. // diff --git a/src/core/raster/qgsrasternuller.h b/src/core/raster/qgsrasternuller.h index d37807b9fc6..a6af9264e9e 100644 --- a/src/core/raster/qgsrasternuller.h +++ b/src/core/raster/qgsrasternuller.h @@ -56,9 +56,9 @@ class CORE_EXPORT QgsRasterNuller : public QgsRasterInterface void setOutputNoDataValue( int bandNo, double noData ); private: - // no data indext from 0 + // no data indexed from 0 QVector< QgsRasterRangeList > mNoData; - // no data to be set in output, indexed form 0 + // no data to be set in output, indexed from 0 QVector mOutputNoData; QVector mHasOutputNoData; }; diff --git a/src/core/raster/qgsrasterrenderer.cpp b/src/core/raster/qgsrasterrenderer.cpp index fd4f54c2e5e..33f399e1893 100644 --- a/src/core/raster/qgsrasterrenderer.cpp +++ b/src/core/raster/qgsrasterrenderer.cpp @@ -73,7 +73,7 @@ bool QgsRasterRenderer::setInput( QgsRasterInterface *input ) for ( int i = 1; i <= input->bandCount(); i++ ) { const Qgis::DataType bandType = input->dataType( i ); - // we always allow unknown data types to connect - overwise invalid layers cannot setup + // we always allow unknown data types to connect - otherwise invalid layers cannot setup // their original rendering pipe and this information is lost if ( bandType != Qgis::UnknownDataType && !QgsRasterBlock::typeIsNumeric( bandType ) ) { diff --git a/src/core/raster/qgsrastertransparency.h b/src/core/raster/qgsrastertransparency.h index d0f0667f420..c0657e8a209 100644 --- a/src/core/raster/qgsrastertransparency.h +++ b/src/core/raster/qgsrastertransparency.h @@ -40,7 +40,7 @@ class CORE_EXPORT QgsRasterTransparency QgsRasterTransparency() = default; // - // Structs to hold transparent pixel vlaues + // Structs to hold transparent pixel values // struct TransparentThreeValuePixel { diff --git a/src/core/raster/qgssinglebandgrayrenderer.cpp b/src/core/raster/qgssinglebandgrayrenderer.cpp index 5f28745ee4f..af91224fe95 100644 --- a/src/core/raster/qgssinglebandgrayrenderer.cpp +++ b/src/core/raster/qgssinglebandgrayrenderer.cpp @@ -270,8 +270,9 @@ void QgsSingleBandGrayRenderer::toSld( QDomDocument &doc, QDomElement &element, contrastEnhancement()->toSld( doc, contrastEnhancementElem ); // do changes to minValue/maxValues depending on stretching algorithm. This is necessary because - // geoserver do a first stretch on min/max, then apply colo map rules. In some combination is necessary - // to use real min/max values and in othere the actual edited min/max values + // geoserver does a first stretch on min/max, then applies color map rules. + // In some combination it is necessary to use real min/max values and in + // others the actual edited min/max values switch ( contrastEnhancement()->contrastEnhancementAlgorithm() ) { case QgsContrastEnhancement::StretchAndClipToMinimumMaximum: diff --git a/src/core/symbology/qgsarrowsymbollayer.cpp b/src/core/symbology/qgsarrowsymbollayer.cpp index a04680cfec9..daba20d64a6 100644 --- a/src/core/symbology/qgsarrowsymbollayer.cpp +++ b/src/core/symbology/qgsarrowsymbollayer.cpp @@ -193,7 +193,7 @@ void QgsArrowSymbolLayer::stopRender( QgsSymbolRenderContext &context ) mSymbol->stopRender( context.renderContext() ); } -inline qreal euclidian_distance( QPointF po, QPointF pd ) +inline qreal euclidean_distance( QPointF po, QPointF pd ) { return std::sqrt( ( po.x() - pd.x() ) * ( po.x() - pd.x() ) + ( po.y() - pd.y() ) * ( po.y() - pd.y() ) ); } @@ -206,7 +206,7 @@ QPolygonF straightArrow( QPointF po, QPointF pd, { QPolygonF polygon; // implicitly shared // vector length - qreal length = euclidian_distance( po, pd ); + qreal length = euclidean_distance( po, pd ); // shift points if there is not enough room for the head(s) if ( ( headType == QgsArrowSymbolLayer::HeadSingle ) && ( length < headWidth ) ) @@ -485,7 +485,7 @@ QPolygonF curvedArrow( QPointF po, QPointF pm, QPointF pd, if ( direction * deltaAngle < 0.0 ) deltaAngle = deltaAngle + direction * 2 * M_PI; - qreal length = euclidian_distance( po, pd ); + qreal length = euclidean_distance( po, pd ); // for close points and deltaAngle < 180, draw a straight line if ( std::fabs( deltaAngle ) < M_PI && ( ( ( headType == QgsArrowSymbolLayer::HeadSingle ) && ( length < headWidth ) ) || ( ( headType == QgsArrowSymbolLayer::HeadReversed ) && ( length < headWidth ) ) || @@ -494,7 +494,7 @@ QPolygonF curvedArrow( QPointF po, QPointF pm, QPointF pd, return straightArrow( po, pd, startWidth, width, headWidth, headHeight, headType, arrowType, offset ); } - // ajust coordinates to include offset + // adjust coordinates to include offset circleRadius += offset; po = circlePoint( circleCenter, circleRadius, angle_o ); pm = circlePoint( circleCenter, circleRadius, angle_m ); diff --git a/src/core/symbology/qgssymbol.cpp b/src/core/symbology/qgssymbol.cpp index 463f9ed0ae1..9cc6706cacf 100644 --- a/src/core/symbology/qgssymbol.cpp +++ b/src/core/symbology/qgssymbol.cpp @@ -597,7 +597,7 @@ QImage QgsSymbol::bigSymbolPreviewImage( QgsExpressionContext *expressionContext QPainter p( &preview ); p.setRenderHint( QPainter::Antialiasing ); - p.translate( 0.5, 0.5 ); // shift by half a pixel to avoid blurring due antialising + p.translate( 0.5, 0.5 ); // shift by half a pixel to avoid blurring due antialiasing if ( mType == QgsSymbol::Marker ) { diff --git a/src/core/symbology/qgssymbollayerutils.cpp b/src/core/symbology/qgssymbollayerutils.cpp index fabf471fc99..44d9affe345 100644 --- a/src/core/symbology/qgssymbollayerutils.cpp +++ b/src/core/symbology/qgssymbollayerutils.cpp @@ -874,7 +874,7 @@ QPixmap QgsSymbolLayerUtils::colorRampPreviewPixmap( QgsColorRamp *ramp, QSize s //draw stippled background, for transparent images drawStippledBackground( &painter, QRect( padding, padding, size.width() - padding * 2, size.height() - padding * 2 ) ); - // antialising makes the colors duller, and no point in antialiasing a color ramp + // antialiasing makes the colors duller, and no point in antialiasing a color ramp // painter.setRenderHint( QPainter::Antialiasing ); for ( int i = 0; i < size.width(); i++ ) { @@ -1250,7 +1250,7 @@ bool QgsSymbolLayerUtils::createSymbolLayerListFromSld( QDomElement &element, switch ( geomType ) { case QgsWkbTypes::PolygonGeometry: - // polygon layer and point symbolizer: draw poligon centroid + // polygon layer and point symbolizer: draw polygon centroid l = QgsApplication::symbolLayerRegistry()->createSymbolLayerFromSld( QStringLiteral( "CentroidFill" ), element ); if ( l ) layers.append( l ); diff --git a/src/gui/auth/qgsauthconfigedit.cpp b/src/gui/auth/qgsauthconfigedit.cpp index 9e75d7c4dc2..1038793437a 100644 --- a/src/gui/auth/qgsauthconfigedit.cpp +++ b/src/gui/auth/qgsauthconfigedit.cpp @@ -53,7 +53,7 @@ QgsAuthConfigEdit::QgsAuthConfigEdit( QWidget *parent, const QString &authcfg, c mAuthNotify = new QLabel( msg, this ); mAuthNotifyLayout->addWidget( mAuthNotify ); - mAuthCfg.clear(); // otherwise will contiue to try authenticate (and fail) after save + mAuthCfg.clear(); // otherwise will continue to try authenticate (and fail) after save buttonBox->button( QDialogButtonBox::Save )->setEnabled( false ); } else diff --git a/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp b/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp index d969a1da99e..51720d1be17 100644 --- a/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp +++ b/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp @@ -131,7 +131,7 @@ void QgsEditorWidgetWrapper::updateValues( const QVariant &value, const QVariant // this method should be made pure virtual in QGIS 4 Q_UNUSED( additionalValues ); Q_NOWARN_DEPRECATED_PUSH - // avoid infinte recursive loop + // avoid infinite recursive loop if ( !isRunningDeprecatedSetValue ) setValue( value ); Q_NOWARN_DEPRECATED_POP diff --git a/src/gui/editorwidgets/qgsdatetimeedit.cpp b/src/gui/editorwidgets/qgsdatetimeedit.cpp index 46fc99a4a1e..d1988248d59 100644 --- a/src/gui/editorwidgets/qgsdatetimeedit.cpp +++ b/src/gui/editorwidgets/qgsdatetimeedit.cpp @@ -88,7 +88,7 @@ void QgsDateTimeEdit::setEmpty() void QgsDateTimeEdit::mousePressEvent( QMouseEvent *event ) { // catch mouse press on the button (when the current value is null) - // in non-calendar mode: modifiy the date so it leads to showing current date (don't bother about time) + // in non-calendar mode: modify the date so it leads to showing current date (don't bother about time) // in calendar mode: be sure NULL is displayed when needed and show page of current date in calendar widget bool updateCalendar = false; diff --git a/src/gui/layout/qgslayoutviewtooladdnodeitem.cpp b/src/gui/layout/qgslayoutviewtooladdnodeitem.cpp index cfc2c1c3ef3..235e32515aa 100644 --- a/src/gui/layout/qgslayoutviewtooladdnodeitem.cpp +++ b/src/gui/layout/qgslayoutviewtooladdnodeitem.cpp @@ -171,7 +171,7 @@ void QgsLayoutViewToolAddNodeItem::moveTemporaryNode( QPointF scenePoint, Qt::Ke QPointF start = mPolygon.at( mPolygon.size() - 2 ); QLineF newLine = QLineF( start, scenePoint ); - //movement is contrained to 45 degree angles + //movement is constrained to 45 degree angles double angle = QgsLayoutUtils::snappedAngle( newLine.angle() ); newLine.setAngle( angle ); scenePoint = newLine.p2(); diff --git a/src/gui/qgscolorwidgets.h b/src/gui/qgscolorwidgets.h index cfa4dd0a7f2..b1be651a362 100644 --- a/src/gui/qgscolorwidgets.h +++ b/src/gui/qgscolorwidgets.h @@ -176,7 +176,7 @@ class GUI_EXPORT QgsColorWidget : public QWidget int hue() const; /** - * Alters a color by modifiying the value of a specific color component + * Alters a color by modifying the value of a specific color component * \param color color to alter * \param component color component to alter * \param newValue new value of color component. Values are automatically clipped to a diff --git a/src/gui/qgsexpressionbuilderwidget.h b/src/gui/qgsexpressionbuilderwidget.h index 38f33ccd8a0..c3a3ae8c48a 100644 --- a/src/gui/qgsexpressionbuilderwidget.h +++ b/src/gui/qgsexpressionbuilderwidget.h @@ -207,7 +207,7 @@ class GUI_EXPORT QgsExpressionBuilderWidget : public QWidget, private Ui::QgsExp /** * Registers a node item for the expression builder. - * \param group The group the item will be show in the tree view. If the group doesn't exsit it will be created. + * \param group The group the item will be show in the tree view. If the group doesn't exist it will be created. * \param label The label that is show to the user for the item in the tree. * \param expressionText The text that is inserted into the expression area when the user double clicks on the item. * \param helpText The help text that the user will see when item is selected. diff --git a/src/gui/qgsfieldcombobox.h b/src/gui/qgsfieldcombobox.h index 8598e173615..67721efa7cb 100644 --- a/src/gui/qgsfieldcombobox.h +++ b/src/gui/qgsfieldcombobox.h @@ -48,7 +48,7 @@ class GUI_EXPORT QgsFieldComboBox : public QComboBox */ explicit QgsFieldComboBox( QWidget *parent SIP_TRANSFERTHIS = nullptr ); - //! setFilters allows fitering according to the type of field + //! setFilters allows filtering according to the type of field void setFilters( QgsFieldProxyModel::Filters filters ); //! currently used filter on list of fields diff --git a/src/gui/qgsfieldexpressionwidget.h b/src/gui/qgsfieldexpressionwidget.h index 7e3342c0fe3..dda4083cac1 100644 --- a/src/gui/qgsfieldexpressionwidget.h +++ b/src/gui/qgsfieldexpressionwidget.h @@ -73,7 +73,7 @@ class GUI_EXPORT QgsFieldExpressionWidget : public QWidget //! Returns the title used for the expression dialog const QString expressionDialogTitle() { return mExpressionDialogTitle; } - //! setFilters allows fitering according to the type of field + //! setFilters allows filtering according to the type of field void setFilters( QgsFieldProxyModel::Filters filters ); /** diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h index 2ccaae17ff5..295dd2705d1 100644 --- a/src/gui/qgsmapcanvas.h +++ b/src/gui/qgsmapcanvas.h @@ -479,7 +479,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView //! used to determine if anti-aliasing is enabled or not void enableAntiAliasing( bool flag ); - //! TRUE if antialising is enabled + //! TRUE if antialiasing is enabled bool antiAliasingEnabled() const { return mSettings.testFlag( QgsMapSettings::Antialiasing ); } //! sets map tile rendering flag diff --git a/src/gui/qgsmaplayercombobox.h b/src/gui/qgsmaplayercombobox.h index ca3964957ce..49c4569aa65 100644 --- a/src/gui/qgsmaplayercombobox.h +++ b/src/gui/qgsmaplayercombobox.h @@ -47,7 +47,7 @@ class GUI_EXPORT QgsMapLayerComboBox : public QComboBox */ explicit QgsMapLayerComboBox( QWidget *parent SIP_TRANSFERTHIS = nullptr ); - //! setFilters allows fitering according to layer type and/or geometry type. + //! setFilters allows filtering according to layer type and/or geometry type. void setFilters( QgsMapLayerProxyModel::Filters filters ) { mProxyModel->setFilters( filters ); } //! currently used filter on list layers diff --git a/src/gui/qgsprojectionselectiontreewidget.cpp b/src/gui/qgsprojectionselectiontreewidget.cpp index e1da2102cd0..65db9a7c6b7 100644 --- a/src/gui/qgsprojectionselectiontreewidget.cpp +++ b/src/gui/qgsprojectionselectiontreewidget.cpp @@ -374,7 +374,7 @@ QString QgsProjectionSelectionTreeWidget::getSelectedExpression( const QString & // // set up the database - // XXX We could probabaly hold the database open for the life of this object, + // XXX We could probably hold the database open for the life of this object, // assuming that it will never be used anywhere else. Given the low overhead, // opening it each time seems to be a reasonable approach at this time. sqlite3 *database = nullptr; diff --git a/src/gui/qgsscalevisibilitydialog.h b/src/gui/qgsscalevisibilitydialog.h index 542c806835b..580a0135e0c 100644 --- a/src/gui/qgsscalevisibilitydialog.h +++ b/src/gui/qgsscalevisibilitydialog.h @@ -46,7 +46,7 @@ class GUI_EXPORT QgsScaleVisibilityDialog : public QDialog explicit QgsScaleVisibilityDialog( QWidget *parent SIP_TRANSFERTHIS = nullptr, const QString &title = QString(), QgsMapCanvas *mapCanvas = nullptr ); /** - * Returns TRUE if scale based visibilty is enabled. + * Returns TRUE if scale based visibility is enabled. */ bool hasScaleVisibility() const; diff --git a/src/gui/symbology/qgssymbolselectordialog.h b/src/gui/symbology/qgssymbolselectordialog.h index e2abb9df36e..a1693759926 100644 --- a/src/gui/symbology/qgssymbolselectordialog.h +++ b/src/gui/symbology/qgssymbolselectordialog.h @@ -199,7 +199,7 @@ class GUI_EXPORT QgsSymbolSelectorWidget: public QgsPanelWidget, private Ui::Qgs signals: /** - * Emiited when a symbol is modified in the widget. + * Emitted when a symbol is modified in the widget. */ void symbolModified(); diff --git a/src/plugins/evis/databaseconnection/evisdatabaselayerfieldselectiongui.cpp b/src/plugins/evis/databaseconnection/evisdatabaselayerfieldselectiongui.cpp index e74049ffbb9..948cf9f3e64 100644 --- a/src/plugins/evis/databaseconnection/evisdatabaselayerfieldselectiongui.cpp +++ b/src/plugins/evis/databaseconnection/evisdatabaselayerfieldselectiongui.cpp @@ -56,7 +56,7 @@ void eVisDatabaseLayerFieldSelectionGui::setFieldList( QStringList *fieldList ) cboxXCoordinate->addItem( fieldList->at( x ) ); cboxYCoordinate->addItem( fieldList->at( x ) ); - //Take a guess in an attempt to auto select the currect field + //Take a guess in an attempt to auto select the correct field if ( fieldList->at( x ).contains( QRegExp( "( ^x|^lon|^east )", Qt::CaseInsensitive ) ) ) { xCoordinateIndex = x; diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp index d2e85490484..5738d7991e0 100644 --- a/src/plugins/georeferencer/qgsgeorefplugingui.cpp +++ b/src/plugins/georeferencer/qgsgeorefplugingui.cpp @@ -733,7 +733,7 @@ void QgsGeorefPluginGui::extentsChangedGeorefCanvas() mExtentsChangedRecursionGuard = true; // Just set the whole extent for now - // TODO: better fitting function which acounts for differing aspect ratios etc. + // TODO: better fitting function which accounts for differing aspect ratios etc. mIface->mapCanvas()->setExtent( boundingBox ); mIface->mapCanvas()->refresh(); mExtentsChangedRecursionGuard = false; @@ -763,7 +763,7 @@ void QgsGeorefPluginGui::extentsChangedQGisCanvas() mExtentsChangedRecursionGuard = true; // Just set the whole extent for now - // TODO: better fitting function which acounts for differing aspect ratios etc. + // TODO: better fitting function which accounts for differing aspect ratios etc. mCanvas->setExtent( rectMap ); mCanvas->refresh(); mExtentsChangedRecursionGuard = false; diff --git a/src/plugins/georeferencer/qgsimagewarper.cpp b/src/plugins/georeferencer/qgsimagewarper.cpp index 8e55d107566..a277ed9ccb4 100644 --- a/src/plugins/georeferencer/qgsimagewarper.cpp +++ b/src/plugins/georeferencer/qgsimagewarper.cpp @@ -182,7 +182,7 @@ int QgsImageWarper::warpFile( const QString &input, if ( destResY > 0.0 ) destResY = -destResY; - // Assert that the north-up convention is fullfiled by GDALSuggestedWarpOutput (should always be the case) + // Assert that the north-up convention is fulfilled by GDALSuggestedWarpOutput (should always be the case) // Asserts are bad as they just crash out, changed to just return false. TS if ( adfGeoTransform[0] <= 0.0 || adfGeoTransform[5] >= 0.0 ) { diff --git a/src/plugins/globe/CMakeModules/OsgEarthMacroUtils.cmake b/src/plugins/globe/CMakeModules/OsgEarthMacroUtils.cmake index 7f0ba7562eb..239ab4b0603 100644 --- a/src/plugins/globe/CMakeModules/OsgEarthMacroUtils.cmake +++ b/src/plugins/globe/CMakeModules/OsgEarthMacroUtils.cmake @@ -138,7 +138,7 @@ ENDMACRO(LINK_CORELIB_DEFAULT CORELIB_NAME) # macro for common setup of plugins, examples and applications it expect some variables to be set: # either within the local CMakeLists or higher in hierarchy # TARGET_NAME is the name of the folder and of the actually .exe or .so or .dll -# TARGET_TARGETNAME is the name of the target , this get buit out of a prefix, if present and TARGET_TARGETNAME +# TARGET_TARGETNAME is the name of the target, this get built out of a prefix, if present and TARGET_TARGETNAME # TARGET_SRC are the sources of the target # TARGET_H are the eventual headers of the target # TARGET_LIBRARIES are the libraries to link to that are internal to the project and have d suffix for debug diff --git a/src/plugins/grass/qgsgrassmapcalc.cpp b/src/plugins/grass/qgsgrassmapcalc.cpp index bbbe3e5811e..97410da3fa7 100644 --- a/src/plugins/grass/qgsgrassmapcalc.cpp +++ b/src/plugins/grass/qgsgrassmapcalc.cpp @@ -266,7 +266,7 @@ void QgsGrassMapcalc::mousePressEvent( QMouseEvent *e ) break; case Select: - // Cleare previous + // Cleared previous if ( mObject ) { mObject->setSelected( false ); diff --git a/src/plugins/grass/qgsgrassmapcalc.h b/src/plugins/grass/qgsgrassmapcalc.h index 6f0c1b1874f..7801bb233cb 100644 --- a/src/plugins/grass/qgsgrassmapcalc.h +++ b/src/plugins/grass/qgsgrassmapcalc.h @@ -406,7 +406,7 @@ class QgsGrassMapcalcObject: public QGraphicsRectItem, public QgsGrassMapcalcIte // Half size of socket symbol int mSocketHalf; - // Margin beteween mRect and QCanvasRectangle.rect() + // Margin between mRect and QCanvasRectangle.rect() int mMargin; // Space between text boxes diff --git a/src/plugins/grass/qgsgrassmoduleinput.cpp b/src/plugins/grass/qgsgrassmoduleinput.cpp index eb8e34733c2..fd8f61fee3b 100644 --- a/src/plugins/grass/qgsgrassmoduleinput.cpp +++ b/src/plugins/grass/qgsgrassmoduleinput.cpp @@ -290,7 +290,7 @@ void QgsGrassModuleInputModel::reload() Q_FOREACH ( const QString &dirName, dirNames ) { QString dirPath = mLocationPath + "/" + dirName; - // Watch the dir in any case, WIND mabe created later + // Watch the dir in any case, WIND maybe created later mWatcher->addPath( dirPath ); Q_FOREACH ( const QString &watchedDir, watchedDirs() ) diff --git a/src/plugins/grass/qgsgrassmoduleparam.h b/src/plugins/grass/qgsgrassmoduleparam.h index eca19aab306..a8e2f583702 100644 --- a/src/plugins/grass/qgsgrassmoduleparam.h +++ b/src/plugins/grass/qgsgrassmoduleparam.h @@ -110,7 +110,7 @@ class QgsGrassModuleParam //! Item's id QString id() { return mId; } - //! Check if otpion is ready + //! Check if option is ready // Returns empty string or error message virtual QString ready() { return QString() ; } diff --git a/src/plugins/grass/qtermwidget/History.cpp b/src/plugins/grass/qtermwidget/History.cpp index eb6fec167f1..1f170bd685e 100644 --- a/src/plugins/grass/qtermwidget/History.cpp +++ b/src/plugins/grass/qtermwidget/History.cpp @@ -205,7 +205,7 @@ bool HistoryScroll::hasScroll() /* The history scroll makes a Row(Row(Cell)) from two history buffers. The index buffer contains - start of line positions which refere to the cells + start of line positions which refers to the cells buffer. Note that index[0] addresses the second line diff --git a/src/plugins/grass/qtermwidget/Screen.cpp b/src/plugins/grass/qtermwidget/Screen.cpp index cc4372eb7e4..17fc66b656e 100644 --- a/src/plugins/grass/qtermwidget/Screen.cpp +++ b/src/plugins/grass/qtermwidget/Screen.cpp @@ -526,7 +526,7 @@ QVector Screen::getLineProperties( int startLine , int endLine ) c void Screen::reset(bool clearScreen) { setMode(MODE_Wrap ); saveMode(MODE_Wrap ); // wrap at end of margin - resetMode(MODE_Origin); saveMode(MODE_Origin); // position refere to [1,1] + resetMode(MODE_Origin); saveMode(MODE_Origin); // position refers to [1,1] resetMode(MODE_Insert); saveMode(MODE_Insert); // overstroke setMode(MODE_Cursor); // cursor visible resetMode(MODE_Screen); // screen not inverse diff --git a/src/plugins/grass/scripts/v.class.mlpy.qgis.py b/src/plugins/grass/scripts/v.class.mlpy.qgis.py index f44c101de3c..4d8cf912a09 100644 --- a/src/plugins/grass/scripts/v.class.mlpy.qgis.py +++ b/src/plugins/grass/scripts/v.class.mlpy.qgis.py @@ -331,7 +331,7 @@ def main(): updateColumn(mapName, columnWithClass, cats, classes) - # TODO: outupt as a new map (use INSERT, can be faster) + # TODO: output as a new map (use INSERT, can be faster) # TODO: output as a new layer? diff --git a/src/providers/grass/qgsgrassfeatureiterator.cpp b/src/providers/grass/qgsgrassfeatureiterator.cpp index f55daa2f045..850651a00e1 100644 --- a/src/providers/grass/qgsgrassfeatureiterator.cpp +++ b/src/providers/grass/qgsgrassfeatureiterator.cpp @@ -61,7 +61,7 @@ QgsGrassFeatureIterator::QgsGrassFeatureIterator( QgsGrassFeatureSource *source, : QgsAbstractFeatureIteratorFromSource( source, ownSource, request ) { - // WARNING: the iterater cannot use mutex lock for its whole life, because QgsVectorLayerFeatureIterator is opening + // WARNING: the iterator cannot use mutex lock for its whole life, because QgsVectorLayerFeatureIterator is opening // multiple iterators if features are edited -> lock only critical sections // Create selection @@ -262,7 +262,7 @@ bool QgsGrassFeatureIterator::fetchFeature( QgsFeature &feature ) if ( mSource->mEditing ) { - // Undo needs the oldes version of geometry, but we also need topo_symbol, so we must read + // Undo needs the oldest version of geometry, but we also need topo_symbol, so we must read // topo_symbol from map if the newLine exists read if ( mSource->mLayer->map()->oldGeometries().contains( lid ) ) { diff --git a/src/providers/grass/qgsgrassgislib.cpp b/src/providers/grass/qgsgrassgislib.cpp index 0618e781efd..aebef8dd3d1 100644 --- a/src/providers/grass/qgsgrassgislib.cpp +++ b/src/providers/grass/qgsgrassgislib.cpp @@ -665,7 +665,7 @@ int QgsGrassGisLib::G_read_fp_range( const char *name, const char *mapset, struc // TODO (no solution): Problem: GRASS has precise min/max values available, // in QGIS we can calculate, but it would be slow, so we are using estimated // values, which may result in wrong output - // Hopefully the range is not crutial for most modules, but it is problem certanly + // Hopefully the range is not crucial for most modules, but it is problem certanly // for r.rescale .. more? // TODO: estimate only for large rasters @@ -1644,6 +1644,6 @@ int GRASS_LIB_EXPORT G_open_update( const char *element, const char *name ) // to be set to 1 Q_UNUSED( element ) Q_UNUSED( name ) - qFatal( "G_open_update not imlemented" ); + qFatal( "G_open_update not implemented" ); return -1; // Cannot open } diff --git a/src/providers/grass/qgsgrassgislib.h b/src/providers/grass/qgsgrassgislib.h index 9089af827fc..0e024e4e49b 100644 --- a/src/providers/grass/qgsgrassgislib.h +++ b/src/providers/grass/qgsgrassgislib.h @@ -42,8 +42,8 @@ class QgsRectangle; class GRASS_LIB_EXPORT QgsGrassGisLib { public: - // Region term is used in modules (g.region), internaly it is hold in structure - // Cell_head, but variables keeping that struture are usually called window + // Region term is used in modules (g.region), internally it is hold in structure + // Cell_head, but variables keeping that structure are usually called window #if 0 class Region { diff --git a/src/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp index 5a0b86b6e18..879d2c294c1 100644 --- a/src/providers/grass/qgsgrassprovider.cpp +++ b/src/providers/grass/qgsgrassprovider.cpp @@ -758,7 +758,7 @@ int QgsGrassProvider::rewriteLine( int oldLid, int type, struct line_pnts *Point { newLid = Vect_rewrite_line_function_pointer( map(), oldLid, type, Points, Cats ); - // oldLids are maping to the very first, original version (used by undo) + // oldLids are mapping to the very first, original version (used by undo) int oldestLid = oldLid; if ( mLayer->map()->oldLids().contains( oldLid ) ) // if it was changed already { @@ -1581,7 +1581,7 @@ void QgsGrassProvider::onFeatureDeleted( QgsFeatureId fid ) QgsDebugMsg( "no more cats on the line -> delete" ); Vect_delete_line_function_pointer( map(), realLine ); - // oldLids are maping to the very first, original version (used by undo) + // oldLids are mapping to the very first, original version (used by undo) int oldestLid = oldLid; if ( mLayer->map()->oldLids().contains( oldLid ) ) { @@ -1707,7 +1707,7 @@ void QgsGrassProvider::onAttributeValueChanged( QgsFeatureId fid, int idx, const changedAttributes[fid][idx] = QgsGrassFeatureIterator::nonEditableValue( layerField ); } // update table - // TODO: This would be too slow with buld update (field calculator for example), causing update + // TODO: This would be too slow with bulk updates (field calculator for example), causing update // of the whole table after each change. How to update single row? //emit dataChanged(); return; @@ -1738,7 +1738,7 @@ void QgsGrassProvider::onAttributeValueChanged( QgsFeatureId fid, int idx, const QgsDebugMsg( "field.name() = " + field.name() + " keyColumnName() = " + mLayer->keyColumnName() ); // TODO: Changing existing category is currently disabled (read only widget set on layer) - // bacause it makes it all too complicated + // because it makes it all too complicated if ( field.name() == mLayer->keyColumnName() ) { // user changed category -> rewrite line diff --git a/src/providers/oracle/qgsoracleprovider.h b/src/providers/oracle/qgsoracleprovider.h index 231398efcf8..4cfdb16c809 100644 --- a/src/providers/oracle/qgsoracleprovider.h +++ b/src/providers/oracle/qgsoracleprovider.h @@ -300,7 +300,7 @@ class QgsOracleProvider : public QgsVectorDataProvider }; // A function that determines if the given schema.table.column - // contains unqiue entries + // contains unique entries bool uniqueData( QString query, QString colName ); void disconnectDb(); diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp index 3da95c74534..98665e0197a 100644 --- a/src/providers/postgres/qgspostgresprovider.cpp +++ b/src/providers/postgres/qgspostgresprovider.cpp @@ -1865,7 +1865,7 @@ bool QgsPostgresProvider::parseDomainCheckConstraint( QStringList &enumValues, c //we assume that the constraint is of the following form: //(VALUE = ANY (ARRAY['a'::text, 'b'::text, 'c'::text, 'd'::text])) - //normally, PostgreSQL creates that if the contstraint has been specified as 'VALUE in ('a', 'b', 'c', 'd') + //normally, PostgreSQL creates that if the constraint has been specified as 'VALUE in ('a', 'b', 'c', 'd') int anyPos = checkDefinition.indexOf( QRegExp( "VALUE\\s*=\\s*ANY\\s*\\(\\s*ARRAY\\s*\\[" ) ); int arrayPosition = checkDefinition.lastIndexOf( QLatin1String( "ARRAY[" ) ); diff --git a/src/providers/wcs/qgswcsprovider.cpp b/src/providers/wcs/qgswcsprovider.cpp index 79daa0aab39..bea5dac233e 100644 --- a/src/providers/wcs/qgswcsprovider.cpp +++ b/src/providers/wcs/qgswcsprovider.cpp @@ -277,7 +277,7 @@ QgsWcsProvider::QgsWcsProvider( const QString &uri, const ProviderOptions &optio } // It may happen that nodata value given by GDAL is wrong and it has to be // disabled by user, in that case we need another value to be used for nodata - // (for reprojection for example) -> always internaly represent as wider type + // (for reprojection for example) -> always internally represent as wider type // with mInternalNoDataValue in reserve. // No retyping, no internal values for now #if 0 @@ -668,7 +668,7 @@ void QgsWcsProvider::getCache( int bandNo, QgsRectangle const &viewExtent, int //according to the WCS spec for 1.1, some CRS have inverted axis // box: // 1.0.0: minx,miny,maxx,maxy - // 1.1.0, 1.1.2: OGC 07-067r5 (WCS 1.1.2) referes to OGC 06-121r3 which says + // 1.1.0, 1.1.2: OGC 07-067r5 (WCS 1.1.2) refers to OGC 06-121r3 which says // "The number of axes included, and the order of these axes, shall be as specified // by the referenced CRS." That means inverted for geographic. bool changeXY = false; diff --git a/src/providers/wfs/qgsbackgroundcachedfeatureiterator.cpp b/src/providers/wfs/qgsbackgroundcachedfeatureiterator.cpp index 2cbe23727be..bb0522481b5 100644 --- a/src/providers/wfs/qgsbackgroundcachedfeatureiterator.cpp +++ b/src/providers/wfs/qgsbackgroundcachedfeatureiterator.cpp @@ -62,7 +62,7 @@ void QgsFeatureDownloaderProgressDialog::resizeEvent( QResizeEvent *ev ) int mlr = std::min( width() / 10, mtb ); if ( rect.width() - cancelRect.x() - cancelRect.width() > mlr ) { - // Force right alighnment of cancel button + // Force right alignment of cancel button cancelRect.setX( rect.width() - cancelRect.width() - mlr ); mCancel->setGeometry( cancelRect ); } diff --git a/src/providers/wfs/qgsbasenetworkrequest.cpp b/src/providers/wfs/qgsbasenetworkrequest.cpp index 238816d5ad2..88f40184595 100644 --- a/src/providers/wfs/qgsbasenetworkrequest.cpp +++ b/src/providers/wfs/qgsbasenetworkrequest.cpp @@ -23,7 +23,7 @@ #include #include -#include // just for testin file:// fake_qgis_http_endpoint hack +#include // just for testing file:// fake_qgis_http_endpoint hack #include #include diff --git a/src/providers/wfs/qgswfscapabilities.cpp b/src/providers/wfs/qgswfscapabilities.cpp index 471dcdd1377..b4e63d6651b 100644 --- a/src/providers/wfs/qgswfscapabilities.cpp +++ b/src/providers/wfs/qgswfscapabilities.cpp @@ -198,10 +198,10 @@ void QgsWfsCapabilities::capabilitiesReplyFinished() } // WFS 2.0 implementation are supposed to implement resultType=hits, and some - // implementations (GeoServer) might advertize it, whereas others (MapServer) do not. + // implementations (GeoServer) might advertise it, whereas others (MapServer) do not. // WFS 1.1 implementation too I think, but in the examples of the GetCapabilities // response of the WFS 1.1 standard (and in common implementations), this is - // explicitly advertized + // explicitly advertised if ( mCaps.version.startsWith( QLatin1String( "2.0" ) ) ) mCaps.supportsHits = true; @@ -474,7 +474,7 @@ void QgsWfsCapabilities::capabilitiesReplyFinished() if ( defaultCRSList.length() > 0 ) { QString srsname( defaultCRSList.at( 0 ).toElement().text() ); - // Some servers like Geomedia advertize EPSG:XXXX even in WFS 1.1 or 2.0 + // Some servers like Geomedia advertise EPSG:XXXX even in WFS 1.1 or 2.0 if ( srsname.startsWith( QLatin1String( "EPSG:" ) ) ) mCaps.useEPSGColumnFormat = true; featureType.crslist.append( NormalizeSRSName( srsname ) ); @@ -709,7 +709,7 @@ void QgsWfsCapabilities::parseSupportedOperations( const QDomElement &operations static QgsWfsCapabilities::Function getSpatialPredicate( const QString &name ) { QgsWfsCapabilities::Function f; - // WFS 1.0 advertize Intersect, but for conveniency we internally convert it to Intersects + // WFS 1.0 advertise Intersect, but for conveniency we internally convert it to Intersects if ( name == QLatin1String( "Intersect" ) ) f.name = QStringLiteral( "ST_Intersects" ); else diff --git a/src/providers/wfs/qgswfsfeatureiterator.cpp b/src/providers/wfs/qgswfsfeatureiterator.cpp index b597c1d882f..5f34a013452 100644 --- a/src/providers/wfs/qgswfsfeatureiterator.cpp +++ b/src/providers/wfs/qgswfsfeatureiterator.cpp @@ -1,7 +1,7 @@ /*************************************************************************** qgswfsfeatureiterator.cpp --------------------- - begin : Januar 2013 + begin : January 2013 copyright : (C) 2013 by Marco Hugentobler (C) 2016 by Even Rouault email : marco dot hugentobler at sourcepole dot ch diff --git a/src/providers/wfs/qgswfsfeatureiterator.h b/src/providers/wfs/qgswfsfeatureiterator.h index f5789b7158a..b06c23b3dea 100644 --- a/src/providers/wfs/qgswfsfeatureiterator.h +++ b/src/providers/wfs/qgswfsfeatureiterator.h @@ -1,7 +1,7 @@ /*************************************************************************** qgswfsfeatureiterator.h --------------------- - begin : Januar 2013 + begin : January 2013 copyright : (C) 2013 by Marco Hugentobler (C) 2016 by Even Rouault email : marco dot hugentobler at sourcepole dot ch diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp index 91d86e776f1..181acc644b1 100644 --- a/src/providers/wfs/qgswfsprovider.cpp +++ b/src/providers/wfs/qgswfsprovider.cpp @@ -1730,7 +1730,7 @@ bool QgsWFSProvider::getCapabilities() { QgsSettings settings; mShared->mPageSize = settings.value( QStringLiteral( "wfs/max_feature_count_if_not_provided" ), "1000" ).toInt(); - QgsDebugMsg( QStringLiteral( "Server declares paging but does not advertize max feature count and user did not specify it. Using %1" ).arg( mShared->mPageSize ) ); + QgsDebugMsg( QStringLiteral( "Server declares paging but does not advertise max feature count and user did not specify it. Using %1" ).arg( mShared->mPageSize ) ); } } else diff --git a/src/providers/wfs/qgswfsshareddata.cpp b/src/providers/wfs/qgswfsshareddata.cpp index a7f44d9bf1b..276aae160d4 100644 --- a/src/providers/wfs/qgswfsshareddata.cpp +++ b/src/providers/wfs/qgswfsshareddata.cpp @@ -57,7 +57,7 @@ QString QgsWFSSharedData::srsName() const { if ( mWFSVersion.startsWith( QLatin1String( "1.0" ) ) || !mSourceCrs.authid().startsWith( QLatin1String( "EPSG:" ) ) || - // For servers like Geomedia that advertize EPSG:XXXX in capabilities even in WFS 1.1 or 2.0 + // For servers like Geomedia that advertise EPSG:XXXX in capabilities even in WFS 1.1 or 2.0 mCaps.useEPSGColumnFormat ) { srsName = mSourceCrs.authid(); diff --git a/src/quickgui/plugin/ios/qmldir b/src/quickgui/plugin/ios/qmldir index 20d2a971f10..ce4c158d5df 100644 --- a/src/quickgui/plugin/ios/qmldir +++ b/src/quickgui/plugin/ios/qmldir @@ -12,7 +12,7 @@ module QgsQuick -# suppose to be used only internaly in QgsQuick plugin +# suppose to be used only internally in QgsQuick plugin EditorWidgetComboBox 0.1 qgsquickeditorwidgetcombobox.qml IconTextItem 0.1 qgsquickicontextitem.qml diff --git a/src/quickgui/plugin/qmldir b/src/quickgui/plugin/qmldir index 22b37857116..6a5972dd151 100644 --- a/src/quickgui/plugin/qmldir +++ b/src/quickgui/plugin/qmldir @@ -13,7 +13,7 @@ module QgsQuick plugin qgis_quick_plugin -# suppose to be used only internaly in QgsQuick plugin +# suppose to be used only internally in QgsQuick plugin EditorWidgetComboBox 0.1 qgsquickeditorwidgetcombobox.qml IconTextItem 0.1 qgsquickicontextitem.qml diff --git a/src/quickgui/qgsquickfeaturehighlight.h b/src/quickgui/qgsquickfeaturehighlight.h index 67205193155..29cc5027434 100644 --- a/src/quickgui/qgsquickfeaturehighlight.h +++ b/src/quickgui/qgsquickfeaturehighlight.h @@ -30,7 +30,7 @@ class QgsQuickMapSettings; * Creates map highlights for a geometry provided by a AttributeModel. * * The highlights are compatible with the QtQuick scene graph and - * can be direcly shown on map canvas + * can be directly shown on map canvas * * \note QML Type: FeatureHighlight * diff --git a/src/quickgui/qgsquickmaptransform.h b/src/quickgui/qgsquickmaptransform.h index f2fa4f2bb31..dc4a9b1bb87 100644 --- a/src/quickgui/qgsquickmaptransform.h +++ b/src/quickgui/qgsquickmaptransform.h @@ -28,7 +28,7 @@ class QgsQuickMapSettings; * The QgsQuickMapTransform is transformation that can be attached to any QQuickItem. * * If the item is based on the map coordinates, QgsQuickMapTransform will - * transform it to the device coordintes based on the attached map settings. + * transform it to the device coordinates based on the attached map settings. * * \note QML Type: MapTransform * diff --git a/src/quickgui/qgsquickscalebarkit.h b/src/quickgui/qgsquickscalebarkit.h index 2c61eea2af8..1842dbee148 100644 --- a/src/quickgui/qgsquickscalebarkit.h +++ b/src/quickgui/qgsquickscalebarkit.h @@ -27,7 +27,7 @@ class QgsQuickMapSettings; /** * \ingroup quick * - * The class QgsQuickScaleBarKit encapsulates the utilies to calculate + * The class QgsQuickScaleBarKit encapsulates the utilities to calculate * scale bar properties * * It requires connection to mapSettings of the active canvas to automatically diff --git a/src/quickgui/qgsquickutils.h b/src/quickgui/qgsquickutils.h index 76d81a60a4f..48c5c299b8e 100644 --- a/src/quickgui/qgsquickutils.h +++ b/src/quickgui/qgsquickutils.h @@ -43,7 +43,7 @@ class QgsCoordinateReferenceSystem; /** * \ingroup quick * - * Encapsulating the common utilies for QgsQuick library. + * Encapsulating the common utilities for QgsQuick library. * * \note QML Type: Utils (Singleton) * diff --git a/src/server/qgsserverapiutils.h b/src/server/qgsserverapiutils.h index 6c22a571645..0708100e3bf 100644 --- a/src/server/qgsserverapiutils.h +++ b/src/server/qgsserverapiutils.h @@ -52,7 +52,7 @@ class SERVER_EXPORT QgsServerApiUtils public: /** - * Parses a comma separated \a bbox into a (possibily empty) QgsRectangle. + * Parses a comma separated \a bbox into a (possibly empty) QgsRectangle. * * \note Z values (i.e. a 6 elements bbox) are silently discarded */ diff --git a/src/server/services/wfs3/openapi.json b/src/server/services/wfs3/openapi.json index d3c2c7d07be..06912cb9386 100644 --- a/src/server/services/wfs3/openapi.json +++ b/src/server/services/wfs3/openapi.json @@ -91,7 +91,7 @@ "operationId" : "describeCollections", "responses" : { "200" : { - "description" : "Metdata about the feature collections shared by this API.", + "description" : "Metadata about the feature collections shared by this API.", "content" : { "application/json" : { "schema" : { @@ -468,7 +468,7 @@ "href" : "http://example.org/concepts/building.html", "rel" : "describedBy", "type" : "text/html", - "title" : "Feature catalogue for buildings" + "title" : "Feature catalog for buildings" } ], "items" : { "$ref" : "#/components/schemas/link" @@ -529,7 +529,7 @@ "type":"object", "properties":{ "interval":{ - "description":"One or more time intervals that describe the temporal extent of the dataset.\nThe value `null` is supported and indicates an open time intervall.\nIn the Core only a single time interval is supported. Extensions may support\nmultiple intervals. If multiple intervals are provided, the union of the\nintervals describes the temporal extent.", + "description":"One or more time intervals that describe the temporal extent of the dataset.\nThe value `null` is supported and indicates an open time interval.\nIn the Core only a single time interval is supported. Extensions may support\nmultiple intervals. If multiple intervals are provided, the union of the\nintervals describes the temporal extent.", "type":"array", "minItems":1, "items":{ diff --git a/tests/bench/README b/tests/bench/README index bcdf957ac77..d6e757f5699 100644 --- a/tests/bench/README +++ b/tests/bench/README @@ -1,7 +1,7 @@ Time measurement ------------------ -For usable benchmarking we need a precise, reliable and repeatable time measurement. It seems to be easy? We are on computer right? Unfortunetly I found it almost impossible! Hopefully I am totaly wrong. +For usable benchmarking we need a precise, reliable and repeatable time measurement. It seems to be easy? We are on computer right? Unfortunately I found it almost impossible! Hopefully I am totaly wrong. Several "kind of time" exist: real (wall clock), user CPU time, system CPU time. What I believe we have to use is task user + system CPU time. diff --git a/tests/code_layout/CMakeLists.txt b/tests/code_layout/CMakeLists.txt index 424fcce1c6c..0a149dd7fae 100644 --- a/tests/code_layout/CMakeLists.txt +++ b/tests/code_layout/CMakeLists.txt @@ -9,7 +9,7 @@ ADD_TEST(qgis_spelling ${CMAKE_SOURCE_DIR}/scripts/spell_check/spell_test.sh) ADD_TEST(qgis_shellcheck ${CMAKE_SOURCE_DIR}/tests/code_layout/test_shellcheck.sh) ADD_TEST(qgis_sipify ${CMAKE_SOURCE_DIR}/tests/code_layout/test_sipify.sh) ADD_TEST(qgis_sip_include ${CMAKE_SOURCE_DIR}/tests/code_layout/test_sip_include.sh) -ADD_TEST(qgis_sip_uptodate ${CMAKE_SOURCE_DIR}/tests/code_layout/test_sipfiles_uptodate.sh) +ADD_TEST(qgis_sip_uptodate ${CMAKE_SOURCE_DIR}/tests/code_layout/test_sipfiles_uptodate.sh) # spellok ADD_TEST(qgis_doxygen_order ${CMAKE_SOURCE_DIR}/tests/code_layout/test_doxygen_layout.sh) diff --git a/tests/src/analysis/testqgsprocessing.cpp b/tests/src/analysis/testqgsprocessing.cpp index 15c87fa84c1..66ba8a1059a 100644 --- a/tests/src/analysis/testqgsprocessing.cpp +++ b/tests/src/analysis/testqgsprocessing.cpp @@ -5858,7 +5858,7 @@ void TestQgsProcessing::parameterFileOut() QCOMPARE( fromCode->flags(), def->flags() ); QCOMPARE( fromCode->defaultValue(), def->defaultValue() ); - // outputs definitio test + // outputs definition test def.reset( new QgsProcessingParameterFileDestination( "html", QString(), QString( "HTML files" ), QString(), false ) ); std::unique_ptr< QgsProcessingOutputDefinition > outputDef( def->toOutputDefinition() ); QVERIFY( dynamic_cast< QgsProcessingOutputHtml *>( outputDef.get() ) ); @@ -8699,7 +8699,7 @@ void TestQgsProcessing::parameterType() QgsProcessingRegistry reg; QVERIFY( reg.parameterType( QStringLiteral( "string" ) ) ); - QVERIFY( !reg.parameterType( QStringLiteral( "borken" ) ) ); + QVERIFY( !reg.parameterType( QStringLiteral( "borken" ) ) ); //#spellok auto paramType = new DummyParameterType(); diff --git a/tests/src/core/testqgsexpression.cpp b/tests/src/core/testqgsexpression.cpp index a0f89f0f6c6..590c54dd51b 100644 --- a/tests/src/core/testqgsexpression.cpp +++ b/tests/src/core/testqgsexpression.cpp @@ -291,7 +291,7 @@ class TestQgsExpression: public QObject QTest::newRow( "pow" ) << "2 ^ 8" << true; QTest::newRow( "$id" ) << "$id + 1" << true; - QTest::newRow( "arithmetics" ) << "1+2*3" << true; + QTest::newRow( "arithmetic" ) << "1+2*3" << true; QTest::newRow( "logic" ) << "be or not be" << true; QTest::newRow( "conditions +1" ) << "case when n then p end" << true; @@ -570,7 +570,7 @@ class TestQgsExpression: public QObject QTest::newRow( "unary minus text" ) << "-'hello'" << true << QVariant(); QTest::newRow( "unary minus null" ) << "-null" << true << QVariant(); - // arithmetics + // arithmetic QTest::newRow( "plus int" ) << "1+3" << false << QVariant( 4 ); QTest::newRow( "plus double" ) << "1+1.3" << false << QVariant( 2.3 ); QTest::newRow( "plus with null" ) << "null+3" << false << QVariant(); diff --git a/tests/src/core/testqgsexpressioncontext.cpp b/tests/src/core/testqgsexpressioncontext.cpp index 93ad9563ef6..e695392258a 100644 --- a/tests/src/core/testqgsexpressioncontext.cpp +++ b/tests/src/core/testqgsexpressioncontext.cpp @@ -445,7 +445,7 @@ void TestQgsExpressionContext::evaluate() QCOMPARE( testExpWContextFunction.evaluate( &context ).toInt(), 7 ); QCOMPARE( val1, 7 ); - //test with another context to ensure that expressions are evaulated against correct context + //test with another context to ensure that expressions are evaluated against correct context QgsExpressionContext context2; context2 << new QgsExpressionContextScope(); QgsExpressionContextScope *s2 = context2.scope( 0 ); diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp index 856e3c72e4a..00b4bcc8e19 100644 --- a/tests/src/core/testqgsgeometry.cpp +++ b/tests/src/core/testqgsgeometry.cpp @@ -515,7 +515,7 @@ void TestQgsGeometry::partIterator() static_cast< QgsPoint * >( part )->setX( 100 ); QCOMPARE( geom2.asWkt(), QStringLiteral( "Point (100 2)" ) ); QVERIFY( !it.hasNext() ); - // geom2 should hve adetached, geom should be unaffected by change + // geom2 should have adetached, geom should be unaffected by change QCOMPARE( geom.asWkt(), QStringLiteral( "Point (1 2)" ) ); // See test_qgsgeometry.py for geometry-type specific checks! diff --git a/tests/src/core/testqgslabelingengine.cpp b/tests/src/core/testqgslabelingengine.cpp index 812a81fd289..ca44609d4c2 100644 --- a/tests/src/core/testqgslabelingengine.cpp +++ b/tests/src/core/testqgslabelingengine.cpp @@ -1183,7 +1183,7 @@ void TestQgsLabelingEngine::testCurvedLabelCorrectLinePlacement() QgsFeature f; f.setAttributes( QgsAttributes() << 1 ); - // Geometry which roughly curves around from "1 oclock" anticlockwise to 6 oclock. + // Geometry which roughly curves around from "1 o'clock" anticlockwise to 6 o'clock. QgsGeometry g( QgsGeometry::fromWkt( QStringLiteral( "LineString (0.30541596873255172 0.3835845896147404, -0.08989391401451696 0.21831379117811278, -0.33668341708542704 -0.01619207146845336, -0.156895589056393 -0.20714684533780003, 0.02735901730876611 -0.21496370742601911)" ) ) ); f.setGeometry( g ); QVERIFY( vl2->dataProvider()->addFeature( f ) ); diff --git a/tests/src/core/testqgslayout.cpp b/tests/src/core/testqgslayout.cpp index 2e2bd913ab5..1837d794626 100644 --- a/tests/src/core/testqgslayout.cpp +++ b/tests/src/core/testqgslayout.cpp @@ -914,7 +914,7 @@ void TestQgsLayout::clone() QgsLayoutItemShape *label3 = new QgsLayoutItemShape( &l ); l.addLayoutItem( label3 ); - // clone and check a few poperties + // clone and check a few properties std::unique_ptr< QgsLayout > cloned( l.clone() ); QVERIFY( cloned.get() ); QCOMPARE( cloned->pageCollection()->pageCount(), 3 ); diff --git a/tests/src/core/testqgstranslateproject.cpp b/tests/src/core/testqgstranslateproject.cpp index 6eca8988718..ef4f77e94a3 100644 --- a/tests/src/core/testqgstranslateproject.cpp +++ b/tests/src/core/testqgstranslateproject.cpp @@ -195,8 +195,8 @@ void TestQgsTranslateProject::translateProject() const QgsFields points_fields = points_layer->fields(); //Class (Alias: Level) -> Klasse QCOMPARE( points_fields.field( QStringLiteral( "Class" ) ).alias(), QStringLiteral( "Klasse" ) ); - //Heading -> Titel - QCOMPARE( points_fields.field( QStringLiteral( "Heading" ) ).alias(), QStringLiteral( "Titel" ) ); + //Heading -> Titel //#spellok + QCOMPARE( points_fields.field( QStringLiteral( "Heading" ) ).alias(), QStringLiteral( "Titel" ) ); //#spellok //Importance -> Wichtigkeit QCOMPARE( points_fields.field( QStringLiteral( "Importance" ) ).alias(), QStringLiteral( "Wichtigkeit" ) ); //Pilots -> Piloten diff --git a/tests/src/gui/testqgsvaluerelationwidgetwrapper.cpp b/tests/src/gui/testqgsvaluerelationwidgetwrapper.cpp index 19972840116..28a9077d2bd 100644 --- a/tests/src/gui/testqgsvaluerelationwidgetwrapper.cpp +++ b/tests/src/gui/testqgsvaluerelationwidgetwrapper.cpp @@ -432,16 +432,16 @@ void TestQgsValueRelationWidgetWrapper::testWithJsonInPostgres() // build a value relation widget wrapper for json field QgsValueRelationWidgetWrapper w_favoriteauthors( vl_json, vl_json->fields().indexOf( QStringLiteral( "jvalue" ) ), nullptr, nullptr ); - QVariantMap cfg_favoriteautors; - cfg_favoriteautors.insert( QStringLiteral( "Layer" ), vl_authors->id() ); - cfg_favoriteautors.insert( QStringLiteral( "Key" ), QStringLiteral( "pk" ) ); - cfg_favoriteautors.insert( QStringLiteral( "Value" ), QStringLiteral( "name" ) ); - cfg_favoriteautors.insert( QStringLiteral( "AllowMulti" ), true ); - cfg_favoriteautors.insert( QStringLiteral( "NofColumns" ), 1 ); - cfg_favoriteautors.insert( QStringLiteral( "AllowNull" ), false ); - cfg_favoriteautors.insert( QStringLiteral( "OrderByValue" ), false ); - cfg_favoriteautors.insert( QStringLiteral( "UseCompleter" ), false ); - w_favoriteauthors.setConfig( cfg_favoriteautors ); + QVariantMap cfg_favoriteauthors; + cfg_favoriteauthors.insert( QStringLiteral( "Layer" ), vl_authors->id() ); + cfg_favoriteauthors.insert( QStringLiteral( "Key" ), QStringLiteral( "pk" ) ); + cfg_favoriteauthors.insert( QStringLiteral( "Value" ), QStringLiteral( "name" ) ); + cfg_favoriteauthors.insert( QStringLiteral( "AllowMulti" ), true ); + cfg_favoriteauthors.insert( QStringLiteral( "NofColumns" ), 1 ); + cfg_favoriteauthors.insert( QStringLiteral( "AllowNull" ), false ); + cfg_favoriteauthors.insert( QStringLiteral( "OrderByValue" ), false ); + cfg_favoriteauthors.insert( QStringLiteral( "UseCompleter" ), false ); + w_favoriteauthors.setConfig( cfg_favoriteauthors ); w_favoriteauthors.widget(); w_favoriteauthors.setEnabled( true ); @@ -477,16 +477,16 @@ void TestQgsValueRelationWidgetWrapper::testWithJsonInPostgres() // build a value relation widget wrapper for jsonb field QgsValueRelationWidgetWrapper w_favoriteauthors_b( vl_json, vl_json->fields().indexOf( QStringLiteral( "jbvalue" ) ), nullptr, nullptr ); - QVariantMap cfg_favoriteautors_b; - cfg_favoriteautors_b.insert( QStringLiteral( "Layer" ), vl_authors->id() ); - cfg_favoriteautors_b.insert( QStringLiteral( "Key" ), QStringLiteral( "pk" ) ); - cfg_favoriteautors_b.insert( QStringLiteral( "Value" ), QStringLiteral( "name" ) ); - cfg_favoriteautors_b.insert( QStringLiteral( "AllowMulti" ), true ); - cfg_favoriteautors_b.insert( QStringLiteral( "NofColumns" ), 1 ); - cfg_favoriteautors_b.insert( QStringLiteral( "AllowNull" ), false ); - cfg_favoriteautors_b.insert( QStringLiteral( "OrderByValue" ), false ); - cfg_favoriteautors_b.insert( QStringLiteral( "UseCompleter" ), false ); - w_favoriteauthors_b.setConfig( cfg_favoriteautors_b ); + QVariantMap cfg_favoriteauthors_b; + cfg_favoriteauthors_b.insert( QStringLiteral( "Layer" ), vl_authors->id() ); + cfg_favoriteauthors_b.insert( QStringLiteral( "Key" ), QStringLiteral( "pk" ) ); + cfg_favoriteauthors_b.insert( QStringLiteral( "Value" ), QStringLiteral( "name" ) ); + cfg_favoriteauthors_b.insert( QStringLiteral( "AllowMulti" ), true ); + cfg_favoriteauthors_b.insert( QStringLiteral( "NofColumns" ), 1 ); + cfg_favoriteauthors_b.insert( QStringLiteral( "AllowNull" ), false ); + cfg_favoriteauthors_b.insert( QStringLiteral( "OrderByValue" ), false ); + cfg_favoriteauthors_b.insert( QStringLiteral( "UseCompleter" ), false ); + w_favoriteauthors_b.setConfig( cfg_favoriteauthors_b ); w_favoriteauthors_b.widget(); w_favoriteauthors_b.setEnabled( true ); @@ -545,16 +545,16 @@ void TestQgsValueRelationWidgetWrapper::testWithJsonInGPKG() // build a value relation widget wrapper for authors QgsValueRelationWidgetWrapper w_favoriteauthors( vl_json, vl_json->fields().indexOf( QStringLiteral( "json_content" ) ), nullptr, nullptr ); - QVariantMap cfg_favoriteautors; - cfg_favoriteautors.insert( QStringLiteral( "Layer" ), vl_authors->id() ); - cfg_favoriteautors.insert( QStringLiteral( "Key" ), QStringLiteral( "fid" ) ); - cfg_favoriteautors.insert( QStringLiteral( "Value" ), QStringLiteral( "NAME" ) ); - cfg_favoriteautors.insert( QStringLiteral( "AllowMulti" ), true ); - cfg_favoriteautors.insert( QStringLiteral( "NofColumns" ), 1 ); - cfg_favoriteautors.insert( QStringLiteral( "AllowNull" ), false ); - cfg_favoriteautors.insert( QStringLiteral( "OrderByValue" ), false ); - cfg_favoriteautors.insert( QStringLiteral( "UseCompleter" ), false ); - w_favoriteauthors.setConfig( cfg_favoriteautors ); + QVariantMap cfg_favoriteauthors; + cfg_favoriteauthors.insert( QStringLiteral( "Layer" ), vl_authors->id() ); + cfg_favoriteauthors.insert( QStringLiteral( "Key" ), QStringLiteral( "fid" ) ); + cfg_favoriteauthors.insert( QStringLiteral( "Value" ), QStringLiteral( "NAME" ) ); + cfg_favoriteauthors.insert( QStringLiteral( "AllowMulti" ), true ); + cfg_favoriteauthors.insert( QStringLiteral( "NofColumns" ), 1 ); + cfg_favoriteauthors.insert( QStringLiteral( "AllowNull" ), false ); + cfg_favoriteauthors.insert( QStringLiteral( "OrderByValue" ), false ); + cfg_favoriteauthors.insert( QStringLiteral( "UseCompleter" ), false ); + w_favoriteauthors.setConfig( cfg_favoriteauthors ); w_favoriteauthors.widget(); w_favoriteauthors.setEnabled( true ); @@ -673,16 +673,16 @@ void TestQgsValueRelationWidgetWrapper::testWithTextInGPKG() // build a value relation widget wrapper for authors QgsValueRelationWidgetWrapper w_favoriteauthors( vl_text, vl_text->fields().indexOf( QStringLiteral( "PRFEDEA" ) ), nullptr, nullptr ); - QVariantMap cfg_favoriteautors; - cfg_favoriteautors.insert( QStringLiteral( "Layer" ), vl_authors->id() ); - cfg_favoriteautors.insert( QStringLiteral( "Key" ), QStringLiteral( "fid" ) ); - cfg_favoriteautors.insert( QStringLiteral( "Value" ), QStringLiteral( "NAME" ) ); - cfg_favoriteautors.insert( QStringLiteral( "AllowMulti" ), true ); - cfg_favoriteautors.insert( QStringLiteral( "NofColumns" ), 1 ); - cfg_favoriteautors.insert( QStringLiteral( "AllowNull" ), false ); - cfg_favoriteautors.insert( QStringLiteral( "OrderByValue" ), false ); - cfg_favoriteautors.insert( QStringLiteral( "UseCompleter" ), false ); - w_favoriteauthors.setConfig( cfg_favoriteautors ); + QVariantMap cfg_favoriteauthors; + cfg_favoriteauthors.insert( QStringLiteral( "Layer" ), vl_authors->id() ); + cfg_favoriteauthors.insert( QStringLiteral( "Key" ), QStringLiteral( "fid" ) ); + cfg_favoriteauthors.insert( QStringLiteral( "Value" ), QStringLiteral( "NAME" ) ); + cfg_favoriteauthors.insert( QStringLiteral( "AllowMulti" ), true ); + cfg_favoriteauthors.insert( QStringLiteral( "NofColumns" ), 1 ); + cfg_favoriteauthors.insert( QStringLiteral( "AllowNull" ), false ); + cfg_favoriteauthors.insert( QStringLiteral( "OrderByValue" ), false ); + cfg_favoriteauthors.insert( QStringLiteral( "UseCompleter" ), false ); + w_favoriteauthors.setConfig( cfg_favoriteauthors ); w_favoriteauthors.widget(); w_favoriteauthors.setEnabled( true ); @@ -804,7 +804,7 @@ void TestQgsValueRelationWidgetWrapper::testWithTextInGPKG() // build a value relation widget wrapper for authors QgsValueRelationWidgetWrapper w_favoriteauthors_reread( vl_text_reread, vl_text->fields().indexOf( QStringLiteral( "PRFEDEA" ) ), nullptr, nullptr ); - w_favoriteauthors_reread.setConfig( cfg_favoriteautors ); + w_favoriteauthors_reread.setConfig( cfg_favoriteauthors ); w_favoriteauthors_reread.widget(); w_favoriteauthors_reread.setEnabled( true ); @@ -845,16 +845,16 @@ void TestQgsValueRelationWidgetWrapper::testWithTextInGPKGTextFk() // build a value relation widget wrapper for authors QgsValueRelationWidgetWrapper w_favoriteauthors( vl_text, vl_text->fields().indexOf( QStringLiteral( "PRFEDEA" ) ), nullptr, nullptr ); - QVariantMap cfg_favoriteautors; - cfg_favoriteautors.insert( QStringLiteral( "Layer" ), vl_authors->id() ); - cfg_favoriteautors.insert( QStringLiteral( "Key" ), QStringLiteral( "NAME" ) ); - cfg_favoriteautors.insert( QStringLiteral( "Value" ), QStringLiteral( "NAME" ) ); - cfg_favoriteautors.insert( QStringLiteral( "AllowMulti" ), true ); - cfg_favoriteautors.insert( QStringLiteral( "NofColumns" ), 1 ); - cfg_favoriteautors.insert( QStringLiteral( "AllowNull" ), false ); - cfg_favoriteautors.insert( QStringLiteral( "OrderByValue" ), false ); - cfg_favoriteautors.insert( QStringLiteral( "UseCompleter" ), false ); - w_favoriteauthors.setConfig( cfg_favoriteautors ); + QVariantMap cfg_favoriteauthors; + cfg_favoriteauthors.insert( QStringLiteral( "Layer" ), vl_authors->id() ); + cfg_favoriteauthors.insert( QStringLiteral( "Key" ), QStringLiteral( "NAME" ) ); + cfg_favoriteauthors.insert( QStringLiteral( "Value" ), QStringLiteral( "NAME" ) ); + cfg_favoriteauthors.insert( QStringLiteral( "AllowMulti" ), true ); + cfg_favoriteauthors.insert( QStringLiteral( "NofColumns" ), 1 ); + cfg_favoriteauthors.insert( QStringLiteral( "AllowNull" ), false ); + cfg_favoriteauthors.insert( QStringLiteral( "OrderByValue" ), false ); + cfg_favoriteauthors.insert( QStringLiteral( "UseCompleter" ), false ); + w_favoriteauthors.setConfig( cfg_favoriteauthors ); w_favoriteauthors.widget(); w_favoriteauthors.setEnabled( true ); @@ -975,7 +975,7 @@ void TestQgsValueRelationWidgetWrapper::testWithTextInGPKGTextFk() // build a value relation widget wrapper for authors QgsValueRelationWidgetWrapper w_favoriteauthors_reread( vl_text_reread, vl_text_reread->fields().indexOf( QStringLiteral( "PRFEDEA" ) ), nullptr, nullptr ); - w_favoriteauthors_reread.setConfig( cfg_favoriteautors ); + w_favoriteauthors_reread.setConfig( cfg_favoriteauthors ); w_favoriteauthors_reread.widget(); w_favoriteauthors_reread.setEnabled( true ); @@ -1032,7 +1032,7 @@ void TestQgsValueRelationWidgetWrapper::testWithTextInGPKGTextFk() // build a value relation widget wrapper for authors QgsValueRelationWidgetWrapper w_favoriteauthors_reread2( vl_text_reread2, vl_text_reread2->fields().indexOf( QStringLiteral( "PRFEDEA" ) ), nullptr, nullptr ); - w_favoriteauthors_reread2.setConfig( cfg_favoriteautors ); + w_favoriteauthors_reread2.setConfig( cfg_favoriteauthors ); w_favoriteauthors_reread2.widget(); w_favoriteauthors_reread2.setEnabled( true ); @@ -1065,7 +1065,7 @@ void TestQgsValueRelationWidgetWrapper::testWithTextInGPKGWeirdTextFk() QgsVectorLayer *vl_text = new QgsVectorLayer( myMapFileInfoFoo.filePath() + "|layername=foo", "test", QStringLiteral( "ogr" ) ); QVERIFY( vl_text->isValid() ); - // create ogr spatialite layer for autors with weird signs (vl_authors) + // create ogr spatialite layer for authors with weird signs (vl_authors) myTempFileName = myTempDirName + QStringLiteral( "/valuerelation_widget_wrapper_test.spatialite.sqlite" ); QFile::copy( myFileName + QStringLiteral( "/valuerelation_widget_wrapper_test.spatialite.sqlite" ), myTempFileName ); @@ -1082,16 +1082,16 @@ void TestQgsValueRelationWidgetWrapper::testWithTextInGPKGWeirdTextFk() // build a value relation widget wrapper for authors QgsValueRelationWidgetWrapper w_favoriteauthors( vl_text, vl_text->fields().indexOf( QStringLiteral( "PRFEDEA" ) ), nullptr, nullptr ); - QVariantMap cfg_favoriteautors; - cfg_favoriteautors.insert( QStringLiteral( "Layer" ), vl_authors->id() ); - cfg_favoriteautors.insert( QStringLiteral( "Key" ), QStringLiteral( "pk_text" ) ); - cfg_favoriteautors.insert( QStringLiteral( "Value" ), QStringLiteral( "name" ) ); - cfg_favoriteautors.insert( QStringLiteral( "AllowMulti" ), true ); - cfg_favoriteautors.insert( QStringLiteral( "NofColumns" ), 1 ); - cfg_favoriteautors.insert( QStringLiteral( "AllowNull" ), false ); - cfg_favoriteautors.insert( QStringLiteral( "OrderByValue" ), false ); - cfg_favoriteautors.insert( QStringLiteral( "UseCompleter" ), false ); - w_favoriteauthors.setConfig( cfg_favoriteautors ); + QVariantMap cfg_favoriteauthors; + cfg_favoriteauthors.insert( QStringLiteral( "Layer" ), vl_authors->id() ); + cfg_favoriteauthors.insert( QStringLiteral( "Key" ), QStringLiteral( "pk_text" ) ); + cfg_favoriteauthors.insert( QStringLiteral( "Value" ), QStringLiteral( "name" ) ); + cfg_favoriteauthors.insert( QStringLiteral( "AllowMulti" ), true ); + cfg_favoriteauthors.insert( QStringLiteral( "NofColumns" ), 1 ); + cfg_favoriteauthors.insert( QStringLiteral( "AllowNull" ), false ); + cfg_favoriteauthors.insert( QStringLiteral( "OrderByValue" ), false ); + cfg_favoriteauthors.insert( QStringLiteral( "UseCompleter" ), false ); + w_favoriteauthors.setConfig( cfg_favoriteauthors ); w_favoriteauthors.widget(); w_favoriteauthors.setEnabled( true ); @@ -1211,7 +1211,7 @@ void TestQgsValueRelationWidgetWrapper::testWithTextInGPKGWeirdTextFk() // build a value relation widget wrapper for authors QgsValueRelationWidgetWrapper w_favoriteauthors_reread( vl_text_reread, vl_text_reread->fields().indexOf( QStringLiteral( "PRFEDEA" ) ), nullptr, nullptr ); - w_favoriteauthors_reread.setConfig( cfg_favoriteautors ); + w_favoriteauthors_reread.setConfig( cfg_favoriteauthors ); w_favoriteauthors_reread.widget(); w_favoriteauthors_reread.setEnabled( true ); @@ -1265,16 +1265,16 @@ void TestQgsValueRelationWidgetWrapper::testWithJsonInSpatialite() // build a value relation widget wrapper for authors // fk_field is a json array type QgsValueRelationWidgetWrapper w_favoriteauthors( vl_json, fk_field_idx, nullptr, nullptr ); - QVariantMap cfg_favoriteautors; - cfg_favoriteautors.insert( QStringLiteral( "Layer" ), vl_authors->id() ); - cfg_favoriteautors.insert( QStringLiteral( "Key" ), QStringLiteral( "pk" ) ); - cfg_favoriteautors.insert( QStringLiteral( "Value" ), QStringLiteral( "name" ) ); - cfg_favoriteautors.insert( QStringLiteral( "AllowMulti" ), true ); - cfg_favoriteautors.insert( QStringLiteral( "NofColumns" ), 1 ); - cfg_favoriteautors.insert( QStringLiteral( "AllowNull" ), false ); - cfg_favoriteautors.insert( QStringLiteral( "OrderByValue" ), false ); - cfg_favoriteautors.insert( QStringLiteral( "UseCompleter" ), false ); - w_favoriteauthors.setConfig( cfg_favoriteautors ); + QVariantMap cfg_favoriteauthors; + cfg_favoriteauthors.insert( QStringLiteral( "Layer" ), vl_authors->id() ); + cfg_favoriteauthors.insert( QStringLiteral( "Key" ), QStringLiteral( "pk" ) ); + cfg_favoriteauthors.insert( QStringLiteral( "Value" ), QStringLiteral( "name" ) ); + cfg_favoriteauthors.insert( QStringLiteral( "AllowMulti" ), true ); + cfg_favoriteauthors.insert( QStringLiteral( "NofColumns" ), 1 ); + cfg_favoriteauthors.insert( QStringLiteral( "AllowNull" ), false ); + cfg_favoriteauthors.insert( QStringLiteral( "OrderByValue" ), false ); + cfg_favoriteauthors.insert( QStringLiteral( "UseCompleter" ), false ); + w_favoriteauthors.setConfig( cfg_favoriteauthors ); w_favoriteauthors.widget(); w_favoriteauthors.setEnabled( true ); @@ -1408,16 +1408,16 @@ void TestQgsValueRelationWidgetWrapper::testWithJsonInSpatialiteTextFk() // build a value relation widget wrapper for authors // fk_field is a json array type QgsValueRelationWidgetWrapper w_favoriteauthors( vl_json, fk_field_idx, nullptr, nullptr ); - QVariantMap cfg_favoriteautors; - cfg_favoriteautors.insert( QStringLiteral( "Layer" ), vl_authors->id() ); - cfg_favoriteautors.insert( QStringLiteral( "Key" ), QStringLiteral( "pk_text" ) ); - cfg_favoriteautors.insert( QStringLiteral( "Value" ), QStringLiteral( "name" ) ); - cfg_favoriteautors.insert( QStringLiteral( "AllowMulti" ), true ); - cfg_favoriteautors.insert( QStringLiteral( "NofColumns" ), 1 ); - cfg_favoriteautors.insert( QStringLiteral( "AllowNull" ), false ); - cfg_favoriteautors.insert( QStringLiteral( "OrderByValue" ), false ); - cfg_favoriteautors.insert( QStringLiteral( "UseCompleter" ), false ); - w_favoriteauthors.setConfig( cfg_favoriteautors ); + QVariantMap cfg_favoriteauthors; + cfg_favoriteauthors.insert( QStringLiteral( "Layer" ), vl_authors->id() ); + cfg_favoriteauthors.insert( QStringLiteral( "Key" ), QStringLiteral( "pk_text" ) ); + cfg_favoriteauthors.insert( QStringLiteral( "Value" ), QStringLiteral( "name" ) ); + cfg_favoriteauthors.insert( QStringLiteral( "AllowMulti" ), true ); + cfg_favoriteauthors.insert( QStringLiteral( "NofColumns" ), 1 ); + cfg_favoriteauthors.insert( QStringLiteral( "AllowNull" ), false ); + cfg_favoriteauthors.insert( QStringLiteral( "OrderByValue" ), false ); + cfg_favoriteauthors.insert( QStringLiteral( "UseCompleter" ), false ); + w_favoriteauthors.setConfig( cfg_favoriteauthors ); w_favoriteauthors.widget(); w_favoriteauthors.setEnabled( true ); diff --git a/tests/src/python/offlineditingtestbase.py b/tests/src/python/offlineditingtestbase.py index 3d989c1d720..a22d15b2e77 100644 --- a/tests/src/python/offlineditingtestbase.py +++ b/tests/src/python/offlineditingtestbase.py @@ -39,7 +39,7 @@ from qgis.core import ( # Tet features, fields: [id, name, geometry] -# "id" is used as a pk to retriev features by attribute +# "id" is used as a pk to retrieve features by attribute TEST_FEATURES = [ (1, 'name 1', QgsPointXY(9, 45)), (2, 'name 2', QgsPointXY(9.5, 45.5)), diff --git a/tests/src/python/test_authmanager_pki_postgres.py b/tests/src/python/test_authmanager_pki_postgres.py index 142360c2ee5..4e529f63892 100644 --- a/tests/src/python/test_authmanager_pki_postgres.py +++ b/tests/src/python/test_authmanager_pki_postgres.py @@ -246,7 +246,7 @@ class TestAuthManager(unittest.TestCase): f.setPermissions(QFile.WriteOwner) f.remove() - # remove any temppki in temprorary path to check that no + # remove any temppki in temporary path to check that no # other pki remain after connection cleanTempPki() # connect using postgres provider diff --git a/tests/src/python/test_db_manager_postgis.py b/tests/src/python/test_db_manager_postgis.py index c711ebe1974..17236a80569 100644 --- a/tests/src/python/test_db_manager_postgis.py +++ b/tests/src/python/test_db_manager_postgis.py @@ -277,7 +277,7 @@ class TestPyQgsDBManagerPostgis(unittest.TestCase): f.setPermissions(QFile.WriteOwner) f.remove() - # remove any temppki in temprorary path to check that no + # remove any temppki in temporary path to check that no # other pki remain after connection cleanTempPki() # connect diff --git a/tests/src/python/test_layer_dependencies.py b/tests/src/python/test_layer_dependencies.py index 494e5515f00..9b9479300ac 100644 --- a/tests/src/python/test_layer_dependencies.py +++ b/tests/src/python/test_layer_dependencies.py @@ -200,7 +200,7 @@ class TestLayerDependencies(unittest.TestCase): f.setGeometry(geom) self.pointsLayer.startEditing() - # new point fire featureAdded so dependening line fire dataChanged + # new point fire featureAdded so depending line fire dataChanged # point depends on line, so fire dataChanged self.pointsLayer.addFeatures([f]) self.assertEqual(len(spy_points_data_changed), 3) diff --git a/tests/src/python/test_provider_shapefile.py b/tests/src/python/test_provider_shapefile.py index 0ba2c32a032..4df2fb94cc3 100644 --- a/tests/src/python/test_provider_shapefile.py +++ b/tests/src/python/test_provider_shapefile.py @@ -320,7 +320,7 @@ class TestPyQgsShapefileProvider(unittest.TestCase, ProviderTestCase): self.assertTrue(vl.dataProvider().leaveUpdateMode()) self.assertEqual(vl.dataProvider().property("_debug_open_mode"), "read-only") - # Test that update mode will be implictly enabled if doing an action + # Test that update mode will be implicitly enabled if doing an action # that requires update mode (ret, _) = vl.dataProvider().addFeatures([QgsFeature()]) self.assertTrue(ret) diff --git a/tests/src/python/test_qgsdistancearea.py b/tests/src/python/test_qgsdistancearea.py index 655b68e127a..e55a365d57f 100644 --- a/tests/src/python/test_qgsdistancearea.py +++ b/tests/src/python/test_qgsdistancearea.py @@ -135,7 +135,7 @@ class TestQgsDistanceArea(unittest.TestCase): # +-+ # | | # +-+ + - # checking returned length_mapunits/projected_points of diffferent world points with results from SpatiaLite ST_Project + # checking returned length_mapunits/projected_points of different world points with results from SpatiaLite ST_Project da_3068 = QgsDistanceArea() da_3068.setSourceCrs(QgsCoordinateReferenceSystem.fromOgcWmsCrs('EPSG:3068'), QgsProject.instance().transformContext()) if (da_3068.sourceCrs().isGeographic()): diff --git a/tests/src/python/test_qgsellipsoidutils.py b/tests/src/python/test_qgsellipsoidutils.py index a4d09d28538..b06a915d7d3 100644 --- a/tests/src/python/test_qgsellipsoidutils.py +++ b/tests/src/python/test_qgsellipsoidutils.py @@ -129,7 +129,7 @@ class TestQgsEllipsoidUtils(unittest.TestCase): 'Charon2000': 'Charon2000', 'clrk66': 'Clarke 1866', 'IGNF:ELG004': 'Clarke 1866', 'IGNF:ELG003': 'Clarke 1880 Anglais', 'IGNF:ELG010': 'Clarke 1880 IGN', 'clrk80': 'Clarke 1880 mod.', - 'cape': 'Clarke 1880 mod.', 'CPM': 'Comm. des Poids et Mesures 1799', + 'cape': 'Clarke 1880 mod.', 'CPM': 'Comm. des Poids et Mesures 1799', # spellok 'Cordelia2000': 'Cordelia2000', 'Cressida2000': 'Cressida2000', 'Deimos2000': 'Deimos2000', 'delmbr': 'Delambre 1810 (Belgium)', diff --git a/tests/src/python/test_qgspallabeling_tests.py b/tests/src/python/test_qgspallabeling_tests.py index f23299d0e98..f8bfbb95ca4 100644 --- a/tests/src/python/test_qgspallabeling_tests.py +++ b/tests/src/python/test_qgspallabeling_tests.py @@ -40,12 +40,12 @@ class TestPointBase(object): """:type: QgsMapCanvas""" # custom mismatches per group/test (should not mask any needed anomaly) # e.g. self._Mismatches['TestClassName'] = 300 - # check base output class's checkTest() or sublcasses for any defaults + # check base output class's checkTest() or subclasses for any defaults self._Mismatches = dict() # custom color tolerances per group/test: 1 - 20 (0 default, 20 max) # (should not mask any needed anomaly) # e.g. self._ColorTols['TestClassName'] = 10 - # check base output class's checkTest() or sublcasses for any defaults + # check base output class's checkTest() or subclasses for any defaults self._ColorTols = dict() # noinspection PyMethodMayBeStatic @@ -246,12 +246,12 @@ class TestLineBase(object): """:type: QgsMapCanvas""" # custom mismatches per group/test (should not mask any needed anomaly) # e.g. self._Mismatches['TestClassName'] = 300 - # check base output class's checkTest() or sublcasses for any defaults + # check base output class's checkTest() or subclasses for any defaults self._Mismatches = dict() # custom color tolerances per group/test: 1 - 20 (0 default, 20 max) # (should not mask any needed anomaly) # e.g. self._ColorTols['TestClassName'] = 10 - # check base output class's checkTest() or sublcasses for any defaults + # check base output class's checkTest() or subclasses for any defaults self._ColorTols = dict() # noinspection PyMethodMayBeStatic diff --git a/tests/src/python/test_qgsstringutils.py b/tests/src/python/test_qgsstringutils.py index 1f460219b72..d78bc8771f6 100644 --- a/tests/src/python/test_qgsstringutils.py +++ b/tests/src/python/test_qgsstringutils.py @@ -176,7 +176,7 @@ class PyQgsStringUtils(unittest.TestCase): ' Testing Abc') def testSubstituteVerticalCharacters(self): - """ test subsitute vertical characters """ + """ test substitute vertical characters """ self.assertEqual(QgsStringUtils.substituteVerticalCharacters('123{[(45654)]}321'), '123︷﹇︵45654︶﹈︸321') diff --git a/tests/src/python/test_qgssymbollayer_readsld.py b/tests/src/python/test_qgssymbollayer_readsld.py index 395fb73af43..05bf4bb3089 100644 --- a/tests/src/python/test_qgssymbollayer_readsld.py +++ b/tests/src/python/test_qgssymbollayer_readsld.py @@ -126,7 +126,7 @@ class TestQgsSymbolLayerReadSld(unittest.TestCase): 50 """ # technically it's not necessary to use a real shape, but a empty memory - # layer. In case these tests will upgrate to a rendering where to + # layer. In case these tests will upgrade to a rendering where to # compare also rendering not only properties #myShpFile = os.path.join(unitTestDataPath(), 'points.shp') #layer = QgsVectorLayer(myShpFile, 'points', 'ogr') diff --git a/tests/testdata/font/QGIS-Vera/RELEASENOTES.TXT b/tests/testdata/font/QGIS-Vera/RELEASENOTES.TXT index f8fdf014e67..2ec9858050a 100644 --- a/tests/testdata/font/QGIS-Vera/RELEASENOTES.TXT +++ b/tests/testdata/font/QGIS-Vera/RELEASENOTES.TXT @@ -99,7 +99,7 @@ to proper judgement of problems of the fonts: results on other systems when not used anti-aliased may not be entirely satisfying. We are primarily interested in reports of problems on open source systems implementing Xft2/fontconfig/freetype - (which implements antialiasing and hinting adjustements, and + (which implements antialiasing and hinting adjustments, and sophisticated subpixel decimation on flatpanels). Also, the algorithms used by Xft2 adjust the hints to integer widths and the results are crisper on open source systems than on Windows or diff --git a/tests/testdata/qgis_server/api/test_wfs3_api_project.json b/tests/testdata/qgis_server/api/test_wfs3_api_project.json index 5c65694f0ff..114a9ca7286 100644 --- a/tests/testdata/qgis_server/api/test_wfs3_api_project.json +++ b/tests/testdata/qgis_server/api/test_wfs3_api_project.json @@ -170,7 +170,7 @@ Content-Type: application/openapi+json;version=3.0 { "href": "http://example.com/concepts/buildings.html", "rel": "describedBy", - "title": "Feature catalogue for buildings", + "title": "Feature catalog for buildings", "type": "text/html" } ],