From 6c74e4ea5d1385a85812cf21dfd3b1a1c58da0db Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Thu, 12 Jan 2017 22:01:50 +0100 Subject: [PATCH] spelling fixes --- CMakeLists.txt | 2 +- INSTALL | 2 +- NEWS | 14 +++++------ ci/travis/check_spelling.sh | 3 +-- cmake/FindPyQt4.cmake | 2 +- cmake/FindPyQt5.cmake | 2 +- cmake/FindSIP.cmake | 2 +- debian/changelog | 2 +- doc/INSTALL.html | 2 +- doc/msys.t2t | 2 +- doc/news.html | 14 +++++------ doc/news.t2t | 14 +++++------ .../interpolation/NormVecDecorator.sip | 2 +- .../analysis/openstreetmap/qgsosmimport.sip | 2 +- python/core/auth/qgsauthconfig.sip | 2 +- python/core/composer/qgscomposeritem.sip | 4 ++-- python/core/qgsnetworkaccessmanager.sip | 2 +- python/core/qgspoint.sip | 2 +- python/core/qgsrenderchecker.sip | 6 ++--- python/core/qgsvectordataprovider.sip | 2 +- python/core/qgsvectorlayer.sip | 2 +- python/core/qgsvectorlayerfeatureiterator.sip | 4 ++-- python/core/qgsvectorlayertools.sip | 4 ++-- .../core/symbology-ng/qgscptcityarchive.sip | 2 +- python/core/symbology-ng/qgssymbollayer.sip | 4 ++-- .../attributetable/qgsattributetableview.sip | 2 +- .../attributetable/qgsfeaturelistmodel.sip | 2 +- .../gui/attributetable/qgsfeaturelistview.sip | 2 +- python/gui/qgisinterface.sip | 2 +- .../gui/qgsadvanceddigitizingdockwidget.sip | 2 +- python/gui/qgsexternalresourcewidget.sip | 2 +- python/gui/qgsmaplayeractionregistry.sip | 2 +- python/gui/qgsmaptooladvanceddigitizing.sip | 2 +- python/gui/qgsmaptoolidentify.sip | 4 ++-- .../db_manager/db_plugins/oracle/TODO.md | 2 +- .../db_plugins/postgis/connector.py | 2 +- .../db_plugins/spatialite/sql_dictionary.py | 2 +- .../db_plugins/vlayers/sql_dictionary.py | 2 +- python/plugins/processing/algs/help/qgis.yaml | 4 ++-- .../algs/lidar/lastools/lascontrol.py | 2 +- .../plugins/processing/algs/qgis/Eliminate.py | 2 +- python/plugins/processing/tools/postgis.py | 2 +- python/pyplugin_installer/version_compare.py | 4 ++-- python/server/qgsserverinterface.sip | 2 +- python/server/qgsservicemodule.sip | 2 +- qgis.dtd | 2 +- .../cpt-city-qgis-min/selections/div.xml | 4 ++-- rpm/default.cfg | 2 +- scripts/spell_check/.agignore | 3 +-- scripts/spell_check/spelling.dat | 24 ++++++++++++------- .../interpolation/CloughTocherInterpolator.cc | 2 +- .../interpolation/DualEdgeTriangulation.cc | 2 +- src/analysis/interpolation/NormVecDecorator.h | 2 +- src/analysis/openstreetmap/qgsosmimport.h | 2 +- src/analysis/vector/qgspointsample.cpp | 2 +- src/app/composer/qgscomposeritemwidget.h | 4 ++-- src/app/gps/qgsgpsinformationwidget.cpp | 2 +- src/app/qgisappinterface.h | 2 +- src/app/qgsdecorationnortharrow.h | 2 +- src/app/qgsguivectorlayertools.h | 4 ++-- src/app/qgsidentifyresultsdialog.cpp | 2 +- src/app/qgsprojectproperties.h | 2 +- src/astyle/ASBeautifier.cpp | 2 +- src/astyle/ASFormatter.cpp | 2 +- src/astyle/astyle_main.cpp | 2 +- src/core/auth/qgsauthconfig.h | 2 +- src/core/composer/qgsaddremoveitemcommand.cpp | 4 ++-- src/core/composer/qgscomposerarrow.cpp | 6 ++--- src/core/composer/qgscomposeritem.h | 4 ++-- src/core/geometry/qgsgeometryutils.h | 2 +- src/core/qgsapplication.cpp | 6 ++--- src/core/qgsclipper.h | 6 ++--- src/core/qgscoordinatereferencesystem.h | 2 +- src/core/qgscoordinatereferencesystem_p.h | 2 +- src/core/qgscoordinatetransform_p.h | 2 +- src/core/qgserror.cpp | 2 +- src/core/qgsmaptopixelgeometrysimplifier.cpp | 2 +- src/core/qgspoint.cpp | 8 +++---- src/core/qgspoint.h | 2 +- src/core/qgsprojectfiletransform.cpp | 2 +- src/core/qgsrenderchecker.h | 6 ++--- src/core/qgssqlstatement.h | 2 +- src/core/qgstextrenderer.cpp | 2 +- src/core/qgsvectorlayer.h | 4 ++-- src/core/qgsvectorlayerfeatureiterator.h | 4 ++-- src/core/qgsvectorlayertools.h | 4 ++-- src/core/raster/qgscolorrampshader.cpp | 2 +- src/core/raster/qgsrasterinterface.cpp | 2 +- src/core/raster/qgsrasterlayer.cpp | 2 +- src/core/raster/qgsrasterlayerrenderer.cpp | 2 +- src/core/symbology-ng/qgscptcityarchive.cpp | 2 +- src/core/symbology-ng/qgscptcityarchive.h | 2 +- .../symbology-ng/qgsrulebasedrenderer.cpp | 2 +- src/core/symbology-ng/qgsstyle.cpp | 2 +- src/core/symbology-ng/qgssymbol.cpp | 4 ++-- src/core/symbology-ng/qgssymbollayer.h | 4 ++-- .../attributetable/qgsattributetableview.h | 2 +- src/gui/attributetable/qgsfeaturelistmodel.h | 2 +- src/gui/attributetable/qgsfeaturelistview.h | 2 +- src/gui/qgisgui.cpp | 2 +- src/gui/qgisinterface.h | 2 +- src/gui/qgsadvanceddigitizingdockwidget.cpp | 8 +++---- src/gui/qgsadvanceddigitizingdockwidget.h | 2 +- src/gui/qgscomposerview.cpp | 2 +- src/gui/qgsdetaileditemdelegate.cpp | 2 +- src/gui/qgsexternalresourcewidget.h | 2 +- src/gui/qgsfiledropedit.cpp | 2 +- src/gui/qgshighlight.cpp | 2 +- src/gui/qgsmaplayeractionregistry.h | 2 +- src/gui/qgsmaptooladvanceddigitizing.h | 2 +- src/gui/qgsmaptoolidentify.cpp | 2 +- src/gui/qgsmaptoolidentify.h | 4 ++-- src/gui/qgsowssourceselect.cpp | 2 +- src/gui/qgsprojectionselector.cpp | 4 ++-- src/gui/symbology-ng/qgssizescalewidget.cpp | 2 +- .../evisdatabaseconnection.h | 2 +- .../evisdatabaseconnectiongui.cpp | 2 +- .../evisgenericeventbrowsergui.cpp | 6 ++--- .../eventbrowser/evisimagedisplaywidget.h | 2 +- .../qgsgeometryselfintersectioncheck.cpp | 2 +- .../georeferencer/qgsgeorefplugingui.cpp | 2 +- .../qgstransformsettingsdialog.cpp | 2 +- src/plugins/grass/modules/r.colors.table.qgm | 2 +- src/plugins/grass/modules/r.texture.bis.qgm | 2 +- src/plugins/grass/modules/r.texture.qgm | 2 +- src/plugins/grass/modules/v.clean.prune.qgm | 2 +- src/plugins/grass/qgsgrassmodule.cpp | 4 ++-- src/plugins/grass/qgsgrassplugin.cpp | 2 +- src/plugins/grass/qgsgrasstools.cpp | 2 +- .../grass/scripts/db.connect-login.pg.py | 2 +- .../grass/scripts/v.class.mlpy.qgis.py | 6 ++--- .../spatialquery/qgsmngprogressbar.cpp | 2 +- .../spatialquery/qgsspatialquerydialog.cpp | 2 +- src/plugins/topology/topolTest.cpp | 2 +- src/providers/db2/qgsdb2dataitems.cpp | 4 ++-- .../delimitedtext/qgsdelimitedtextfile.h | 2 +- .../qgsdelimitedtextprovider.cpp | 2 +- .../delimitedtext/qgsdelimitedtextprovider.h | 2 +- .../qgsdelimitedtextsourceselect.cpp | 2 +- src/providers/gdal/qgsgdaldataitems.cpp | 2 +- src/providers/grass/qgsgrassgislib.cpp | 2 +- src/providers/grass/qgsgrassprovidermodule.h | 2 +- .../grass/qgsgrassrasterprovider.cpp | 2 +- src/providers/mssql/qgsmssqldataitems.cpp | 4 ++-- src/providers/mssql/qgsmssqlprovider.h | 2 +- src/providers/ogr/qgsogrdataitems.cpp | 2 +- src/providers/ogr/qgsogrprovider.cpp | 2 +- src/providers/postgres/qgspostgresconn.cpp | 4 ++-- src/providers/postgres/qgspostgresconn.h | 4 ++-- .../spatialite/qgsspatialiteconnection.h | 2 +- src/providers/virtual/qgsvirtuallayerblob.cpp | 2 +- src/providers/virtual/qgsvirtuallayerblob.h | 2 +- src/providers/wcs/URI | 2 +- src/providers/wfs/qgswfsshareddata.cpp | 2 +- src/server/qgsaccesscontrol.h | 4 ++-- src/server/qgsserverinterface.h | 2 +- .../services/wms/qgswmsservertransitional.h | 2 +- tests/bench/README | 2 +- tests/qt_modeltest/modeltest.cpp | 2 +- tests/src/core/testqgsmaprendererjob.cpp | 2 +- tests/src/core/testqgsogcutils.cpp | 2 +- tests/src/providers/testqgswcsprovider.cpp | 2 +- tests/src/python/test_provider_wfs.py | 2 +- tests/src/python/test_qgsauthsystem.py | 2 +- tests/src/python/test_qgsissue7244.py | 2 +- .../testdata/font/QGIS-Vera/RELEASENOTES.TXT | 2 +- .../lighttpd/config/conf/debug.conf | 2 +- .../lighttpd/config/modules.conf | 2 +- 168 files changed, 245 insertions(+), 241 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a123deea0b..a17413f8283 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -451,7 +451,7 @@ IF (WIN32) SET (DEFAULT_BIN_SUBDIR bin) SET (DEFAULT_CGIBIN_SUBDIR bin) # put all the build products into a single directory - # under build (doesnt affect install target) to make for + # under build (doesn't affect install target) to make for # easier debugging. # Turn on defines for non standard maths stuff diff --git a/INSTALL b/INSTALL index 8ec81eb5c6f..c3a9e28cf12 100644 --- a/INSTALL +++ b/INSTALL @@ -753,7 +753,7 @@ to get versions that match your current Qt installed version. =========================== /!\ You can delete the directories with unpacked SIP and PyQt4 sources after a -successfull install, they're not needed anymore. +successful install, they're not needed anymore. 4.2.5. git diff --git a/NEWS b/NEWS index d9970b5fefe..e74e09833b8 100644 --- a/NEWS +++ b/NEWS @@ -1063,7 +1063,7 @@ features for you. Probably the biggest new feature is the addition of the new vector symbology infrastructure. This is provided alongside the old implementation - you can -switch using a button in the vector layer properties dialog. It does't replace +switch using a button in the vector layer properties dialog. It doesn't replace the old symbology implementation completely yet because there are various isues that need to be resolved and a large amount of testinhen it is considered ready. @@ -1926,13 +1926,13 @@ Complete buffering so that bar as well as text will be visible on both Fix for bug [ 973922 ] Overview shows layers in wrong order -Fixed show stopper bug where maplayerregistry wasnt being cleared properly on file new +Fixed show stopper bug where maplayerregistry wasn't being cleared properly on file new Added setZOrder which will be used in next commit to fix projectio zorder problem 2004-06-20 [ts] 0.3.0devel43 -Fix anoying 'mapcanvas isnt freezing while loading rasters' bug +Fix anoying 'mapcanvas isn't freezing while loading rasters' bug 2004-06-19 [ts] 0.3.0devel42 @@ -1947,8 +1947,8 @@ Added an option for setting the length of the scale bar to closest Win32 support for package path - which will hopefully ensure pyramid and overview mini icons are displayed on legend entry now. -Beginnings of generic vector file writer - incomplete and doesnt do anything useful - yet except has abilty to make a shapefile with a couple of user defined fields e.g. +Beginnings of generic vector file writer - incomplete and doesn't do anything useful + yet except has ability to make a shapefile with a couple of user defined fields e.g. to create a new point shapefile: QgsVectorFileWriter myFileWriter("/tmp/test.shp", wkbPoint); @@ -2394,7 +2394,7 @@ updated German translation !! otherwise it's not detected by the plugins autogen.sh (more exactly !! aclocal) !! It can be cheated by adding -I path/to/qgis.m4 to the aclocal of -!! autogen.sh. But be carefull not to commit that to CVS +!! autogen.sh. But be careful not to commit that to CVS 2004-04-18 [jobi] 0.1.0devel33 Added internationalisations stuff @@ -2408,7 +2408,7 @@ Fix for crash when opening singleband grayscale images introduced by Steves grayscale 2004-04-06 [ts] 0.1.0devel31 -Added new plugin (grid_maker) to build arbitary sized graticules and add +Added new plugin (grid_maker) to build arbitrary sized graticules and add them to the current map view. 2004-04-05 [jobi] 0.1.0devel30 diff --git a/ci/travis/check_spelling.sh b/ci/travis/check_spelling.sh index dc5ec5c5bc7..0c666cfac93 100755 --- a/ci/travis/check_spelling.sh +++ b/ci/travis/check_spelling.sh @@ -11,6 +11,5 @@ if [[ ! -z $TRAVIS_PULL_REQUEST_BRANCH ]]; then echo "TRAVIS PR BRANCH: $TRAVIS_PULL_REQUEST_BRANCH" FILES=$(git diff --diff-filter=AM --name-only $(git merge-base HEAD master) | tr '\n' ' ' ) fi - -./scripts/chkspelling_ag.sh $FILES +./scripts/spell_check/check_spelling.sh -r $FILES diff --git a/cmake/FindPyQt4.cmake b/cmake/FindPyQt4.cmake index 77a93e24447..c2c9e9b9548 100644 --- a/cmake/FindPyQt4.cmake +++ b/cmake/FindPyQt4.cmake @@ -12,7 +12,7 @@ # This file defines the following variables: # # PYQT4_VERSION - The version of PyQt4 found expressed as a 6 digit hex number -# suitable for comparision as a string +# suitable for comparison as a string # # PYQT4_VERSION_STR - The version of PyQt4 as a human readable string. # diff --git a/cmake/FindPyQt5.cmake b/cmake/FindPyQt5.cmake index 0fcf1b5bdff..bb449cb4cbd 100644 --- a/cmake/FindPyQt5.cmake +++ b/cmake/FindPyQt5.cmake @@ -12,7 +12,7 @@ # This file defines the following variables: # # PYQT5_VERSION - The version of PyQt5 found expressed as a 6 digit hex number -# suitable for comparision as a string +# suitable for comparison as a string # # PYQT5_VERSION_STR - The version of PyQt5 as a human readable string. # diff --git a/cmake/FindSIP.cmake b/cmake/FindSIP.cmake index c7542200423..744cb25ff98 100644 --- a/cmake/FindSIP.cmake +++ b/cmake/FindSIP.cmake @@ -9,7 +9,7 @@ # This file defines the following variables: # # SIP_VERSION - The version of SIP found expressed as a 6 digit hex number -# suitable for comparision as a string. +# suitable for comparison as a string. # # SIP_VERSION_STR - The version of SIP found as a human readable string. # diff --git a/debian/changelog b/debian/changelog index a0e7e42bcbd..bcc3f7b3c21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -279,7 +279,7 @@ qgis (1.3.0) UNRELEASED; urgency=low * new upstream release * add analysis library and raster terrain analysis plugin - * alternativly depend on libgdal1-1.6.0-grass + * alternatively depend on libgdal1-1.6.0-grass * include CONTRIBUTORS, TRANSLATORS and DONORS * reverse order of libgdal1-*-grass dependencies diff --git a/doc/INSTALL.html b/doc/INSTALL.html index cf1d14ad466..6815e2c965b 100644 --- a/doc/INSTALL.html +++ b/doc/INSTALL.html @@ -1094,7 +1094,7 @@ make install

