Skip to content
Permalink
Browse files

Merge pull request #3980 from 3nids/morespell

Interactive spelling corrections and add more words to spell check
  • Loading branch information
3nids committed Jan 12, 2017
2 parents c484742 + 6c74e4e commit 62c5069e870989334d42fbb0f61d14796e30bfff
Showing with 7,897 additions and 822 deletions.
  1. +1 −1 CMakeLists.txt
  2. +1 −1 INSTALL
  3. +7 −7 NEWS
  4. +1 −2 ci/travis/check_spelling.sh
  5. +1 −1 cmake/FindPyQt4.cmake
  6. +1 −1 cmake/FindPyQt5.cmake
  7. +1 −1 cmake/FindSIP.cmake
  8. +1 −1 debian/changelog
  9. +1 −1 doc/INSTALL.html
  10. +1 −1 doc/msys.t2t
  11. +7 −7 doc/news.html
  12. +7 −7 doc/news.t2t
  13. +1 −1 python/analysis/interpolation/NormVecDecorator.sip
  14. +1 −1 python/analysis/openstreetmap/qgsosmimport.sip
  15. +1 −1 python/core/auth/qgsauthconfig.sip
  16. +2 −2 python/core/composer/qgscomposeritem.sip
  17. +1 −1 python/core/qgsnetworkaccessmanager.sip
  18. +1 −1 python/core/qgspoint.sip
  19. +3 −3 python/core/qgsrenderchecker.sip
  20. +1 −1 python/core/qgsvectordataprovider.sip
  21. +1 −1 python/core/qgsvectorlayer.sip
  22. +2 −2 python/core/qgsvectorlayerfeatureiterator.sip
  23. +2 −2 python/core/qgsvectorlayertools.sip
  24. +1 −1 python/core/symbology-ng/qgscptcityarchive.sip
  25. +2 −2 python/core/symbology-ng/qgssymbollayer.sip
  26. +1 −1 python/gui/attributetable/qgsattributetableview.sip
  27. +1 −1 python/gui/attributetable/qgsfeaturelistmodel.sip
  28. +1 −1 python/gui/attributetable/qgsfeaturelistview.sip
  29. +1 −1 python/gui/qgisinterface.sip
  30. +1 −1 python/gui/qgsadvanceddigitizingdockwidget.sip
  31. +1 −1 python/gui/qgsexternalresourcewidget.sip
  32. +1 −1 python/gui/qgsmaplayeractionregistry.sip
  33. +1 −1 python/gui/qgsmaptooladvanceddigitizing.sip
  34. +2 −2 python/gui/qgsmaptoolidentify.sip
  35. +1 −1 python/plugins/db_manager/db_plugins/oracle/TODO.md
  36. +1 −1 python/plugins/db_manager/db_plugins/postgis/connector.py
  37. +1 −1 python/plugins/db_manager/db_plugins/spatialite/sql_dictionary.py
  38. +1 −1 python/plugins/db_manager/db_plugins/vlayers/sql_dictionary.py
  39. +2 −2 python/plugins/processing/algs/help/qgis.yaml
  40. +1 −1 python/plugins/processing/algs/lidar/lastools/lascontrol.py
  41. +1 −1 python/plugins/processing/algs/qgis/Eliminate.py
  42. +1 −1 python/plugins/processing/tools/postgis.py
  43. +2 −2 python/pyplugin_installer/version_compare.py
  44. +1 −1 python/server/qgsserverinterface.sip
  45. +1 −1 python/server/qgsservicemodule.sip
  46. +1 −1 qgis.dtd
  47. +2 −2 resources/cpt-city-qgis-min/selections/div.xml
  48. +1 −1 rpm/default.cfg
  49. +0 −59 scripts/chkspelling_ag.sh
  50. +1 −1 scripts/prepare-commit.sh
  51. +4 −3 scripts/{ → spell_check}/.agignore
  52. +162 −0 scripts/spell_check/check_spelling.sh
  53. +7,501 −0 scripts/spell_check/spelling.dat
  54. +0 −529 scripts/spelling.dat
  55. +1 −1 src/analysis/interpolation/CloughTocherInterpolator.cc
  56. +1 −1 src/analysis/interpolation/DualEdgeTriangulation.cc
  57. +1 −1 src/analysis/interpolation/NormVecDecorator.h
  58. +1 −1 src/analysis/openstreetmap/qgsosmimport.h
  59. +1 −1 src/analysis/vector/qgspointsample.cpp
  60. +2 −2 src/app/composer/qgscomposeritemwidget.h
  61. +1 −1 src/app/gps/qgsgpsinformationwidget.cpp
  62. +1 −1 src/app/qgisappinterface.h
  63. +1 −1 src/app/qgsdecorationnortharrow.h
  64. +2 −2 src/app/qgsguivectorlayertools.h
  65. +1 −1 src/app/qgsidentifyresultsdialog.cpp
  66. +1 −1 src/app/qgsprojectproperties.h
  67. +1 −1 src/astyle/ASBeautifier.cpp
  68. +1 −1 src/astyle/ASFormatter.cpp
  69. +1 −1 src/astyle/astyle_main.cpp
  70. +1 −1 src/core/auth/qgsauthconfig.h
  71. +2 −2 src/core/composer/qgsaddremoveitemcommand.cpp
  72. +3 −3 src/core/composer/qgscomposerarrow.cpp
  73. +2 −2 src/core/composer/qgscomposeritem.h
  74. +1 −1 src/core/geometry/qgsgeometryutils.h
  75. +3 −3 src/core/qgsapplication.cpp
  76. +3 −3 src/core/qgsclipper.h
  77. +1 −1 src/core/qgscoordinatereferencesystem.h
  78. +1 −1 src/core/qgscoordinatereferencesystem_p.h
  79. +1 −1 src/core/qgscoordinatetransform_p.h
  80. +1 −1 src/core/qgserror.cpp
  81. +1 −1 src/core/qgsmaptopixelgeometrysimplifier.cpp
  82. +4 −4 src/core/qgspoint.cpp
  83. +1 −1 src/core/qgspoint.h
  84. +1 −1 src/core/qgsprojectfiletransform.cpp
  85. +3 −3 src/core/qgsrenderchecker.h
  86. +1 −1 src/core/qgssqlstatement.h
  87. +1 −1 src/core/qgstextrenderer.cpp
  88. +2 −2 src/core/qgsvectorlayer.h
  89. +2 −2 src/core/qgsvectorlayerfeatureiterator.h
  90. +2 −2 src/core/qgsvectorlayertools.h
  91. +1 −1 src/core/raster/qgscolorrampshader.cpp
  92. +1 −1 src/core/raster/qgsrasterinterface.cpp
  93. +1 −1 src/core/raster/qgsrasterlayer.cpp
  94. +1 −1 src/core/raster/qgsrasterlayerrenderer.cpp
  95. +1 −1 src/core/symbology-ng/qgscptcityarchive.cpp
  96. +1 −1 src/core/symbology-ng/qgscptcityarchive.h
  97. +1 −1 src/core/symbology-ng/qgsrulebasedrenderer.cpp
  98. +1 −1 src/core/symbology-ng/qgsstyle.cpp
  99. +2 −2 src/core/symbology-ng/qgssymbol.cpp
  100. +2 −2 src/core/symbology-ng/qgssymbollayer.h
  101. +1 −1 src/gui/attributetable/qgsattributetableview.h
  102. +1 −1 src/gui/attributetable/qgsfeaturelistmodel.h
  103. +1 −1 src/gui/attributetable/qgsfeaturelistview.h
  104. +1 −1 src/gui/qgisgui.cpp
  105. +1 −1 src/gui/qgisinterface.h
  106. +4 −4 src/gui/qgsadvanceddigitizingdockwidget.cpp
  107. +1 −1 src/gui/qgsadvanceddigitizingdockwidget.h
  108. +1 −1 src/gui/qgscomposerview.cpp
  109. +1 −1 src/gui/qgsdetaileditemdelegate.cpp
  110. +1 −1 src/gui/qgsexternalresourcewidget.h
  111. +1 −1 src/gui/qgsfiledropedit.cpp
  112. +1 −1 src/gui/qgshighlight.cpp
  113. +1 −1 src/gui/qgsmaplayeractionregistry.h
  114. +1 −1 src/gui/qgsmaptooladvanceddigitizing.h
  115. +1 −1 src/gui/qgsmaptoolidentify.cpp
  116. +2 −2 src/gui/qgsmaptoolidentify.h
  117. +1 −1 src/gui/qgsowssourceselect.cpp
  118. +2 −2 src/gui/qgsprojectionselector.cpp
  119. +1 −1 src/gui/symbology-ng/qgssizescalewidget.cpp
  120. +1 −1 src/plugins/evis/databaseconnection/evisdatabaseconnection.h
  121. +1 −1 src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp
  122. +3 −3 src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp
  123. +1 −1 src/plugins/evis/eventbrowser/evisimagedisplaywidget.h
  124. +1 −1 src/plugins/geometry_checker/checks/qgsgeometryselfintersectioncheck.cpp
  125. +1 −1 src/plugins/georeferencer/qgsgeorefplugingui.cpp
  126. +1 −1 src/plugins/georeferencer/qgstransformsettingsdialog.cpp
  127. +1 −1 src/plugins/grass/modules/r.colors.table.qgm
  128. +1 −1 src/plugins/grass/modules/r.texture.bis.qgm
  129. +1 −1 src/plugins/grass/modules/r.texture.qgm
  130. +1 −1 src/plugins/grass/modules/v.clean.prune.qgm
  131. +2 −2 src/plugins/grass/qgsgrassmodule.cpp
  132. +1 −1 src/plugins/grass/qgsgrassplugin.cpp
  133. +1 −1 src/plugins/grass/qgsgrasstools.cpp
  134. +1 −1 src/plugins/grass/scripts/db.connect-login.pg.py
  135. +3 −3 src/plugins/grass/scripts/v.class.mlpy.qgis.py
  136. +1 −1 src/plugins/spatialquery/qgsmngprogressbar.cpp
  137. +1 −1 src/plugins/spatialquery/qgsspatialquerydialog.cpp
  138. +1 −1 src/plugins/topology/topolTest.cpp
  139. +2 −2 src/providers/db2/qgsdb2dataitems.cpp
  140. +1 −1 src/providers/delimitedtext/qgsdelimitedtextfile.h
  141. +1 −1 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  142. +1 −1 src/providers/delimitedtext/qgsdelimitedtextprovider.h
  143. +1 −1 src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp
  144. +1 −1 src/providers/gdal/qgsgdaldataitems.cpp
  145. +1 −1 src/providers/grass/qgsgrassgislib.cpp
  146. +1 −1 src/providers/grass/qgsgrassprovidermodule.h
  147. +1 −1 src/providers/grass/qgsgrassrasterprovider.cpp
  148. +2 −2 src/providers/mssql/qgsmssqldataitems.cpp
  149. +1 −1 src/providers/mssql/qgsmssqlprovider.h
  150. +1 −1 src/providers/ogr/qgsogrdataitems.cpp
  151. +1 −1 src/providers/ogr/qgsogrprovider.cpp
  152. +2 −2 src/providers/postgres/qgspostgresconn.cpp
  153. +2 −2 src/providers/postgres/qgspostgresconn.h
  154. +1 −1 src/providers/spatialite/qgsspatialiteconnection.h
  155. +1 −1 src/providers/virtual/qgsvirtuallayerblob.cpp
  156. +1 −1 src/providers/virtual/qgsvirtuallayerblob.h
  157. +1 −1 src/providers/wcs/URI
  158. +1 −1 src/providers/wfs/qgswfsshareddata.cpp
  159. +2 −2 src/server/qgsaccesscontrol.h
  160. +1 −1 src/server/qgsserverinterface.h
  161. +1 −1 src/server/services/wms/qgswmsservertransitional.h
  162. +1 −1 tests/bench/README
  163. +1 −1 tests/qt_modeltest/modeltest.cpp
  164. +1 −1 tests/src/core/testqgsmaprendererjob.cpp
  165. +1 −1 tests/src/core/testqgsogcutils.cpp
  166. +1 −1 tests/src/providers/testqgswcsprovider.cpp
  167. +1 −1 tests/src/python/test_provider_wfs.py
  168. +1 −1 tests/src/python/test_qgsauthsystem.py
  169. +1 −1 tests/src/python/test_qgsissue7244.py
  170. +1 −1 tests/testdata/font/QGIS-Vera/RELEASENOTES.TXT
  171. +1 −1 tests/testdata/qgis_local_server/lighttpd/config/conf/debug.conf
  172. +1 −1 tests/testdata/qgis_local_server/lighttpd/config/modules.conf