/!\ You can delete the directories with unpacked SIP and PyQt4 sources after a -successfull install, they're not needed anymore. +successful install, they're not needed anymore.

4.2.5. git

diff --git a/doc/msys.t2t b/doc/msys.t2t index eb1bd12ba23..73e72a913db 100644 --- a/doc/msys.t2t +++ b/doc/msys.t2t @@ -108,7 +108,7 @@ make install ==== Final python notes ==== /!\ You can delete the directories with unpacked SIP and PyQt4 sources after a -successfull install, they're not needed anymore. +successful install, they're not needed anymore. === git === diff --git a/doc/news.html b/doc/news.html index a62ebe5863a..895ef8da0ec 100644 --- a/doc/news.html +++ b/doc/news.html @@ -1192,7 +1192,7 @@ features for you.

Probably the biggest new feature is the addition of the new vector symbology infrastructure. This is provided alongside the old implementation - you can -switch using a button in the vector layer properties dialog. It does't replace +switch using a button in the vector layer properties dialog. It doesn't replace the old symbology implementation completely yet because there are various isues that need to be resolved and a large amount of testinhen it is considered ready. @@ -2099,13 +2099,13 @@ Complete buffering so that bar as well as text will be visible on both

Fix for bug [ 973922 ] Overview shows layers in wrong order

-Fixed show stopper bug where maplayerregistry wasnt being cleared properly on file new +Fixed show stopper bug where maplayerregistry wasn't being cleared properly on file new

Added setZOrder which will be used in next commit to fix projectio zorder problem

2004-06-20 [ts] 0.3.0devel43

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

2004-06-19 [ts] 0.3.0devel42

@@ -2120,8 +2120,8 @@ Added an option for setting the length of the scale bar to closest Win32 support for package path - which will hopefully ensure pyramid and overview mini icons are displayed on legend entry now.

-Beginnings of generic vector file writer - incomplete and doesnt do anything useful - yet except has abilty to make a shapefile with a couple of user defined fields e.g. +Beginnings of generic vector file writer - incomplete and doesn't do anything useful + yet except has ability to make a shapefile with a couple of user defined fields e.g. to create a new point shapefile:

QgsVectorFileWriter myFileWriter("/tmp/test.shp", wkbPoint); @@ -2682,7 +2682,7 @@ updated German translation !! otherwise it's not detected by the plugins autogen.sh (more exactly !! aclocal) !! It can be cheated by adding -I path/to/qgis.m4 to the aclocal of -!! autogen.sh. But be carefull not to commit that to CVS +!! autogen.sh. But be careful not to commit that to CVS

2004-04-18 [jobi] 0.1.0devel33 @@ -2699,7 +2699,7 @@ Fix for crash when opening singleband grayscale images introduced by Steves

2004-04-06 [ts] 0.1.0devel31 -Added new plugin (grid_maker) to build arbitary sized graticules and add +Added new plugin (grid_maker) to build arbitrary sized graticules and add them to the current map view.

diff --git a/doc/news.t2t b/doc/news.t2t index b315114eaf7..7c4493b2fc2 100644 --- a/doc/news.t2t +++ b/doc/news.t2t @@ -1032,7 +1032,7 @@ features for you. Probably the biggest new feature is the addition of the new vector symbology infrastructure. This is provided alongside the old implementation - you can -switch using a button in the vector layer properties dialog. It does't replace +switch using a button in the vector layer properties dialog. It doesn't replace the old symbology implementation completely yet because there are various isues that need to be resolved and a large amount of testinhen it is considered ready. @@ -1877,13 +1877,13 @@ Complete buffering so that bar as well as text will be visible on both Fix for bug [ 973922 ] Overview shows layers in wrong order -Fixed show stopper bug where maplayerregistry wasnt being cleared properly on file new +Fixed show stopper bug where maplayerregistry wasn't being cleared properly on file new Added setZOrder which will be used in next commit to fix projectio zorder problem 2004-06-20 [ts] 0.3.0devel43 -Fix anoying 'mapcanvas isnt freezing while loading rasters' bug +Fix anoying 'mapcanvas isn't freezing while loading rasters' bug 2004-06-19 [ts] 0.3.0devel42 @@ -1898,8 +1898,8 @@ Added an option for setting the length of the scale bar to closest Win32 support for package path - which will hopefully ensure pyramid and overview mini icons are displayed on legend entry now. -Beginnings of generic vector file writer - incomplete and doesnt do anything useful - yet except has abilty to make a shapefile with a couple of user defined fields e.g. +Beginnings of generic vector file writer - incomplete and doesn't do anything useful + yet except has ability to make a shapefile with a couple of user defined fields e.g. to create a new point shapefile: QgsVectorFileWriter myFileWriter("/tmp/test.shp", wkbPoint); @@ -2348,7 +2348,7 @@ updated German translation !! otherwise it's not detected by the plugins autogen.sh (more exactly !! aclocal) !! It can be cheated by adding -I path/to/qgis.m4 to the aclocal of -!! autogen.sh. But be carefull not to commit that to CVS +!! autogen.sh. But be careful not to commit that to CVS 2004-04-18 [jobi] 0.1.0devel33 Added internationalisations stuff @@ -2362,7 +2362,7 @@ Fix for crash when opening singleband grayscale images introduced by Steves grayscale 2004-04-06 [ts] 0.1.0devel31 -Added new plugin (grid_maker) to build arbitary sized graticules and add +Added new plugin (grid_maker) to build arbitrary sized graticules and add them to the current map view. 2004-04-05 [jobi] 0.1.0devel30 diff --git a/python/analysis/interpolation/NormVecDecorator.sip b/python/analysis/interpolation/NormVecDecorator.sip index c6a945f0568..574d92343a7 100644 --- a/python/analysis/interpolation/NormVecDecorator.sip +++ b/python/analysis/interpolation/NormVecDecorator.sip @@ -26,7 +26,7 @@ class NormVecDecorator : TriDecorator bool estimateFirstDerivatives( QProgressDialog* d = 0 ); /** Returns a pointer to the normal vector for the point with the number n*/ Vector3D* getNormal( int n ) const; - /** Finds out, in which triangle a point with coordinates x and y is and assigns the triangle points to p1, p2, p3 and the estimated normals to v1, v2, v3. The vectors are normaly taken from 'mNormVec', exept if p1, p2 or p3 is a point on a breakline. In this case, the normal is calculated on-the-fly. Returns false, if something went wrong and true otherwise*/ + /** Finds out, in which triangle a point with coordinates x and y is and assigns the triangle points to p1, p2, p3 and the estimated normals to v1, v2, v3. The vectors are normaly taken from 'mNormVec', except if p1, p2 or p3 is a point on a breakline. In this case, the normal is calculated on-the-fly. Returns false, if something went wrong and true otherwise*/ bool getTriangle( double x, double y, Point3D* p1 /Out/, Vector3D* v1 /Out/, Point3D* p2 /Out/, Vector3D* v2 /Out/, Point3D* p3 /Out/, Vector3D* v3 /Out/ ); /** This function behaves similar to the one above. Additionally, the numbers of the points are returned (ptn1, ptn2, ptn3) as well as the PointStates of the triangle points (state1, state2, state3) * @note not available in Python bindings diff --git a/python/analysis/openstreetmap/qgsosmimport.sip b/python/analysis/openstreetmap/qgsosmimport.sip index c5dcb52ff3a..0a6467498b0 100644 --- a/python/analysis/openstreetmap/qgsosmimport.sip +++ b/python/analysis/openstreetmap/qgsosmimport.sip @@ -3,7 +3,7 @@ * @brief The QgsOSMXmlImport class imports OpenStreetMap XML format to our topological representation * in a SQLite database (see QgsOSMDatabase for details). * - * How to use the classs: + * How to use the class: * 1. set input XML file name and output DB file name (in constructor or with respective functions) * 2. run import() * 3. check errorString() if the import failed diff --git a/python/core/auth/qgsauthconfig.sip b/python/core/auth/qgsauthconfig.sip index fe308cb69b6..d77e69c1f51 100644 --- a/python/core/auth/qgsauthconfig.sip +++ b/python/core/auth/qgsauthconfig.sip @@ -121,7 +121,7 @@ class QgsAuthMethodConfig * against the config's uri() for auto-selecting authentication configs to use * @note Essentially strips the URL query variables, and by default, strips the path as well * @param accessurl A URL to process - * @param resource Ouput variable for result + * @param resource Output variable for result * @param withpath Whether to include the URI's path in output */ static bool uriToResource( const QString &accessurl, QString *resource, bool withpath = false ); diff --git a/python/core/composer/qgscomposeritem.sip b/python/core/composer/qgscomposeritem.sip index 03ec8843cf0..ddd1cec5e76 100644 --- a/python/core/composer/qgscomposeritem.sip +++ b/python/core/composer/qgscomposeritem.sip @@ -515,7 +515,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem virtual void setVisibility( const bool visible ); /** Returns whether the item should be excluded from composer exports and prints - * @param valueType controls whether the returned value is the user specified vaule, + * @param valueType controls whether the returned value is the user specified value, * or the current evaluated value (which may be affected by data driven settings). * @returns true if item should be excluded * @note added in version 2.5 @@ -629,7 +629,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem /** Evaluates an item's bounding rect to consider data defined position and size of item * and reference point - * @param newRect target bouding rect for item + * @param newRect target bounding rect for item * @param resizeOnly set to true if the item is only being resized. If true then * the position of the returned rect will be adjusted to account for the item's * position mode diff --git a/python/core/qgsnetworkaccessmanager.sip b/python/core/qgsnetworkaccessmanager.sip index 1d98a06cfaf..6d1c2741b51 100644 --- a/python/core/qgsnetworkaccessmanager.sip +++ b/python/core/qgsnetworkaccessmanager.sip @@ -57,7 +57,7 @@ class QgsNetworkAccessManager : QNetworkAccessManager //! Get QNetworkRequest::CacheLoadControl from name static QNetworkRequest::CacheLoadControl cacheLoadControlFromName( const QString &theName ); - //! Setup the NAM according to the user's settings + //! Setup the NAM according to the user's settings #spellok void setupDefaultProxyAndCache(); //! return whether the system proxy should be used diff --git a/python/core/qgspoint.sip b/python/core/qgspoint.sip index 7d2c3305877..97ba9b80878 100644 --- a/python/core/qgspoint.sip +++ b/python/core/qgspoint.sip @@ -241,7 +241,7 @@ class QgsPoint /** Calculates azimuth between this point and other one (clockwise in degree, starting from north) */ double azimuth( const QgsPoint& other ) const; - /** Returns a new point which correponds to this point projected by a specified distance + /** Returns a new point which corresponds to this point projected by a specified distance * in a specified bearing. * @param distance distance to project * @param bearing angle to project in, clockwise in degrees starting from north diff --git a/python/core/qgsrenderchecker.sip b/python/core/qgsrenderchecker.sip index f3f7e58d45a..225cd17c934 100644 --- a/python/core/qgsrenderchecker.sip +++ b/python/core/qgsrenderchecker.sip @@ -80,7 +80,7 @@ class QgsRenderChecker bool runTest( const QString& theTestName, unsigned int theMismatchCount = 0 ); /** - * Test using two arbitary images (map renderer will not be used) + * Test using two arbitrary images (map renderer will not be used) * @param theTestName - to be used as the basis for writing a file to * e.g. /tmp/theTestName.png * @param theMismatchCount - defaults to 0 - the number of pixels that @@ -93,9 +93,9 @@ class QgsRenderChecker bool compareImages( const QString& theTestName, unsigned int theMismatchCount = 0, const QString& theRenderedImageFile = "" ); /** Get a list of all the anomalies. An anomaly is a rendered difference * file where there is some red pixel content (indicating a render check - * mismatch), but where the output was still acceptible. If the render + * mismatch), but where the output was still acceptable. If the render * diff matches one of these anomalies we will still consider it to be - * acceptible. + * acceptable. * @return a bool indicating if the diff matched one of the anomaly files */ bool isKnownAnomaly( const QString& theDiffImageFile ); diff --git a/python/core/qgsvectordataprovider.sip b/python/core/qgsvectordataprovider.sip index b948a131806..88cc6f57ce8 100644 --- a/python/core/qgsvectordataprovider.sip +++ b/python/core/qgsvectordataprovider.sip @@ -157,7 +157,7 @@ class QgsVectorDataProvider : QgsDataProvider * @param substring substring to match (case insensitive) * @param limit maxmum number of the values to return, or -1 to return all unique values * @param feedback optional feedback object for cancelling request - * @returns list of unique strings containg substring + * @returns list of unique strings containing substring */ virtual QStringList uniqueStringsMatching( int index, const QString& substring, int limit = -1, QgsFeedback* feedback = nullptr ) const; diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip index 0f0ce14e5ed..ba30c07b4eb 100644 --- a/python/core/qgsvectorlayer.sip +++ b/python/core/qgsvectorlayer.sip @@ -1580,7 +1580,7 @@ class QgsVectorLayer : QgsMapLayer, QgsExpressionContextGenerator /** Is emitted, when edited changes successfully have been written to the data provider */ void editingStopped(); - /** Is emitted, before changes are commited to the data provider */ + /** Is emitted, before changes are committed to the data provider */ void beforeCommitChanges(); /** Is emitted, before changes are rolled back*/ diff --git a/python/core/qgsvectorlayerfeatureiterator.sip b/python/core/qgsvectorlayerfeatureiterator.sip index 0685e20592b..3a102df6874 100644 --- a/python/core/qgsvectorlayerfeatureiterator.sip +++ b/python/core/qgsvectorlayerfeatureiterator.sip @@ -59,12 +59,12 @@ class QgsVectorLayerFeatureIterator : QgsAbstractFeatureIterator */ //void addVirtualAttributes( QgsFeature &f ); - /** Update feature with uncommited attribute updates. + /** Update feature with uncommitted attribute updates. * @note not available in Python bindings */ //void updateChangedAttributes( QgsFeature& f ); - /** Update feature with uncommited geometry updates. + /** Update feature with uncommitted geometry updates. * @note not available in Python bindings */ //void updateFeatureGeometry( QgsFeature& f ); diff --git a/python/core/qgsvectorlayertools.sip b/python/core/qgsvectorlayertools.sip index fcc2c8b90a1..67216ba4dab 100644 --- a/python/core/qgsvectorlayertools.sip +++ b/python/core/qgsvectorlayertools.sip @@ -31,7 +31,7 @@ class QgsVectorLayerTools : QObject virtual bool startEditing( QgsVectorLayer* layer ) const = 0; /** - * Will be called, when an editing session is ended and the features should be commited. + * Will be called, when an editing session is ended and the features should be committed. * Appropriate dialogs should be shown like * * @param layer The layer to commit @@ -41,7 +41,7 @@ class QgsVectorLayerTools : QObject virtual bool stopEditing( QgsVectorLayer* layer, bool allowCancel = true ) const = 0; /** - * Should be called, when the features should be commited but the editing session is not ended. + * Should be called, when the features should be committed but the editing session is not ended. * * @param layer The layer to commit * @return True if successful diff --git a/python/core/symbology-ng/qgscptcityarchive.sip b/python/core/symbology-ng/qgscptcityarchive.sip index ab758d032ac..b01bda03bff 100644 --- a/python/core/symbology-ng/qgscptcityarchive.sip +++ b/python/core/symbology-ng/qgscptcityarchive.sip @@ -315,7 +315,7 @@ class QgsCptCityBrowserModel : QAbstractItemModel // Refresh item specified by path void refresh( const QString& path ); - // Refresh item childs + // Refresh item children void refresh( const QModelIndex &index = QModelIndex() ); //! return index of a path diff --git a/python/core/symbology-ng/qgssymbollayer.sip b/python/core/symbology-ng/qgssymbollayer.sip index b9c8bf85d42..e9a3531cc6f 100644 --- a/python/core/symbology-ng/qgssymbollayer.sip +++ b/python/core/symbology-ng/qgssymbollayer.sip @@ -225,7 +225,7 @@ class QgsSymbolLayer virtual bool hasDataDefinedProperties() const; /** Checks whether the layer has a matching data defined property and if - * that property is currently actived. + * that property is currently activated. * @param property property key * @returns true if data defined property exists and is active * @see hasDataDefinedProperties @@ -243,7 +243,7 @@ class QgsSymbolLayer * @param defaultVal default value to return if evaluation was not successful * @param ok if specified, will be set to true if evaluation was successful * @returns calculated value for data defined property, or default value - * if property does not exist or is deactived. + * if property does not exist or is deactivated. * @see hasDataDefinedProperty * @see getDataDefinedProperty * @note added in QGIS 2.12 diff --git a/python/gui/attributetable/qgsattributetableview.sip b/python/gui/attributetable/qgsattributetableview.sip index cb73d7cbb31..751dafbcaa2 100644 --- a/python/gui/attributetable/qgsattributetableview.sip +++ b/python/gui/attributetable/qgsattributetableview.sip @@ -86,7 +86,7 @@ class QgsAttributeTableView : QTableView signals: /** * @brief - * Is emitted, in order to provide a hook to add aditional menu entries to the context menu. + * Is emitted, in order to provide a hook to add additional* menu entries to the context menu. * * @param menu If additional QMenuItems are added, they will show up in the context menu. * @param atIndex The QModelIndex, to which the context menu belongs. Relative to the source model. diff --git a/python/gui/attributetable/qgsfeaturelistmodel.sip b/python/gui/attributetable/qgsfeaturelistmodel.sip index 6e9d9d72e5e..ff8a336463b 100644 --- a/python/gui/attributetable/qgsfeaturelistmodel.sip +++ b/python/gui/attributetable/qgsfeaturelistmodel.sip @@ -53,7 +53,7 @@ class QgsFeatureListModel : QAbstractProxyModel, QgsFeatureModel /** * @brief Returns a detailed message about errors while parsing a QgsExpression. - * @return A message containg information about the parser error. + * @return A message containing information about the parser error. */ QString parserErrorString(); diff --git a/python/gui/attributetable/qgsfeaturelistview.sip b/python/gui/attributetable/qgsfeaturelistview.sip index 6019de1b945..54b22bd96fb 100644 --- a/python/gui/attributetable/qgsfeaturelistview.sip +++ b/python/gui/attributetable/qgsfeaturelistview.sip @@ -57,7 +57,7 @@ class QgsFeatureListView : QListView /** * Returns a detailed message about errors while parsing a QgsExpression. * - * @return A message containg information about the parser error. + * @return A message containing information about the parser error. */ QString parserErrorString(); diff --git a/python/gui/qgisinterface.sip b/python/gui/qgisinterface.sip index 6449fff3bb0..10053a8741b 100644 --- a/python/gui/qgisinterface.sip +++ b/python/gui/qgisinterface.sip @@ -535,7 +535,7 @@ class QgisInterface : QObject virtual QgsVectorLayerTools* vectorLayerTools() = 0; /** This method is only needed when using a UI form with a custom widget plugin and calling - * openFeatureForm or getFeatureForm from Python (PyQt4) and you havn't used the info tool first. + * openFeatureForm or getFeatureForm from Python (PyQt4) and you haven't used the info tool first. * Python will crash bringing QGIS wtih it * if the custom form is not loaded from a C++ method call. * diff --git a/python/gui/qgsadvanceddigitizingdockwidget.sip b/python/gui/qgsadvanceddigitizingdockwidget.sip index f63a181dc69..28782b2f081 100644 --- a/python/gui/qgsadvanceddigitizingdockwidget.sip +++ b/python/gui/qgsadvanceddigitizingdockwidget.sip @@ -310,7 +310,7 @@ class QgsAdvancedDigitizingDockWidget : QDockWidget private slots: //! set the additiona constraint by clicking on the perpendicular/parallel buttons - void addtionalConstraintClicked( bool activated ); + void additionalConstraintClicked( bool activated ); //! lock/unlock a constraint and set its value void lockConstraint( bool activate = true ); diff --git a/python/gui/qgsexternalresourcewidget.sip b/python/gui/qgsexternalresourcewidget.sip index 70809ce186d..f51c798e7bb 100644 --- a/python/gui/qgsexternalresourcewidget.sip +++ b/python/gui/qgsexternalresourcewidget.sip @@ -38,7 +38,7 @@ class QgsExternalResourceWidget : QWidget //! returns the type of content used in the document viewer QgsExternalResourceWidget::DocumentViewerContent documentViewerContent() const; - //! setDocumentViewerContent defines the type of content to be shown. Widget will be adapated accordingly + //! setDocumentViewerContent defines the type of content to be shown. Widget will be adapted accordingly void setDocumentViewerContent( QgsExternalResourceWidget::DocumentViewerContent content ); //! returns the height of the document viewer diff --git a/python/gui/qgsmaplayeractionregistry.sip b/python/gui/qgsmaplayeractionregistry.sip index 8212acc70f7..783f2fcdd53 100644 --- a/python/gui/qgsmaplayeractionregistry.sip +++ b/python/gui/qgsmaplayeractionregistry.sip @@ -15,7 +15,7 @@ class QgsMapLayerAction : QAction typedef QFlags Targets; //! Creates a map layer action which can run on any layer - //! @note using AllActions as a target probably does not make a lot of sense. This default action was settled for API compatiblity reasons. + //! @note using AllActions as a target probably does not make a lot of sense. This default action was settled for API compatibility reasons. QgsMapLayerAction( const QString& name, QObject *parent /TransferThis/, Targets targets = AllActions, const QIcon& icon = QIcon() ); //! Creates a map layer action which can run only on a specific layer diff --git a/python/gui/qgsmaptooladvanceddigitizing.sip b/python/gui/qgsmaptooladvanceddigitizing.sip index 60be954e25b..4e86456f40f 100644 --- a/python/gui/qgsmaptooladvanceddigitizing.sip +++ b/python/gui/qgsmaptooladvanceddigitizing.sip @@ -14,7 +14,7 @@ ***************************************************************************/ /** - * @brief The QgsMapToolAdvancedDigitizing class is a QgsMapTool whcih gives event directly in map coordinates and allows filtering its events. + * @brief The QgsMapToolAdvancedDigitizing class is a QgsMapTool which gives event directly in map coordinates and allows filtering its events. * Events from QgsMapTool are caught and their QMouseEvent are transformed into QgsMapMouseEvent (with map coordinates). * Events are then forwarded to corresponding virtual methods which can be reimplemented in subclasses. * An event filter can be set on the map tool to filter and modify the events in map coordinates (@see QgsMapToolMapEventFilter). diff --git a/python/gui/qgsmaptoolidentify.sip b/python/gui/qgsmaptoolidentify.sip index 4ea75faa6a8..8a685925a99 100644 --- a/python/gui/qgsmaptoolidentify.sip +++ b/python/gui/qgsmaptoolidentify.sip @@ -71,7 +71,7 @@ class QgsMapToolIdentify : QgsMapTool QList identify( int x, int y, const QList& layerList = QList(), IdentifyMode mode = DefaultQgsSetting ); /** Performs the identification. - To avoid beeing forced to specify IdentifyMode with a list of layers + To avoid being forced to specify IdentifyMode with a list of layers this has been made private and two publics methods are offered @param x x coordinates of mouseEvent @param y y coordinates of mouseEvent @@ -94,7 +94,7 @@ class QgsMapToolIdentify : QgsMapTool protected: /** Performs the identification. - To avoid beeing forced to specify IdentifyMode with a list of layers + To avoid being forced to specify IdentifyMode with a list of layers this has been made private and two publics methods are offered @param x x coordinates of mouseEvent @param y y coordinates of mouseEvent diff --git a/python/plugins/db_manager/db_plugins/oracle/TODO.md b/python/plugins/db_manager/db_plugins/oracle/TODO.md index 85a13c07053..55a54a2017f 100644 --- a/python/plugins/db_manager/db_plugins/oracle/TODO.md +++ b/python/plugins/db_manager/db_plugins/oracle/TODO.md @@ -104,7 +104,7 @@ * Connector * getVectorTablesCache should present only one line per table (don't show tables more than once). - * correspondance between Oracle SDO_GTYPE and Qgis.WkbType in a class dict. + * correspondence between Oracle SDO_GTYPE and Qgis.WkbType in a class dict. * Show only one table/layer in the table tree even if entry is duplicated in cache. * Reuse the pre-calculated extent metadata when updating. * Create a better privilege function using ALL_PRIVS_RECD diff --git a/python/plugins/db_manager/db_plugins/postgis/connector.py b/python/plugins/db_manager/db_plugins/postgis/connector.py index b2ba6b6ff10..6096e201b84 100644 --- a/python/plugins/db_manager/db_plugins/postgis/connector.py +++ b/python/plugins/db_manager/db_plugins/postgis/connector.py @@ -513,7 +513,7 @@ class PostGisDBConnector(DBConnector): return res def getTableIndexes(self, table): - """ get info about table's indexes. ignore primary key constraint index, they get listed in constaints """ + """ get info about table's indexes. ignore primary key constraint index, they get listed in constraints """ schema, tablename = self.getSchemaTableName(table) schema_where = u" AND nspname=%s " % self.quoteString(schema) if schema is not None else "" diff --git a/python/plugins/db_manager/db_plugins/spatialite/sql_dictionary.py b/python/plugins/db_manager/db_plugins/spatialite/sql_dictionary.py index e8054439b0b..42aa41060a3 100644 --- a/python/plugins/db_manager/db_plugins/spatialite/sql_dictionary.py +++ b/python/plugins/db_manager/db_plugins/spatialite/sql_dictionary.py @@ -116,7 +116,7 @@ spatialite_functions = [ # from www.gaia-gis.it/spatialite-2.3.0/spatialite-sql # SQL functions for Spatial-MetaData and Spatial-Index handling "*initspatialmetadata", "*addgeometrycolumn", "*recovergeometrycolumn", "*discardgeometrycolumn", "*createspatialindex", "*creatembrcache", "*disablespatialindex", - # SQL functions implementing FDO/OGR compatibily + # SQL functions implementing FDO/OGR compatibility "*checkspatialmetadata", "*autofdostart", "*autofdostop", "*initfdospatialmetadata", "*addfdogeometrycolumn", "*recoverfdogeometrycolumn", "*discardfdogeometrycolumn", # SQL functions for MbrCache-based queries diff --git a/python/plugins/db_manager/db_plugins/vlayers/sql_dictionary.py b/python/plugins/db_manager/db_plugins/vlayers/sql_dictionary.py index 85e4eac61c1..e43b9d2adc3 100644 --- a/python/plugins/db_manager/db_plugins/vlayers/sql_dictionary.py +++ b/python/plugins/db_manager/db_plugins/vlayers/sql_dictionary.py @@ -117,7 +117,7 @@ spatialite_functions = [ # from www.gaia-gis.it/spatialite-2.3.0/spatialite-sql # SQL functions for Spatial-MetaData and Spatial-Index handling "*initspatialmetadata", "*addgeometrycolumn", "*recovergeometrycolumn", "*discardgeometrycolumn", "*createspatialindex", "*creatembrcache", "*disablespatialindex", - # SQL functions implementing FDO/OGR compatibily + # SQL functions implementing FDO/OGR compatibility "*checkspatialmetadata", "*autofdostart", "*autofdostop", "*initfdospatialmetadata", "*addfdogeometrycolumn", "*recoverfdogeometrycolumn", "*discardfdogeometrycolumn", # SQL functions for MbrCache-based queries diff --git a/python/plugins/processing/algs/help/qgis.yaml b/python/plugins/processing/algs/help/qgis.yaml index 188f45bc7e9..f93473cdbf0 100644 --- a/python/plugins/processing/algs/help/qgis.yaml +++ b/python/plugins/processing/algs/help/qgis.yaml @@ -247,7 +247,7 @@ qgis:intersection: > qgis:joinattributesbylocation: > This algorithm takes an input vector layer and creates a new vector layer that is an extended version of the input one, with additional attributes in its attribute table. - The additional attributes and their values are taken from a second vector layer. A spatial critera is applied to select the values from the second layer that are added to each feature from the first layer in the resulting one. + The additional attributes and their values are taken from a second vector layer. A spatial criteria is applied to select the values from the second layer that are added to each feature from the first layer in the resulting one. qgis:joinattributestable: > @@ -441,7 +441,7 @@ qgis:rasterlayerstatistics: > qgis:refactorfields: > This algorithms allows editing the structure of the attributes table of a vector layer. Fields can be modified in their type and name, using a fields mapping - The original layer is not modified. A new layer is generated, which contains a modified attributes table, accordint to the provided fields mapping + The original layer is not modified. A new layer is generated, which contains a modified attributes table, according to the provided fields mapping qgis:regularpoints: diff --git a/python/plugins/processing/algs/lidar/lastools/lascontrol.py b/python/plugins/processing/algs/lidar/lastools/lascontrol.py index f2f9d77a962..6821fe04110 100644 --- a/python/plugins/processing/algs/lidar/lastools/lascontrol.py +++ b/python/plugins/processing/algs/lidar/lastools/lascontrol.py @@ -42,7 +42,7 @@ class lascontrol(LAStoolsAlgorithm): CONTROL_POINT_FILE = "CONTROL_POINT_FILE" PARSE_STRING = "PARSE_STRING" USE_POINTS = "USE_POINTS" - USE_POINTS_LIST = ["all", "ground (2)", "ground (2) and keypoints (8)", "ground (2), buldings (6), and keypoints (8)"] + USE_POINTS_LIST = ["all", "ground (2)", "ground (2) and keypoints (8)", "ground (2), buildings (6), and keypoints (8)"] ADJUST_Z = "ADJUST_Z" def defineCharacteristics(self): diff --git a/python/plugins/processing/algs/qgis/Eliminate.py b/python/plugins/processing/algs/qgis/Eliminate.py index 689b308e5a0..8d698eb94ce 100644 --- a/python/plugins/processing/algs/qgis/Eliminate.py +++ b/python/plugins/processing/algs/qgis/Eliminate.py @@ -154,7 +154,7 @@ class Eliminate(GeoAlgorithm): msg = '' if y.isNull(): - # Conversion was unsuccessfull + # Conversion was unsuccessful selectionError = True msg += self.tr('Enter the date and the date format, e.g. "07.26.2011" "MM.dd.yyyy".') diff --git a/python/plugins/processing/tools/postgis.py b/python/plugins/processing/tools/postgis.py index bf3a2772da3..08a05c2c0fe 100644 --- a/python/plugins/processing/tools/postgis.py +++ b/python/plugins/processing/tools/postgis.py @@ -411,7 +411,7 @@ class GeoDB(object): def get_table_indexes(self, table, schema=None): """Get info about table's indexes. ignore primary key and unique - index, they get listed in constaints. + index, they get listed in constraints. """ c = self.con.cursor() diff --git a/python/pyplugin_installer/version_compare.py b/python/pyplugin_installer/version_compare.py index 4071d3091fd..07a37ad73f6 100644 --- a/python/pyplugin_installer/version_compare.py +++ b/python/pyplugin_installer/version_compare.py @@ -1,7 +1,7 @@ """ /*************************************************************************** Plugin Installer module - Plugin version comparision functions + Plugin version comparison functions ------------------- Date : 2008-11-24 Copyright : (C) 2008 by Borys Jurgiel @@ -23,7 +23,7 @@ and recognizes all major notations, prefixes (ver. and version), delimiters Usage: compareVersions(version1, version2) -The function accepts arguments of any type convertable to Unicode string +The function accepts arguments of any type convertible to Unicode string and returns integer value: 0 - the versions are equal 1 - version 1 is higher diff --git a/python/server/qgsserverinterface.sip b/python/server/qgsserverinterface.sip index 0499089eaec..85e97b9ac33 100644 --- a/python/server/qgsserverinterface.sip +++ b/python/server/qgsserverinterface.sip @@ -24,7 +24,7 @@ * made available to plugins. * * This class provides methods to access the request handler and - * the capabilties cache. A method to read the environment + * the capabilities cache. A method to read the environment * variables set in the main FCGI loop is also available. * Plugins can add listeners (instances of QgsServerFilter) with * a certain priority through the registerFilter( QgsServerFilter* , int) method. diff --git a/python/server/qgsservicemodule.sip b/python/server/qgsservicemodule.sip index 40bfc5fa8c9..4f67ab34aee 100644 --- a/python/server/qgsservicemodule.sip +++ b/python/server/qgsservicemodule.sip @@ -41,7 +41,7 @@ class QgsServiceModule virtual ~QgsServiceModule() = 0; /** - * Ask module to registe all provided services + * Ask module to register all provided services * @param registry QgsServiceRegistry */ virtual void registerSelf( QgsServiceRegistry& registry, diff --git a/qgis.dtd b/qgis.dtd index 1cfa6c65547..437775abacd 100644 --- a/qgis.dtd +++ b/qgis.dtd @@ -105,7 +105,7 @@ outlinecolor,outlinestyle,outlinewidth,fillcolor,fillpattern) > - + diff --git a/resources/cpt-city-qgis-min/selections/div.xml b/resources/cpt-city-qgis-min/selections/div.xml index 3f2ed12522b..ef5b8ea3b0f 100644 --- a/resources/cpt-city-qgis-min/selections/div.xml +++ b/resources/cpt-city-qgis-min/selections/div.xml @@ -2,10 +2,10 @@ Diverging - Palettes for diverging, signed or anomoly data + Palettes for diverging, signed or anomaly data - Palettes for diverging, signed or anomoly data. + Palettes for diverging, signed or anomaly data. Kenneth Moreland diff --git a/rpm/default.cfg b/rpm/default.cfg index a83d735537e..00394cc0b15 100644 --- a/rpm/default.cfg +++ b/rpm/default.cfg @@ -2,7 +2,7 @@ # # Create a file local.cfg instead and redefine any options in your local.cfg. # -# This file conatins a default configuration and will be overwritten by the +# This file contains a default configuration and will be overwritten by the # maintainer. # Where should the results go diff --git a/scripts/spell_check/.agignore b/scripts/spell_check/.agignore index 7e77281b08f..caea4933fe7 100644 --- a/scripts/spell_check/.agignore +++ b/scripts/spell_check/.agignore @@ -13,6 +13,7 @@ python/qsci_apis/ src/app/dwg/libdxfrw/ src/app/gps/qwtpolar-1.0/ src/app/gps/qwtpolar-1.1.1/ +src/core/pal src/plugins/grass/qtermwidget/ #Extensions @@ -45,5 +46,3 @@ resources/cpt-city-qgis-min/wkp/schwarzwald/COPYING.xml tests/testdata/qgis_server/ets-wms13/project.qgs tests/testdata/qgis_server_accesscontrol/project.qgs tests/testdata/qgis_server_accesscontrol/Hello.qml - - diff --git a/scripts/spell_check/spelling.dat b/scripts/spell_check/spelling.dat index cea656297ad..a8d4701707d 100644 --- a/scripts/spell_check/spelling.dat +++ b/scripts/spell_check/spelling.dat @@ -244,8 +244,8 @@ adecuate:adequate adequit:adequate adhearing:adhering adherance:adherence -aditional:additional -aditionally:additionally +aditional:additional:* +aditionally:additionally:* aditionaly:additionally admendment:amendment admininistrative:administrative @@ -349,7 +349,7 @@ alcholic:alcoholic alcohal:alcohol alcoholical:alcoholic aleady:already -aledge:allege +aledge:allege:* aledged:alleged aledges:alleges alege:allege @@ -537,7 +537,7 @@ apperances:appearances appereance:appearance appereances:appearances appered:appeared -appers:appears +appers:appears* applicaiton:application applicaitons:applications appliction:application @@ -633,7 +633,7 @@ arguements:arguments aribitary:arbitrary aribtrarily:arbitrarily aribtrary:arbitrary -arised:arose +arised:arose:* arithmatic:arithmetic arithmentic:arithmetic aritmetic:arithmetic @@ -781,7 +781,7 @@ attemts:attempts attendence:attendance attendent:attendant attendents:attendants -attened:attended +attened:attended:* attension:attention attibute:attribute attibutes:attributes @@ -818,7 +818,7 @@ authrorities:authorities autochtonous:autochthonous autoctonous:autochthonous autoincrememnt:autoincrement -automaticall:automatically +automaticall:automatically* automaticaly:automatically automaticly:automatically automatize:automate @@ -858,6 +858,7 @@ avaluated:evaluated avaluate:evaluate avaluates:evaluates avaluating:evaluating +avaoided:avoided avation:aviation avengence:a vengeance averageed:averaged @@ -1120,7 +1121,7 @@ cartilege:cartilage cartilidge:cartilage cartrige:cartridge casette:cassette -casion:caisson +casion:caisson:* cassawory:cassowary cassowarry:cassowary casue:cause @@ -1273,7 +1274,7 @@ clasifies:classifies clasify:classify clasifying:classifying classess:classes -classs:class +classs:class:* classses:classes cleareance:clearance clearified:clarified @@ -5335,6 +5336,7 @@ proctecting:protecting proctect:protect proctects:protects procude:produce +proejction:projection profesion:profession profesor:professor professer:professor @@ -5358,6 +5360,7 @@ progresss:progress progrom:program progroms:programs prohabition:prohibition +projectio:projection prologomena:prolegomena prominance:prominence prominantly:prominently @@ -5746,6 +5749,7 @@ reminscent:reminiscent reminsicent:reminiscent remoote:remote removeable:removable +rendereing:rendering renderering:rendering rendevous:rendezvous rendezous:rendezvous @@ -6156,6 +6160,7 @@ seperatly:separately seperator:separator sepina:subpoena sepperate:separate +seprate:separate seprator:separator seprators:separators sepulchure:sepulchre @@ -7375,6 +7380,7 @@ wehn:when weigth:weight weilded:wielded weild:wield +weill:will weired:weird wendsay:Wednesday wensday:Wednesday diff --git a/src/analysis/interpolation/CloughTocherInterpolator.cc b/src/analysis/interpolation/CloughTocherInterpolator.cc index 4ac5c1e566e..c0a3aa294c0 100644 --- a/src/analysis/interpolation/CloughTocherInterpolator.cc +++ b/src/analysis/interpolation/CloughTocherInterpolator.cc @@ -73,7 +73,7 @@ bool CloughTocherInterpolator::calcNormVec( double x, double y, Vector3D* result if ( result ) { init( x, y ); - Point3D barycoord( 0, 0, 0 );//barycentric coordinates of (x,y) whith respect to the triangle + Point3D barycoord( 0, 0, 0 );//barycentric coordinates of (x,y) with respect to the triangle Point3D endpointUXY( 0, 0, 0 );//endpoint of the derivative in u-direction (in xy-coordinates) Point3D endpointV( 0, 0, 0 );//endpoint of the derivative in v-direction (in barycentric coordinates) Point3D endpointVXY( 0, 0, 0 );//endpoint of the derivative in v-direction (in xy-coordinates) diff --git a/src/analysis/interpolation/DualEdgeTriangulation.cc b/src/analysis/interpolation/DualEdgeTriangulation.cc index 5c5a56d6fb4..bff234b2d98 100644 --- a/src/analysis/interpolation/DualEdgeTriangulation.cc +++ b/src/analysis/interpolation/DualEdgeTriangulation.cc @@ -1527,7 +1527,7 @@ int DualEdgeTriangulation::insertForcedSegment( int p1, int p2, bool breakline ) rightPolygon.append( mHalfEdge[mHalfEdge[crossedEdges.last()]->getDual()]->getNext() ); mHalfEdge[rightPolygon.last()]->setNext( dualfirstedge );//set 'Next' of the last edge to dualfirstedge - //set the necessary nexts of leftPolygon(exept the first) + //set the necessary nexts of leftPolygon(except the first) int actedgel = leftPolygon[1]; leftiter = leftPolygon.constBegin(); leftiter += 2; diff --git a/src/analysis/interpolation/NormVecDecorator.h b/src/analysis/interpolation/NormVecDecorator.h index 836de5bc918..f94db7d5bb8 100644 --- a/src/analysis/interpolation/NormVecDecorator.h +++ b/src/analysis/interpolation/NormVecDecorator.h @@ -51,7 +51,7 @@ class ANALYSIS_EXPORT NormVecDecorator: public TriDecorator bool estimateFirstDerivatives( QProgressDialog* d = nullptr ); //! Returns a pointer to the normal vector for the point with the number n Vector3D* getNormal( int n ) const; - //! Finds out, in which triangle a point with coordinates x and y is and assigns the triangle points to p1, p2, p3 and the estimated normals to v1, v2, v3. The vectors are normaly taken from 'mNormVec', exept if p1, p2 or p3 is a point on a breakline. In this case, the normal is calculated on-the-fly. Returns false, if something went wrong and true otherwise + //! Finds out, in which triangle a point with coordinates x and y is and assigns the triangle points to p1, p2, p3 and the estimated normals to v1, v2, v3. The vectors are normaly taken from 'mNormVec', except if p1, p2 or p3 is a point on a breakline. In this case, the normal is calculated on-the-fly. Returns false, if something went wrong and true otherwise bool getTriangle( double x, double y, Point3D* p1, Vector3D* v1, Point3D* p2, Vector3D* v2, Point3D* p3, Vector3D* v3 ); /** This function behaves similar to the one above. Additionally, the numbers of the points are returned (ptn1, ptn2, ptn3) as well as the PointStates of the triangle points (state1, state2, state3) diff --git a/src/analysis/openstreetmap/qgsosmimport.h b/src/analysis/openstreetmap/qgsosmimport.h index 5a1d4cef54e..60220cef63a 100644 --- a/src/analysis/openstreetmap/qgsosmimport.h +++ b/src/analysis/openstreetmap/qgsosmimport.h @@ -28,7 +28,7 @@ class QXmlStreamReader; * @brief The QgsOSMXmlImport class imports OpenStreetMap XML format to our topological representation * in a SQLite database (see QgsOSMDatabase for details). * - * How to use the classs: + * How to use the class: * 1. set input XML file name and output DB file name (in constructor or with respective functions) * 2. run import() * 3. check errorString() if the import failed diff --git a/src/analysis/vector/qgspointsample.cpp b/src/analysis/vector/qgspointsample.cpp index d3f114b711b..baec2abd8ef 100644 --- a/src/analysis/vector/qgspointsample.cpp +++ b/src/analysis/vector/qgspointsample.cpp @@ -64,7 +64,7 @@ int QgsPointSample::createRandomPoints( QProgressDialog* pd ) QgsWkbTypes::Point, mInputLayer->crs() ); - //check if creation of output layer successfull + //check if creation of output layer successful if ( writer.hasError() != QgsVectorFileWriter::NoError ) { return 3; diff --git a/src/app/composer/qgscomposeritemwidget.h b/src/app/composer/qgscomposeritemwidget.h index b13932c5e31..c01caef05c9 100644 --- a/src/app/composer/qgscomposeritemwidget.h +++ b/src/app/composer/qgscomposeritemwidget.h @@ -61,7 +61,7 @@ class QgsComposerConfigObject: public QObject /** Registers a data defined button, setting up its initial value, connections and description. * @param button button to register - * @param property correponding data defined property + * @param property corresponding data defined property * @param type valid data types for button * @param description user visible description for data defined property */ @@ -101,7 +101,7 @@ class QgsComposerItemBaseWidget: public QgsPanelWidget /** Registers a data defined button, setting up its initial value, connections and description. * @param button button to register - * @param property correponding data defined property + * @param property corresponding data defined property * @param type valid data types for button * @param description user visible description for data defined property */ diff --git a/src/app/gps/qgsgpsinformationwidget.cpp b/src/app/gps/qgsgpsinformationwidget.cpp index 8a6e6f2a8e8..288fa709806 100644 --- a/src/app/gps/qgsgpsinformationwidget.cpp +++ b/src/app/gps/qgsgpsinformationwidget.cpp @@ -683,7 +683,7 @@ void QgsGPSInformationWidget::displayGPSInformation( const QgsGPSInformation& in mTxtStatus->setText( info.status == 'A' ? tr( "Valid" ) : info.status == 'V' ? tr( "Invalid" ) : QLatin1String( "" ) ); } //position - // Avoid refreshing / panning if we havent moved + // Avoid refreshing / panning if we haven't moved if ( mLastGpsPosition != myNewCenter ) { mLastGpsPosition = myNewCenter; diff --git a/src/app/qgisappinterface.h b/src/app/qgisappinterface.h index 8a5c924cc47..245d9f62f9a 100644 --- a/src/app/qgisappinterface.h +++ b/src/app/qgisappinterface.h @@ -497,7 +497,7 @@ class APP_EXPORT QgisAppInterface : public QgisInterface virtual QgsVectorLayerTools* vectorLayerTools() override; /** This method is only needed when using a UI form with a custom widget plugin and calling - * openFeatureForm or getFeatureForm from Python (PyQt4) and you havn't used the info tool first. + * openFeatureForm or getFeatureForm from Python (PyQt4) and you haven't used the info tool first. * Python will crash bringing QGIS wtih it * if the custom form is not loaded from a C++ method call. * diff --git a/src/app/qgsdecorationnortharrow.h b/src/app/qgsdecorationnortharrow.h index a9971f428cd..231f19b142d 100644 --- a/src/app/qgsdecorationnortharrow.h +++ b/src/app/qgsdecorationnortharrow.h @@ -46,7 +46,7 @@ class APP_EXPORT QgsDecorationNorthArrow: public QgsDecorationItem //! Show the dialog box void run() override; - //! draw some arbitary text to the screen + //! draw some arbitrary text to the screen void render( QPainter * ) override; //! try to calculate the direction for the north arrow. Sets the diff --git a/src/app/qgsguivectorlayertools.h b/src/app/qgsguivectorlayertools.h index ecc57ce7664..42c234efb9a 100644 --- a/src/app/qgsguivectorlayertools.h +++ b/src/app/qgsguivectorlayertools.h @@ -52,7 +52,7 @@ class QgsGuiVectorLayerTools : public QgsVectorLayerTools bool startEditing( QgsVectorLayer* layer ) const override; /** - * Should be called, when an editing session is ended and the features should be commited. + * Should be called, when an editing session is ended and the features should be committed. * An appropriate dialog asking the user if he wants to save the edits will be shown if * allowCancel is set to true. * @@ -64,7 +64,7 @@ class QgsGuiVectorLayerTools : public QgsVectorLayerTools bool stopEditing( QgsVectorLayer* layer, bool allowCancel = true ) const override; /** - * Should be called, when the features should be commited but the editing session is not ended. + * Should be called, when the features should be committed but the editing session is not ended. * * @param layer The layer to commit * @return True if successful diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp index 347cedc8e92..933918e021d 100644 --- a/src/app/qgsidentifyresultsdialog.cpp +++ b/src/app/qgsidentifyresultsdialog.cpp @@ -1941,7 +1941,7 @@ void QgsIdentifyResultsDialog::formatChanged( int index ) // Store selected identify format in layer layer->setCustomProperty( QStringLiteral( "identify/format" ), QgsRasterDataProvider::identifyFormatName( format ) ); - // remove all childs of that layer from results, except the first (format) + // remove all children of that layer from results, except the first (format) QTreeWidgetItem *layItem = layerItem( layer ); if ( !layItem ) { diff --git a/src/app/qgsprojectproperties.h b/src/app/qgsprojectproperties.h index 559b0ebfbd8..a47e1b763c4 100644 --- a/src/app/qgsprojectproperties.h +++ b/src/app/qgsprojectproperties.h @@ -173,7 +173,7 @@ class APP_EXPORT QgsProjectProperties : public QgsOptionsDialogBase, private Ui: //! Signal used to inform listeners that the mouse display precision may have changed void displayPrecisionChanged(); - //! Signal used to inform listeners that project scale list may have chnaged + //! Signal used to inform listeners that project scale list may have changed void scalesChanged( const QStringList &scales = QStringList() ); //! let listening canvases know to refresh diff --git a/src/astyle/ASBeautifier.cpp b/src/astyle/ASBeautifier.cpp index d81ded72295..d1548ce2711 100644 --- a/src/astyle/ASBeautifier.cpp +++ b/src/astyle/ASBeautifier.cpp @@ -1649,7 +1649,7 @@ string ASBeautifier::beautify(const string &originalLine) foundAssignmentOp = findHeader(line, i, assignmentOperators, true); const string *foundNonAssignmentOp = findHeader(line, i, nonAssignmentOperators, false); - // Since findHeader's boundry checking was not used above, it is possible + // Since findHeader's boundary checking was not used above, it is possible // that both an assignment op and a non-assignment op where found, // e.g. '>>' and '>>='. If this is the case, treat the LONGER one as the // found operator. diff --git a/src/astyle/ASFormatter.cpp b/src/astyle/ASFormatter.cpp index 4242d4eeb73..e4465519eb1 100644 --- a/src/astyle/ASFormatter.cpp +++ b/src/astyle/ASFormatter.cpp @@ -307,7 +307,7 @@ string ASFormatter::nextLine() } else // stuff to do when reading a new character... { - // make sure that a virgin '{' at the beginning ofthe file will be treated as a block... + // make sure that a virgin '{' at the beginning of the file will be treated as a block... if (isInVirginLine && currentChar == '{' && lineBeginsWith('{')) previousCommandChar = '{'; isPreviousCharPostComment = isCharImmediatelyPostComment; diff --git a/src/astyle/astyle_main.cpp b/src/astyle/astyle_main.cpp index 5c650825958..524d514f3a0 100644 --- a/src/astyle/astyle_main.cpp +++ b/src/astyle/astyle_main.cpp @@ -160,7 +160,7 @@ bool g_isQuiet = false; bool g_optionsFileRequired = false; string g_origSuffix = ".orig"; vector g_excludeVector; // exclude from wildcard hits -vector g_excludeHitsVector; // exclude flags for eror reporting +vector g_excludeHitsVector; // exclude flags for error reporting size_t g_mainDirectoryLength; // main directory name can be excluded for displays // stringstream g_msg; // info messages are not printed until a file is read int _CRT_glob = 0; // turn off MinGW automatic file globbing diff --git a/src/core/auth/qgsauthconfig.h b/src/core/auth/qgsauthconfig.h index 927b4a9ff47..053885e3bda 100644 --- a/src/core/auth/qgsauthconfig.h +++ b/src/core/auth/qgsauthconfig.h @@ -154,7 +154,7 @@ class CORE_EXPORT QgsAuthMethodConfig * against the config's uri() for auto-selecting authentication configs to use * @note Essentially strips the URL query variables, and by default, strips the path as well * @param accessurl A URL to process - * @param resource Ouput variable for result + * @param resource Output variable for result * @param withpath Whether to include the URI's path in output */ static bool uriToResource( const QString &accessurl, QString *resource, bool withpath = false ); diff --git a/src/core/composer/qgsaddremoveitemcommand.cpp b/src/core/composer/qgsaddremoveitemcommand.cpp index 42e1f815943..dfa7745dd3f 100644 --- a/src/core/composer/qgsaddremoveitemcommand.cpp +++ b/src/core/composer/qgsaddremoveitemcommand.cpp @@ -36,7 +36,7 @@ QgsAddRemoveItemCommand::~QgsAddRemoveItemCommand() void QgsAddRemoveItemCommand::redo() { - QUndoCommand::redo(); // call redo() on all childs + QUndoCommand::redo(); // call redo() on all children if ( mFirstRun ) { mFirstRun = false; @@ -47,7 +47,7 @@ void QgsAddRemoveItemCommand::redo() void QgsAddRemoveItemCommand::undo() { - QUndoCommand::undo(); // call undo() on all childs, in reverse order + QUndoCommand::undo(); // call undo() on all children, in reverse order if ( mFirstRun ) { mFirstRun = false; diff --git a/src/core/composer/qgscomposerarrow.cpp b/src/core/composer/qgscomposerarrow.cpp index c5c7a98ef12..47f64d616f1 100644 --- a/src/core/composer/qgscomposerarrow.cpp +++ b/src/core/composer/qgscomposerarrow.cpp @@ -222,7 +222,7 @@ void QgsComposerArrow::drawHardcodedMarker( QPainter *p, MarkerType type ) void QgsComposerArrow::drawSVGMarker( QPainter* p, MarkerType type, const QString &markerPath ) { Q_UNUSED( markerPath ); - double ang = QgsComposerUtils::angle( mStartPoint, mStopPoint ); + double theAngle = QgsComposerUtils::angle( mStartPoint, mStopPoint ); double arrowHeadHeight; if ( type == StartMarker ) @@ -280,7 +280,7 @@ void QgsComposerArrow::drawSVGMarker( QPainter* p, MarkerType type, const QStrin fixPoint.setY( -arrowHeadHeight / 2.0 ); } QPointF rotatedFixPoint; - double angleRad = ang / 180 * M_PI; + double angleRad = theAngle / 180 * M_PI; rotatedFixPoint.setX( fixPoint.x() * cos( angleRad ) + fixPoint.y() * -sin( angleRad ) ); rotatedFixPoint.setY( fixPoint.x() * sin( angleRad ) + fixPoint.y() * cos( angleRad ) ); p->translate( canvasPoint.x() - rotatedFixPoint.x(), canvasPoint.y() - rotatedFixPoint.y() ); @@ -290,7 +290,7 @@ void QgsComposerArrow::drawSVGMarker( QPainter* p, MarkerType type, const QStrin p->translate( canvasPoint.x(), canvasPoint.y() ); } - p->rotate( ang ); + p->rotate( theAngle ); p->translate( -mArrowHeadWidth / 2.0, -arrowHeadHeight / 2.0 ); r.render( p, QRectF( 0, 0, mArrowHeadWidth, arrowHeadHeight ) ); p->restore(); diff --git a/src/core/composer/qgscomposeritem.h b/src/core/composer/qgscomposeritem.h index d96f287623e..021b09eeda1 100644 --- a/src/core/composer/qgscomposeritem.h +++ b/src/core/composer/qgscomposeritem.h @@ -475,7 +475,7 @@ class CORE_EXPORT QgsComposerItem: public QgsComposerObject, public QGraphicsRec virtual void setVisibility( const bool visible ); /** Returns whether the item should be excluded from composer exports and prints - * @param valueType controls whether the returned value is the user specified vaule, + * @param valueType controls whether the returned value is the user specified value, * or the current evaluated value (which may be affected by data driven settings). * @returns true if item should be excluded * @note added in version 2.5 @@ -647,7 +647,7 @@ class CORE_EXPORT QgsComposerItem: public QgsComposerObject, public QGraphicsRec /** Evaluates an item's bounding rect to consider data defined position and size of item * and reference point - * @param newRect target bouding rect for item + * @param newRect target bounding rect for item * @param resizeOnly set to true if the item is only being resized. If true then * the position of the returned rect will be adjusted to account for the item's * position mode diff --git a/src/core/geometry/qgsgeometryutils.h b/src/core/geometry/qgsgeometryutils.h index 3e132830d99..1cb13efaa0c 100644 --- a/src/core/geometry/qgsgeometryutils.h +++ b/src/core/geometry/qgsgeometryutils.h @@ -239,7 +239,7 @@ class CORE_EXPORT QgsGeometryUtils /** Parses a WKT string and returns of list of blocks contained in the WKT. * @param wkt WKT string in the format "TYPE1 (contents1), TYPE2 (TYPE3 (contents3), TYPE4 (contents4))" - * @param defaultType default geometry type for childen + * @param defaultType default geometry type for children * @returns list of WKT child block strings, e.g., List("TYPE1 (contents1)", "TYPE2 (TYPE3 (contents3), TYPE4 (contents4))") */ static QStringList wktGetChildBlocks( const QString& wkt , const QString &defaultType = "" ); diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp index 3fd902dc1d7..7f96c5d2561 100644 --- a/src/core/qgsapplication.cpp +++ b/src/core/qgsapplication.cpp @@ -484,7 +484,7 @@ QIcon QgsApplication::getThemeIcon( const QString &theName ) else if ( QFile::exists( myDefaultPath ) ) { //could still return an empty icon if it - //doesnt exist in the default theme either! + //doesn't exist in the default theme either! icon = QIcon( myDefaultPath ); } else @@ -509,7 +509,7 @@ QPixmap QgsApplication::getThemePixmap( const QString &theName ) else { //could still return an empty icon if it - //doesnt exist in the default theme either! + //doesn't exist in the default theme either! return QPixmap( myDefaultPath ); } } @@ -1417,7 +1417,7 @@ bool QgsApplication::createDB( QString *errorMessage ) // first we look for ~/.qgis/qgis.db if ( !qgisPrivateDbFile.exists() ) { - // if it doesnt exist we copy it in from the global resources dir + // if it doesn't exist we copy it in from the global resources dir QString qgisMasterDbFileName = QgsApplication::qgisMasterDbFilePath(); QFile masterFile( qgisMasterDbFileName ); diff --git a/src/core/qgsclipper.h b/src/core/qgsclipper.h index 6e6b7ec96e5..45e3c8d27c5 100644 --- a/src/core/qgsclipper.h +++ b/src/core/qgsclipper.h @@ -195,7 +195,7 @@ inline void QgsClipper::trimPolygon( QPolygonF& pts, const QgsRectangle& clipRec trimPolygonToBoundary( tmpPts, pts, clipRect, YMin, clipRect.yMinimum() ); } -// An auxilary function that is part of the polygon trimming +// An auxiliary function that is part of the polygon trimming // code. Will trim the given polygon to the given boundary and return // the trimmed polygon in the out pointer. Uses Sutherland and // Hodgman's polygon-clipping algorithm. @@ -299,7 +299,7 @@ inline void QgsClipper::trimPolygonToBoundary( const QPolygonF& inPts, QPolygonF } } -// An auxilary function to trimPolygonToBoundarY() that returns +// An auxiliary function to trimPolygonToBoundarY() that returns // whether a point is inside or outside the given boundary. inline bool QgsClipper::inside( const double x, const double y, Boundary b ) @@ -343,7 +343,7 @@ inline bool QgsClipper::inside( QPointF pt, Boundary b, double val ) } -// An auxilary function to trimPolygonToBoundarY() that calculates and +// An auxiliary function to trimPolygonToBoundarY() that calculates and // returns the intersection of the line defined by the given points // and the given boundary. diff --git a/src/core/qgscoordinatereferencesystem.h b/src/core/qgscoordinatereferencesystem.h index 6259f425a3d..9bf6f45bcfa 100644 --- a/src/core/qgscoordinatereferencesystem.h +++ b/src/core/qgscoordinatereferencesystem.h @@ -580,7 +580,7 @@ class CORE_EXPORT QgsCoordinateReferenceSystem static void invalidateCache(); // Mutators ----------------------------------- - // We don't want to expose these to the public api since they wont create + // We don't want to expose these to the public api since they won't create // a fully valid crs. Programmers should use the createFrom* methods rather private: diff --git a/src/core/qgscoordinatereferencesystem_p.h b/src/core/qgscoordinatereferencesystem_p.h index d3a32ac3637..c7c7040f15e 100644 --- a/src/core/qgscoordinatereferencesystem_p.h +++ b/src/core/qgscoordinatereferencesystem_p.h @@ -116,7 +116,7 @@ class QgsCoordinateReferenceSystemPrivate : public QSharedData mutable QString mWkt; mutable QString mProj4; - //! True if presence of an inverted axis needs to be recaculated + //! True if presence of an inverted axis needs to be recalculated mutable bool mAxisInvertedDirty; //! Whether this is a coordinate system has inverted axis diff --git a/src/core/qgscoordinatetransform_p.h b/src/core/qgscoordinatetransform_p.h index 0f25b70726b..c3b5a26a6a8 100644 --- a/src/core/qgscoordinatetransform_p.h +++ b/src/core/qgscoordinatetransform_p.h @@ -191,7 +191,7 @@ class QgsCoordinateTransformPrivate : public QSharedData #endif //XXX todo overload == operator for QgsCoordinateReferenceSystem - //at the moment srs.parameters contains the whole proj def...soon it wont... + //at the moment srs.parameters contains the whole proj def...soon it won't... //if (mSourceCRS->toProj4() == mDestCRS->toProj4()) if ( mSourceCRS == mDestCRS ) { diff --git a/src/core/qgserror.cpp b/src/core/qgserror.cpp index 2bdae5c4ad3..05bcff5ec56 100644 --- a/src/core/qgserror.cpp +++ b/src/core/qgserror.cpp @@ -57,7 +57,7 @@ QString QgsError::message( QgsErrorMessage::Format theFormat ) const #if defined(QGISDEBUG) && defined(QGS_GIT_REMOTE_URL) // TODO: verify if we are not ahead to origin (remote hash does not exist) - // and there are no local not commited changes + // and there are no local not committed changes QString hash = QString( Qgis::QGIS_DEV_VERSION ); QString remote = QStringLiteral( QGS_GIT_REMOTE_URL ); if ( !hash.isEmpty() && !remote.isEmpty() && remote.contains( QLatin1String( "github.com" ) ) ) diff --git a/src/core/qgsmaptopixelgeometrysimplifier.cpp b/src/core/qgsmaptopixelgeometrysimplifier.cpp index 1ac739b2919..ae90c95ff5c 100644 --- a/src/core/qgsmaptopixelgeometrysimplifier.cpp +++ b/src/core/qgsmaptopixelgeometrysimplifier.cpp @@ -335,7 +335,7 @@ QgsGeometry QgsMapToPixelSimplifier::simplify( const QgsGeometry& geometry ) con const QgsRectangle envelope = geometry.boundingBox(); if ( qMax( envelope.width(), envelope.height() ) / numPoints > mTolerance * 2.0 ) { - //points are in average too far appart to lead to any significant simplification + //points are in average too far apart to lead to any significant simplification return geometry; } diff --git a/src/core/qgspoint.cpp b/src/core/qgspoint.cpp index 01bf797c0bc..75267a1aa21 100644 --- a/src/core/qgspoint.cpp +++ b/src/core/qgspoint.cpp @@ -106,8 +106,8 @@ QgsVector QgsVector::perpVector() const double QgsVector::angle() const { - double ang = atan2( mY, mX ); - return ang < 0.0 ? ang + 2.0 * M_PI : ang; + double theAngle = atan2( mY, mX ); + return theAngle < 0.0 ? theAngle + 2.0 * M_PI : theAngle; } double QgsVector::angle( QgsVector v ) const @@ -117,9 +117,9 @@ double QgsVector::angle( QgsVector v ) const QgsVector QgsVector::rotateBy( double rot ) const { - double ang = atan2( mY, mX ) + rot; + double theAngle = atan2( mY, mX ) + rot; double len = length(); - return QgsVector( len * cos( ang ), len * sin( ang ) ); + return QgsVector( len * cos( theAngle ), len * sin( theAngle ) ); } QgsVector QgsVector::normalized() const diff --git a/src/core/qgspoint.h b/src/core/qgspoint.h index ea65981ba21..ca610466719 100644 --- a/src/core/qgspoint.h +++ b/src/core/qgspoint.h @@ -298,7 +298,7 @@ class CORE_EXPORT QgsPoint //! Calculates azimuth between this point and other one (clockwise in degree, starting from north) double azimuth( const QgsPoint& other ) const; - /** Returns a new point which correponds to this point projected by a specified distance + /** Returns a new point which corresponds to this point projected by a specified distance * in a specified bearing. * @param distance distance to project * @param bearing angle to project in, clockwise in degrees starting from north diff --git a/src/core/qgsprojectfiletransform.cpp b/src/core/qgsprojectfiletransform.cpp index ff9d0117bd9..d850ab1b9eb 100644 --- a/src/core/qgsprojectfiletransform.cpp +++ b/src/core/qgsprojectfiletransform.cpp @@ -42,7 +42,7 @@ QgsProjectFileTransform::TransformItem QgsProjectFileTransform::sTransformers[] {PFV( 0, 9, 0 ), PFV( 0, 9, 1 ), &QgsProjectFileTransform::transformNull}, {PFV( 0, 9, 1 ), PFV( 0, 10, 0 ), &QgsProjectFileTransform::transform091to0100}, // Following line is a hack that takes us straight from 0.9.2 to 0.11.0 - // due to an unknown bug in migrating 0.9.2 files which we didnt pursue (TS & GS) + // due to an unknown bug in migrating 0.9.2 files which we didn't pursue (TS & GS) {PFV( 0, 9, 2 ), PFV( 0, 11, 0 ), &QgsProjectFileTransform::transformNull}, {PFV( 0, 10, 0 ), PFV( 0, 11, 0 ), &QgsProjectFileTransform::transform0100to0110}, {PFV( 0, 11, 0 ), PFV( 1, 0, 0 ), &QgsProjectFileTransform::transform0110to1000}, diff --git a/src/core/qgsrenderchecker.h b/src/core/qgsrenderchecker.h index d724296bd4e..c650a862a38 100644 --- a/src/core/qgsrenderchecker.h +++ b/src/core/qgsrenderchecker.h @@ -112,7 +112,7 @@ class CORE_EXPORT QgsRenderChecker bool runTest( const QString& theTestName, unsigned int theMismatchCount = 0 ); /** - * Test using two arbitary images (map renderer will not be used) + * Test using two arbitrary images (map renderer will not be used) * @param theTestName - to be used as the basis for writing a file to * e.g. /tmp/theTestName.png * @param theMismatchCount - defaults to 0 - the number of pixels that @@ -126,9 +126,9 @@ class CORE_EXPORT QgsRenderChecker /** Get a list of all the anomalies. An anomaly is a rendered difference * file where there is some red pixel content (indicating a render check - * mismatch), but where the output was still acceptible. If the render + * mismatch), but where the output was still acceptable. If the render * diff matches one of these anomalies we will still consider it to be - * acceptible. + * acceptable. * @return a bool indicating if the diff matched one of the anomaly files */ bool isKnownAnomaly( const QString& theDiffImageFile ); diff --git a/src/core/qgssqlstatement.h b/src/core/qgssqlstatement.h index 08c5bf001bc..98e6979c583 100644 --- a/src/core/qgssqlstatement.h +++ b/src/core/qgssqlstatement.h @@ -454,7 +454,7 @@ class CORE_EXPORT QgsSQLStatement class CORE_EXPORT NodeColumnRef : public Node { public: - //! Constructor with colum name only + //! Constructor with column name only NodeColumnRef( const QString& name, bool star ) : mName( name ), mDistinct( false ), mStar( star ) {} //! Constructor with table and column name NodeColumnRef( const QString& tableName, const QString& name, bool star ) : mTableName( tableName ), mName( name ), mDistinct( false ), mStar( star ) {} diff --git a/src/core/qgstextrenderer.cpp b/src/core/qgstextrenderer.cpp index f668d734c57..e71e81ed152 100644 --- a/src/core/qgstextrenderer.cpp +++ b/src/core/qgstextrenderer.cpp @@ -2305,7 +2305,7 @@ void QgsTextRenderer::drawShadow( QgsRenderContext& context, const QgsTextRender componentHeight + ( pictbuffer * 2.0 ) + ( blurbuffer * 2.0 ), QImage::Format_ARGB32_Premultiplied ); - // TODO: add labeling gui option to not show any shadows under/over a certian size + // TODO: add labeling gui option to not show any shadows under/over a certain size // keep very small QImages from causing paint device issues, i.e. must be at least > 1 int minBlurImgSize = 1; // max limitation on QgsSvgCache is 10,000 for screen, which will probably be reasonable for future caching here, too diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h index c11fdee5043..9da9abb20f0 100644 --- a/src/core/qgsvectorlayer.h +++ b/src/core/qgsvectorlayer.h @@ -1740,7 +1740,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte //! Is emitted, when edited changes successfully have been written to the data provider void editingStopped(); - //! Is emitted, before changes are commited to the data provider + //! Is emitted, before changes are committed to the data provider void beforeCommitChanges(); //! Is emitted, before changes are rolled back @@ -1958,7 +1958,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte */ bool setDataProvider( QString const & provider ); - //! Goes through all features and finds a free id (e.g. to give it temporarily to a not-commited feature) + //! Goes through all features and finds a free id (e.g. to give it temporarily to a not-committed feature) QgsFeatureId findFreeId(); /** Snaps to a geometry and adds the result to the multimap if it is within the snapping result diff --git a/src/core/qgsvectorlayerfeatureiterator.h b/src/core/qgsvectorlayerfeatureiterator.h index 405cf6845a6..ecda9c4fd76 100644 --- a/src/core/qgsvectorlayerfeatureiterator.h +++ b/src/core/qgsvectorlayerfeatureiterator.h @@ -153,12 +153,12 @@ class CORE_EXPORT QgsVectorLayerFeatureIterator : public QgsAbstractFeatureItera */ void addExpressionAttribute( QgsFeature& f, int attrIndex ); - /** Update feature with uncommited attribute updates. + /** Update feature with uncommitted attribute updates. * @note not available in Python bindings */ void updateChangedAttributes( QgsFeature& f ); - /** Update feature with uncommited geometry updates. + /** Update feature with uncommitted geometry updates. * @note not available in Python bindings */ void updateFeatureGeometry( QgsFeature& f ); diff --git a/src/core/qgsvectorlayertools.h b/src/core/qgsvectorlayertools.h index e1f397fed79..736a77d39e6 100644 --- a/src/core/qgsvectorlayertools.h +++ b/src/core/qgsvectorlayertools.h @@ -68,7 +68,7 @@ class CORE_EXPORT QgsVectorLayerTools : public QObject virtual bool startEditing( QgsVectorLayer* layer ) const = 0; /** - * Will be called, when an editing session is ended and the features should be commited. + * Will be called, when an editing session is ended and the features should be committed. * Appropriate dialogs should be shown like * * @param layer The layer to commit @@ -80,7 +80,7 @@ class CORE_EXPORT QgsVectorLayerTools : public QObject virtual bool stopEditing( QgsVectorLayer* layer, bool allowCancel = true ) const = 0; /** - * Should be called, when the features should be commited but the editing session is not ended. + * Should be called, when the features should be committed but the editing session is not ended. * * @param layer The layer to commit * @return True if successful diff --git a/src/core/raster/qgscolorrampshader.cpp b/src/core/raster/qgscolorrampshader.cpp index 927d6c004d6..69a644a9abb 100644 --- a/src/core/raster/qgscolorrampshader.cpp +++ b/src/core/raster/qgscolorrampshader.cpp @@ -372,7 +372,7 @@ bool QgsColorRampShader::shade( double theValue, int* theReturnRedValue, int* th // get initial value from LUT idx = mLUT.at( lutIndex ); - // check if it's correct and if not increase untill correct + // check if it's correct and if not increase until correct // the LUT is made in such a way the index is always correct or too low, never too high while ( idx < colorRampItemListCount && mColorRampItemList.at( idx ).value + DOUBLE_DIFF_THRESHOLD < theValue ) { diff --git a/src/core/raster/qgsrasterinterface.cpp b/src/core/raster/qgsrasterinterface.cpp index b73e091b02f..7beb7d2c885 100644 --- a/src/core/raster/qgsrasterinterface.cpp +++ b/src/core/raster/qgsrasterinterface.cpp @@ -268,7 +268,7 @@ void QgsRasterInterface::initHistogram( QgsRasterHistogram &theHistogram, else { // We need statistics -> avoid histogramDefaults in hasHistogram if possible - // TODO: use approximated statistics if aproximated histogram is requested + // TODO: use approximated statistics if approximated histogram is requested // (theSampleSize > 0) QgsRasterBandStats stats = bandStatistics( theBandNo, QgsRasterBandStats::Min, theExtent, theSampleSize ); theHistogram.minimum = stats.minimumValue; diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp index a455b2f846c..4a79f8c3f0c 100644 --- a/src/core/raster/qgsrasterlayer.cpp +++ b/src/core/raster/qgsrasterlayer.cpp @@ -1537,7 +1537,7 @@ bool QgsRasterLayer::readXml( const QDomNode& layer_node ) // Check timestamp // This was probably introduced to reload completely raster if data changed and - // reset completly symbology to reflect new data type etc. It creates however + // reset completely symbology to reflect new data type etc. It creates however // problems, because user defined symbology is complete lost if data file time // changed (the content may be the same). See also 6900. #if 0 diff --git a/src/core/raster/qgsrasterlayerrenderer.cpp b/src/core/raster/qgsrasterlayerrenderer.cpp index f2df19feab5..6f698e5b8d7 100644 --- a/src/core/raster/qgsrasterlayerrenderer.cpp +++ b/src/core/raster/qgsrasterlayerrenderer.cpp @@ -147,7 +147,7 @@ QgsRasterLayerRenderer::QgsRasterLayerRenderer( QgsRasterLayer* layer, QgsRender mRasterViewPort->mWidth = static_cast( mRasterViewPort->mBottomRightPoint.x() - mRasterViewPort->mTopLeftPoint.x() ); mRasterViewPort->mHeight = static_cast( mRasterViewPort->mBottomRightPoint.y() - mRasterViewPort->mTopLeftPoint.y() ); - //the drawable area can start to get very very large when you get down displaying 2x2 or smaller, this is becasue + //the drawable area can start to get very very large when you get down displaying 2x2 or smaller, this is because //mapToPixel.mapUnitsPerPixel() is less then 1, //so we will just get the pixel data and then render these special cases differently in paintImageToCanvas() diff --git a/src/core/symbology-ng/qgscptcityarchive.cpp b/src/core/symbology-ng/qgscptcityarchive.cpp index f97119a5c47..6be7ca64a6c 100644 --- a/src/core/symbology-ng/qgscptcityarchive.cpp +++ b/src/core/symbology-ng/qgscptcityarchive.cpp @@ -655,7 +655,7 @@ void QgsCptCityDataItem::refresh() // Add new items Q_FOREACH ( QgsCptCityDataItem *item, items ) { - // Is it present in childs? + // Is it present in children? if ( findItem( mChildren, item ) >= 0 ) { delete item; diff --git a/src/core/symbology-ng/qgscptcityarchive.h b/src/core/symbology-ng/qgscptcityarchive.h index 9a916fa6366..e5d58d0c61e 100644 --- a/src/core/symbology-ng/qgscptcityarchive.h +++ b/src/core/symbology-ng/qgscptcityarchive.h @@ -361,7 +361,7 @@ class CORE_EXPORT QgsCptCityBrowserModel : public QAbstractItemModel // Refresh item specified by path void refresh( const QString& path ); - // Refresh item childs + // Refresh item children void refresh( const QModelIndex &index = QModelIndex() ); //! return index of a path diff --git a/src/core/symbology-ng/qgsrulebasedrenderer.cpp b/src/core/symbology-ng/qgsrulebasedrenderer.cpp index b2f2ac319a4..6395d1b2a5e 100644 --- a/src/core/symbology-ng/qgsrulebasedrenderer.cpp +++ b/src/core/symbology-ng/qgsrulebasedrenderer.cpp @@ -389,7 +389,7 @@ void QgsRuleBasedRenderer::Rule::toSld( QDomDocument& doc, QDomElement &element, mSymbol->toSld( doc, ruleElem, props ); } - // loop into childern rule list + // loop into children rule list Q_FOREACH ( Rule* rule, mChildren ) { rule->toSld( doc, element, props ); diff --git a/src/core/symbology-ng/qgsstyle.cpp b/src/core/symbology-ng/qgsstyle.cpp index a361fabdd9d..627fcfe8e2b 100644 --- a/src/core/symbology-ng/qgsstyle.cpp +++ b/src/core/symbology-ng/qgsstyle.cpp @@ -366,7 +366,7 @@ bool QgsStyle::load( const QString& filename ) return false; } - // Make sure there are no Null fields in parenting symbols ang groups + // Make sure there are no Null fields in parenting symbols and groups char *query = sqlite3_mprintf( "UPDATE symbol SET favorite=0 WHERE favorite IS NULL;" "UPDATE colorramp SET favorite=0 WHERE favorite IS NULL;" "UPDATE symgroup SET parent=0 WHERE parent IS NULL;" ); diff --git a/src/core/symbology-ng/qgssymbol.cpp b/src/core/symbology-ng/qgssymbol.cpp index 63db78bf928..f30ec1d12cd 100644 --- a/src/core/symbology-ng/qgssymbol.cpp +++ b/src/core/symbology-ng/qgssymbol.cpp @@ -1083,10 +1083,10 @@ QgsMarkerSymbol::QgsMarkerSymbol( const QgsSymbolLayerList& layers ) mLayers.append( new QgsSimpleMarkerSymbolLayer() ); } -void QgsMarkerSymbol::setAngle( double ang ) +void QgsMarkerSymbol::setAngle( double theAngle ) { double origAngle = angle(); - double angleDiff = ang - origAngle; + double angleDiff = theAngle - origAngle; Q_FOREACH ( QgsSymbolLayer* layer, mLayers ) { QgsMarkerSymbolLayer* markerLayer = dynamic_cast( layer ); diff --git a/src/core/symbology-ng/qgssymbollayer.h b/src/core/symbology-ng/qgssymbollayer.h index a7ab2977210..d538f8bd5aa 100644 --- a/src/core/symbology-ng/qgssymbollayer.h +++ b/src/core/symbology-ng/qgssymbollayer.h @@ -214,7 +214,7 @@ class CORE_EXPORT QgsSymbolLayer virtual bool hasDataDefinedProperties() const; /** Checks whether the layer has a matching data defined property and if - * that property is currently actived. + * that property is currently activated. * @param property property key * @returns true if data defined property exists and is active * @see hasDataDefinedProperties @@ -232,7 +232,7 @@ class CORE_EXPORT QgsSymbolLayer * @param defaultVal default value to return if evaluation was not successful * @param ok if specified, will be set to true if evaluation was successful * @returns calculated value for data defined property, or default value - * if property does not exist or is deactived. + * if property does not exist or is deactivated. * @see hasDataDefinedProperty * @see getDataDefinedProperty * @note added in QGIS 2.12 diff --git a/src/gui/attributetable/qgsattributetableview.h b/src/gui/attributetable/qgsattributetableview.h index 2472304209b..982e9392f33 100644 --- a/src/gui/attributetable/qgsattributetableview.h +++ b/src/gui/attributetable/qgsattributetableview.h @@ -129,7 +129,7 @@ class GUI_EXPORT QgsAttributeTableView : public QTableView /** * @brief - * Is emitted, in order to provide a hook to add aditional menu entries to the context menu. + * Is emitted, in order to provide a hook to add additional* menu entries to the context menu. * * @param menu If additional QMenuItems are added, they will show up in the context menu. * @param atIndex The QModelIndex, to which the context menu belongs. Relative to the source model. diff --git a/src/gui/attributetable/qgsfeaturelistmodel.h b/src/gui/attributetable/qgsfeaturelistmodel.h index b804de2b6c6..ff668a71408 100644 --- a/src/gui/attributetable/qgsfeaturelistmodel.h +++ b/src/gui/attributetable/qgsfeaturelistmodel.h @@ -90,7 +90,7 @@ class GUI_EXPORT QgsFeatureListModel : public QAbstractProxyModel, public QgsFea /** * @brief Returns a detailed message about errors while parsing a QgsExpression. - * @return A message containg information about the parser error. + * @return A message containing information about the parser error. */ QString parserErrorString(); diff --git a/src/gui/attributetable/qgsfeaturelistview.h b/src/gui/attributetable/qgsfeaturelistview.h index b93109377d2..bb4a446aa5e 100644 --- a/src/gui/attributetable/qgsfeaturelistview.h +++ b/src/gui/attributetable/qgsfeaturelistview.h @@ -95,7 +95,7 @@ class GUI_EXPORT QgsFeatureListView : public QListView /** * Returns a detailed message about errors while parsing a QgsExpression. * - * @return A message containg information about the parser error. + * @return A message containing information about the parser error. */ QString parserErrorString(); diff --git a/src/gui/qgisgui.cpp b/src/gui/qgisgui.cpp index eecef73c95a..b63c14adcdf 100644 --- a/src/gui/qgisgui.cpp +++ b/src/gui/qgisgui.cpp @@ -90,7 +90,7 @@ namespace QgisGui QMap filterMap; Q_FOREACH ( const QByteArray& format, QImageWriter::supportedImageFormats() ) { - //svg doesnt work so skip it + //svg doesn't work so skip it if ( format == "svg" ) continue; diff --git a/src/gui/qgisinterface.h b/src/gui/qgisinterface.h index b2c507242f0..1b588d33730 100644 --- a/src/gui/qgisinterface.h +++ b/src/gui/qgisinterface.h @@ -590,7 +590,7 @@ class GUI_EXPORT QgisInterface : public QObject virtual QgsVectorLayerTools* vectorLayerTools() = 0; /** This method is only needed when using a UI form with a custom widget plugin and calling - * openFeatureForm or getFeatureForm from Python (PyQt4) and you havn't used the info tool first. + * openFeatureForm or getFeatureForm from Python (PyQt4) and you haven't used the info tool first. * Python will crash bringing QGIS wtih it * if the custom form is not loaded from a C++ method call. * diff --git a/src/gui/qgsadvanceddigitizingdockwidget.cpp b/src/gui/qgsadvanceddigitizingdockwidget.cpp index 218b7fc4c66..60f4e3f6a85 100644 --- a/src/gui/qgsadvanceddigitizingdockwidget.cpp +++ b/src/gui/qgsadvanceddigitizingdockwidget.cpp @@ -126,8 +126,8 @@ QgsAdvancedDigitizingDockWidget::QgsAdvancedDigitizingDockWidget( QgsMapCanvas* // Connect the UI to the event filter to update constraints connect( mEnableAction, SIGNAL( triggered( bool ) ), this, SLOT( activateCad( bool ) ) ); connect( mConstructionModeButton, SIGNAL( clicked( bool ) ), this, SLOT( setConstructionMode( bool ) ) ); - connect( mParallelButton, SIGNAL( clicked( bool ) ), this, SLOT( addtionalConstraintClicked( bool ) ) ); - connect( mPerpendicularButton, SIGNAL( clicked( bool ) ), this, SLOT( addtionalConstraintClicked( bool ) ) ); + connect( mParallelButton, SIGNAL( clicked( bool ) ), this, SLOT( additionalConstraintClicked( bool ) ) ); + connect( mPerpendicularButton, SIGNAL( clicked( bool ) ), this, SLOT( additionalConstraintClicked( bool ) ) ); connect( mLockAngleButton, SIGNAL( clicked( bool ) ), this, SLOT( lockConstraint( bool ) ) ); connect( mLockDistanceButton, SIGNAL( clicked( bool ) ), this, SLOT( lockConstraint( bool ) ) ); connect( mLockXButton, SIGNAL( clicked( bool ) ), this, SLOT( lockConstraint( bool ) ) ); @@ -234,7 +234,7 @@ void QgsAdvancedDigitizingDockWidget::activateCad( bool enabled ) setCadEnabled( enabled ); } -void QgsAdvancedDigitizingDockWidget::addtionalConstraintClicked( bool activated ) +void QgsAdvancedDigitizingDockWidget::additionalConstraintClicked( bool activated ) { if ( !activated ) { @@ -787,7 +787,7 @@ bool QgsAdvancedDigitizingDockWidget::applyConstraints( QgsMapMouseEvent* e ) } // ***************************** - // ---- caluclate CAD values + // ---- calculate CAD values QgsDebugMsg( QString( "point: %1 %2" ).arg( point.x() ).arg( point.y() ) ); QgsDebugMsg( QString( "previous point: %1 %2" ).arg( previousPt.x() ).arg( previousPt.y() ) ); QgsDebugMsg( QString( "penultimate point: %1 %2" ).arg( penultimatePt.x() ).arg( penultimatePt.y() ) ); diff --git a/src/gui/qgsadvanceddigitizingdockwidget.h b/src/gui/qgsadvanceddigitizingdockwidget.h index 4a409cbdcf8..63af6ffee66 100644 --- a/src/gui/qgsadvanceddigitizingdockwidget.h +++ b/src/gui/qgsadvanceddigitizingdockwidget.h @@ -357,7 +357,7 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private private slots: //! set the additional constraint by clicking on the perpendicular/parallel buttons - void addtionalConstraintClicked( bool activated ); + void additionalConstraintClicked( bool activated ); //! lock/unlock a constraint and set its value void lockConstraint( bool activate = true ); diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp index 5303b3f01f0..4d2ecd33834 100644 --- a/src/gui/qgscomposerview.cpp +++ b/src/gui/qgscomposerview.cpp @@ -2015,7 +2015,7 @@ void QgsComposerView::wheelZoom( QWheelEvent * event ) zoomFactor = 1.0 + ( zoomFactor - 1.0 ) / 10.0; } - //caculate zoom scale factor + //calculate zoom scale factor bool zoomIn = event->delta() > 0; double scaleFactor = ( zoomIn ? 1 / zoomFactor : zoomFactor ); diff --git a/src/gui/qgsdetaileditemdelegate.cpp b/src/gui/qgsdetaileditemdelegate.cpp index 456763a5f05..fb577069e69 100644 --- a/src/gui/qgsdetaileditemdelegate.cpp +++ b/src/gui/qgsdetaileditemdelegate.cpp @@ -86,7 +86,7 @@ QSize QgsDetailedItemDelegate::sizeHint( //return QSize(theOption.rect.width(), myHeight + myVerticalSpacer); } } - else //cant convert to qgsdetaileditemdata + else //can't convert to qgsdetaileditemdata { return QSize( 50, 50 ); //fallback } diff --git a/src/gui/qgsexternalresourcewidget.h b/src/gui/qgsexternalresourcewidget.h index 9e1a41774a9..85119f8efe6 100644 --- a/src/gui/qgsexternalresourcewidget.h +++ b/src/gui/qgsexternalresourcewidget.h @@ -76,7 +76,7 @@ class GUI_EXPORT QgsExternalResourceWidget : public QWidget //! returns the type of content used in the document viewer QgsExternalResourceWidget::DocumentViewerContent documentViewerContent() const; - //! setDocumentViewerContent defines the type of content to be shown. Widget will be adapated accordingly + //! setDocumentViewerContent defines the type of content to be shown. Widget will be adapted accordingly void setDocumentViewerContent( QgsExternalResourceWidget::DocumentViewerContent content ); //! returns the height of the document viewer diff --git a/src/gui/qgsfiledropedit.cpp b/src/gui/qgsfiledropedit.cpp index 74b49507b67..b75b6d7be0a 100644 --- a/src/gui/qgsfiledropedit.cpp +++ b/src/gui/qgsfiledropedit.cpp @@ -89,7 +89,7 @@ QString QgsFileDropEdit::acceptableFilePath( QDropEvent *event ) const } /*! - Check if dragged object is acceptible. Called when a drag is in progress + Check if dragged object is acceptable. Called when a drag is in progress and the mouse enters this widget. */ void QgsFileDropEdit::dragEnterEvent( QDragEnterEvent *event ) diff --git a/src/gui/qgshighlight.cpp b/src/gui/qgshighlight.cpp index 4be8d80ac68..df6bb4d7e89 100644 --- a/src/gui/qgshighlight.cpp +++ b/src/gui/qgshighlight.cpp @@ -251,7 +251,7 @@ void QgsHighlight::paintPolygon( QPainter *p, QgsPolygon polygon ) for ( int j = 0; j < polygon[i].size(); j++ ) { - //adding point only if it is more than a pixel appart from the previous one + //adding point only if it is more than a pixel apart from the previous one const QPointF cur = toCanvasCoordinates( polygon[i][j] ) - pos(); if ( 0 == j || std::abs( ring.back().x() - cur.x() ) > 1 || std::abs( ring.back().y() - cur.y() ) > 1 ) { diff --git a/src/gui/qgsmaplayeractionregistry.h b/src/gui/qgsmaplayeractionregistry.h index c06ab2eb8cf..5d87f5514fe 100644 --- a/src/gui/qgsmaplayeractionregistry.h +++ b/src/gui/qgsmaplayeractionregistry.h @@ -45,7 +45,7 @@ class GUI_EXPORT QgsMapLayerAction : public QAction Q_DECLARE_FLAGS( Targets, Target ) //! Creates a map layer action which can run on any layer - //! @note using AllActions as a target probably does not make a lot of sense. This default action was settled for API compatiblity reasons. + //! @note using AllActions as a target probably does not make a lot of sense. This default action was settled for API compatibility reasons. QgsMapLayerAction( const QString& name, QObject *parent, Targets targets = AllActions, const QIcon& icon = QIcon() ); //! Creates a map layer action which can run only on a specific layer diff --git a/src/gui/qgsmaptooladvanceddigitizing.h b/src/gui/qgsmaptooladvanceddigitizing.h index 7ab938479b1..4842fbb6c40 100644 --- a/src/gui/qgsmaptooladvanceddigitizing.h +++ b/src/gui/qgsmaptooladvanceddigitizing.h @@ -24,7 +24,7 @@ class QgsMapMouseEvent; class QgsAdvancedDigitizingDockWidget; /** \ingroup gui - * @brief The QgsMapToolAdvancedDigitizing class is a QgsMapTool whcih gives event directly in map coordinates and allows filtering its events. + * @brief The QgsMapToolAdvancedDigitizing class is a QgsMapTool which gives event directly in map coordinates and allows filtering its events. * Events from QgsMapTool are caught and their QMouseEvent are transformed into QgsMapMouseEvent (with map coordinates). * Events are then forwarded to corresponding virtual methods which can be reimplemented in subclasses. * An event filter can be set on the map tool to filter and modify the events in map coordinates (@see QgsMapToolMapEventFilter). diff --git a/src/gui/qgsmaptoolidentify.cpp b/src/gui/qgsmaptoolidentify.cpp index 02a1e02702b..e4a2a249e15 100644 --- a/src/gui/qgsmaptoolidentify.cpp +++ b/src/gui/qgsmaptoolidentify.cpp @@ -518,7 +518,7 @@ bool QgsMapToolIdentify::identifyRasterLayer( QList *results, Qg { // It would be nice to use the same extent and size which was used for drawing, // so that WCS can use cache from last draw, unfortunately QgsRasterLayer::draw() - // is doing some tricks with extent and size to allign raster to output which + // is doing some tricks with extent and size to align raster to output which // would be difficult to replicate here. // Note: cutting the extent may result in slightly different x and y resolutions // and thus shifted point calculated back in QGIS WMS (using average resolution) diff --git a/src/gui/qgsmaptoolidentify.h b/src/gui/qgsmaptoolidentify.h index e0834b639ef..8a4f99ad308 100644 --- a/src/gui/qgsmaptoolidentify.h +++ b/src/gui/qgsmaptoolidentify.h @@ -109,7 +109,7 @@ class GUI_EXPORT QgsMapToolIdentify : public QgsMapTool QList identify( int x, int y, const QList& layerList = QList(), IdentifyMode mode = DefaultQgsSetting ); /** Performs the identification. - To avoid beeing forced to specify IdentifyMode with a list of layers + To avoid being forced to specify IdentifyMode with a list of layers this has been made private and two publics methods are offered @param x x coordinates of mouseEvent @param y y coordinates of mouseEvent @@ -133,7 +133,7 @@ class GUI_EXPORT QgsMapToolIdentify : public QgsMapTool protected: /** Performs the identification. - To avoid beeing forced to specify IdentifyMode with a list of layers + To avoid being forced to specify IdentifyMode with a list of layers this has been made private and two publics methods are offered @param x x coordinates of mouseEvent @param y y coordinates of mouseEvent diff --git a/src/gui/qgsowssourceselect.cpp b/src/gui/qgsowssourceselect.cpp index f0a27adade2..e6b9f2f9721 100644 --- a/src/gui/qgsowssourceselect.cpp +++ b/src/gui/qgsowssourceselect.cpp @@ -159,7 +159,7 @@ void QgsOWSSourceSelect::populateFormats() // value used in UMN Mapserver for OUTPUTFORMAT->NAME is used in // WCS 1.0.0 SupportedFormats/Format - // TODO: It is impossible to cover all possible formats comming from server + // TODO: It is impossible to cover all possible formats coming from server // -> enabled all formats, GDAL may be able to open them QMap formatsMap; diff --git a/src/gui/qgsprojectionselector.cpp b/src/gui/qgsprojectionselector.cpp index 33cbf9ef3f3..01e841a0cf1 100644 --- a/src/gui/qgsprojectionselector.cpp +++ b/src/gui/qgsprojectionselector.cpp @@ -480,7 +480,7 @@ void QgsProjectionSelector::loadUserCrsList( QSet *crsFilter ) //now only will be shown QString databaseFileName = QgsApplication::qgisUserDbFilePath(); // first we look for ~/.qgis/qgis.db - // if it doesnt exist we copy it in from the global resources dir + // if it doesn't exist we copy it in from the global resources dir //return straight away if the user has not created any custom projections if ( !QFileInfo::exists( databaseFileName ) ) @@ -915,7 +915,7 @@ long QgsProjectionSelector::getLargestCrsIdMatch( const QString& theSql ) } else { - //only bother looking in srs.db if it wasnt found above + //only bother looking in srs.db if it wasn't found above result = sqlite3_open_v2( mSrsDatabaseFileName.toUtf8().data(), &database, SQLITE_OPEN_READONLY, nullptr ); if ( result ) { diff --git a/src/gui/symbology-ng/qgssizescalewidget.cpp b/src/gui/symbology-ng/qgssizescalewidget.cpp index d26128468dc..d94068e2758 100644 --- a/src/gui/symbology-ng/qgssizescalewidget.cpp +++ b/src/gui/symbology-ng/qgssizescalewidget.cpp @@ -226,7 +226,7 @@ void QgsSizeScaleWidget::updatePreview() { QScopedPointer< QgsMarkerSymbol > symbol( static_cast( mSymbol->clone() ) ); symbol->setDataDefinedSize( QgsDataDefined() ); - symbol->setDataDefinedAngle( QgsDataDefined() ); // to avoid symbol not beeing drawn + symbol->setDataDefinedAngle( QgsDataDefined() ); // to avoid symbol not being drawn symbol->setSize( expr->size( breaks[i] ) ); node.reset( new QgsSymbolLegendNode( mLayerTreeLayer, QgsLegendSymbolItem( symbol.data(), QString::number( i ), QString() ) ) ); } diff --git a/src/plugins/evis/databaseconnection/evisdatabaseconnection.h b/src/plugins/evis/databaseconnection/evisdatabaseconnection.h index 1d930401551..a6c08346a1f 100644 --- a/src/plugins/evis/databaseconnection/evisdatabaseconnection.h +++ b/src/plugins/evis/databaseconnection/evisdatabaseconnection.h @@ -42,7 +42,7 @@ class eVisDatabaseConnection public: - //! \brief Enum containting the type of database supported by this class + //! \brief Enum containing the type of database supported by this class enum DatabaseType { Undefined, diff --git a/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp b/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp index ccb183434ab..db39930e808 100644 --- a/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp +++ b/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp @@ -269,7 +269,7 @@ void eVisDatabaseConnectionGui::on_pbtnConnect_clicked() myDatabaseType = eVisDatabaseConnection::QSqlite; } - //If there is aready a database connection object, reset with the current parameters + //If there is already a database connection object, reset with the current parameters if ( mDatabaseConnection ) { mDatabaseConnection->resetConnectionParameters( leDatabaseHost->text(), leDatabasePort->text().toInt(), leDatabaseName->text(), leDatabaseUsername->text(), leDatabasePassword->text(), myDatabaseType ); diff --git a/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp b/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp index 5dd15a580f4..b7cc8b3cd15 100644 --- a/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp +++ b/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp @@ -131,7 +131,7 @@ eVisGenericEventBrowserGui::~eVisGenericEventBrowserGui() } /** - * This method is an extension of the constructor. It was implemented to reduce the amount of code duplicated between the constuctors. + * This method is an extension of the constructor. It was implemented to reduce the amount of code duplicated between the constructors. */ bool eVisGenericEventBrowserGui::initBrowser() { @@ -484,7 +484,7 @@ void eVisGenericEventBrowserGui::accept() */ void eVisGenericEventBrowserGui::buildEventImagePath() { - //This if statement is a bit of a hack, have to track down where the 0 is comming from on initalization + //This if statement is a bit of a hack, have to track down where the 0 is coming from on initalization if ( "0" != mEventImagePath ) { int myImageNameMarker = 0; @@ -519,7 +519,7 @@ void eVisGenericEventBrowserGui::buildEventImagePath() */ void eVisGenericEventBrowserGui::displayImage() { - //This if statement is a bit of a hack, have to track down where the 0 is comming from on initalization + //This if statement is a bit of a hack, have to track down where the 0 is coming from on initalization if ( "0" != mEventImagePath && 0 == displayArea->currentIndex() ) { if ( mEventImagePath.startsWith( QLatin1String( "http://" ), Qt::CaseInsensitive ) ) diff --git a/src/plugins/evis/eventbrowser/evisimagedisplaywidget.h b/src/plugins/evis/eventbrowser/evisimagedisplaywidget.h index a6b2159fb95..da3382c26fa 100644 --- a/src/plugins/evis/eventbrowser/evisimagedisplaywidget.h +++ b/src/plugins/evis/eventbrowser/evisimagedisplaywidget.h @@ -83,7 +83,7 @@ class eVisImageDisplayWidget : public QWidget //! \brief widget to display the image in QScrollArea* mDisplayArea; - //! \brief Method that acually display the image in the widget + //! \brief Method that actually display the image in the widget void displayImage(); //! \brief Pointer to the http buffer diff --git a/src/plugins/geometry_checker/checks/qgsgeometryselfintersectioncheck.cpp b/src/plugins/geometry_checker/checks/qgsgeometryselfintersectioncheck.cpp index b7f4a0dbc75..364b458b7aa 100644 --- a/src/plugins/geometry_checker/checks/qgsgeometryselfintersectioncheck.cpp +++ b/src/plugins/geometry_checker/checks/qgsgeometryselfintersectioncheck.cpp @@ -229,7 +229,7 @@ void QgsGeometrySelfIntersectionCheck::fixError( QgsGeometryCheckError* error, i if ( method == ToMultiObject ) { - // If is alreay a geometry collection, just add the new polygon. + // If is already a geometry collection, just add the new polygon. if ( dynamic_cast( geom ) ) { static_cast( geom )->addGeometry( poly2 ); diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp index 51b252252ce..ba2e924db51 100644 --- a/src/plugins/georeferencer/qgsgeorefplugingui.cpp +++ b/src/plugins/georeferencer/qgsgeorefplugingui.cpp @@ -2097,7 +2097,7 @@ QString QgsGeorefPluginGui::guessWorldFileName( const QString &rasterFileName ) } // Note this code is duplicated from qgisapp.cpp because -// I didnt want to make plugins on qgsapplication [TS] +// I didn't want to make plugins on qgsapplication [TS] QIcon QgsGeorefPluginGui::getThemeIcon( const QString &theName ) { if ( QFile::exists( QgsApplication::activeThemePath() + theName ) ) diff --git a/src/plugins/georeferencer/qgstransformsettingsdialog.cpp b/src/plugins/georeferencer/qgstransformsettingsdialog.cpp index a9b53a5c139..40cd82e3ce3 100644 --- a/src/plugins/georeferencer/qgstransformsettingsdialog.cpp +++ b/src/plugins/georeferencer/qgstransformsettingsdialog.cpp @@ -297,7 +297,7 @@ QString QgsTransformSettingsDialog::generateModifiedRasterFileName( const QStrin } // Note this code is duplicated from qgisapp.cpp because -// I didnt want to make plugins on qgsapplication [TS] +// I didn't want to make plugins on qgsapplication [TS] QIcon QgsTransformSettingsDialog::getThemeIcon( const QString &theName ) { if ( QFile::exists( QgsApplication::activeThemePath() + theName ) ) diff --git a/src/plugins/grass/modules/r.colors.table.qgm b/src/plugins/grass/modules/r.colors.table.qgm index 96c78904a94..b80dee5306a 100644 --- a/src/plugins/grass/modules/r.colors.table.qgm +++ b/src/plugins/grass/modules/r.colors.table.qgm @@ -1,7 +1,7 @@ - + diff --git a/src/plugins/grass/modules/r.texture.bis.qgm b/src/plugins/grass/modules/r.texture.bis.qgm index c7de154ff74..58767b9f460 100644 --- a/src/plugins/grass/modules/r.texture.bis.qgm +++ b/src/plugins/grass/modules/r.texture.bis.qgm @@ -1,7 +1,7 @@ - +