@@ -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
@@ -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
14 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
@@ -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
@@ -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.
#
@@ -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.
#
@@ -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.
#
@@ -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

@@ -1094,7 +1094,7 @@ <H4>4.2.4.5. Final python notes</H4>

<P>
/!\ 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.
</P>

<H3>4.2.5. git</H3>
@@ -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 ===

@@ -1192,7 +1192,7 @@ <H1>17. Whats new in Version 1.4.0 'Enceladus'?</H1>
<P>
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 @@ <H1>28. 0.5</H1>
<P></P>
Fix for bug [ 973922 ] Overview shows layers in wrong order
<P></P>
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
<P></P>
Added setZOrder which will be used in next commit to fix projectio zorder problem
<P></P>
2004-06-20 [ts] 0.3.0devel43
<P></P>
Fix anoying 'mapcanvas isnt freezing while loading rasters' bug
Fix anoying 'mapcanvas isn't freezing while loading rasters' bug
<P></P>
2004-06-19 [ts] 0.3.0devel42
<P></P>
@@ -2120,8 +2120,8 @@ <H1>28. 0.5</H1>
Win32 support for package path - which will hopefully ensure pyramid and overview mini
icons are displayed on legend entry now.
<P></P>
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:
<P></P>
QgsVectorFileWriter myFileWriter("/tmp/test.shp", wkbPoint);
@@ -2682,7 +2682,7 @@ <H1>28. 0.5</H1>
!! 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
</P>
<P>
2004-04-18 [jobi] 0.1.0devel33
@@ -2699,7 +2699,7 @@ <H1>28. 0.5</H1>
</P>
<P>
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.
</P>
<P>
@@ -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
@@ -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
@@ -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
@@ -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 );
@@ -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
@@ -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
@@ -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
@@ -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 );
@@ -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;
@@ -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*/
@@ -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 );
@@ -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
@@ -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

0 comments on commit 62c5069

Please sign in to comment.
You can’t perform that action at this time.