fix typos

(cherry picked from commit 1c298684ff6cedb9c9759442b55feba6b7241cee)
qgis · Oct 1, 2016 · 3654d50 · 3654d50
1 parent 0ad3bd6
commit 3654d50
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/python/core/raster/qgsrasterdrawer.sip b/python/core/raster/qgsrasterdrawer.sip
@@ -12,7 +12,7 @@ class QgsRasterDrawer
     /** Draws raster data.
      * @param p destination QPainter
      * @param viewPort viewport to render
-     * @param theQgsMapToPixel map to pixel convertor
+     * @param theQgsMapToPixel map to pixel converter
      * @param ctx render context
      * @param feedback optional raster feedback object for cancellation/preview. Added in QGIS 2.18.
      */

diff --git a/python/ext-libs/owslib/swe/common.py b/python/ext-libs/owslib/swe/common.py
@@ -85,7 +85,7 @@ def __init__(self, element):
         self.id             = testXMLAttribute(element,"id")   # string, optional
 
         # Elements
-        self.extention      = []                            # anyType, min=0, max=X
+        self.extension      = []                            # anyType, min=0, max=X
 
 class AbstractSWEIdentifiable(AbstractSWE):
     def __init__(self, element):

diff --git a/python/ext-libs/owslib/wmts.py b/python/ext-libs/owslib/wmts.py
@@ -747,7 +747,7 @@ def __init__(self, elem, parent=None, index=0,
 
     @property
     def tilematrixsets(self):
-        # NB. This attribute has been superseeded by the
+        # NB. This attribute has been superceeded by the
         # `tilematrixsetlinks` attribute defined below, but is included
         # for now to provide continuity.
         warnings.warn("The 'tilematrixsets' attribute has been deprecated"

diff --git a/python/ext-libs/owslib/wps.py b/python/ext-libs/owslib/wps.py
@@ -1560,8 +1560,8 @@ def getXml(self):
 
 def monitorExecution(execution, sleepSecs=3, download=False, filepath=None):
     '''
-    Convenience method to monitor the status of a WPS execution till it completes (succesfully or not),
-    and write the output to file after a succesfull job completion.
+    Convenience method to monitor the status of a WPS execution till it completes (successfully or not),
+    and write the output to file after a successful job completion.
 
     execution: WPSExecution instance
     sleepSecs: number of seconds to sleep in between check status invocations

diff --git a/scripts/chkspelling.sh b/scripts/chkspelling.sh
@@ -17,6 +17,6 @@
 
 
 RE=$(echo $(cut -d: -f1 scripts/spelling.dat | sed -e 's/^/\\</; s/$/\\>|/;') | sed -e 's/| /|/g; s/|$//;')
-EX="\.(svn-base|tmp|xpm|ts|o)|spelling\.dat|Exception_to_GPL_for_Qt.txt|sqlite3.c|qgisstyle|LexerR.py|debian/build*|ms-windows/osgeo4w|ChangeLog|src/plugins/grass/qtermwidget|src/app/gps/qwtpolar-|debian/tmp|src/plugins/dxf2shp_converter/dxflib|python/ext-libs|i18n/"
+EX="\.(svn-base|tmp|xpm|ts|o)|spelling\.dat|Exception_to_GPL_for_Qt.txt|sqlite3.c|qgisstyle|LexerR.py|debian/build.*|debian/.*/usr/|ms-windows/osgeo4w|ChangeLog|src/plugins/grass/qtermwidget|src/app/gps/qwtpolar-|debian/tmp|src/plugins/dxf2shp_converter/dxflib|python/ext-libs|i18n/"
 
 egrep --exclude=*.{png,svg,db,bz2,pdf,qgs,qml,api,pyc} --exclude-dir=.git --exclude-dir=debian/build* --color=always "$RE" -ir .  | egrep -iv "$EX"
diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp
@@ -538,14 +538,14 @@ void QgsVectorLayerFeatureIterator::prepareExpression( int fieldIdx )
 
   Q_FOREACH ( const QString& col, exp->referencedColumns() )
   {
-    int dependantFieldIdx = mSource->mFields.fieldNameIndex( col );
+    int dependentFieldIdx = mSource->mFields.fieldNameIndex( col );
     if ( mRequest.flags() & QgsFeatureRequest::SubsetOfAttributes )
     {
-      mRequest.setSubsetOfAttributes( mRequest.subsetOfAttributes() << dependantFieldIdx );
+      mRequest.setSubsetOfAttributes( mRequest.subsetOfAttributes() << dependentFieldIdx );
     }
-    // also need to fetch this dependant field
-    if ( !mPreparedFields.contains( dependantFieldIdx ) && !mFieldsToPrepare.contains( dependantFieldIdx ) )
-      mFieldsToPrepare << dependantFieldIdx;
+    // also need to fetch this dependent field
+    if ( !mPreparedFields.contains( dependentFieldIdx ) && !mFieldsToPrepare.contains( dependentFieldIdx ) )
+      mFieldsToPrepare << dependentFieldIdx;
   }
 
   if ( exp->needsGeometry() )

diff --git a/src/plugins/evis/README.TXT b/src/plugins/evis/README.TXT
@@ -7,7 +7,7 @@ This plugin was originally written and distributed by the Center for Biodiversit
 http://biodiversityinformatics.amnh.org/open_source/evis/
 eVis was contributed to the QGIS project on 2009-07-01.
 
-eVis was started in 2007 with QGIS v0.7.0. It was our first experience with QGIS and QT. Since its early beginings, the QGIS API has under gone many changes and advances, and as a result there are still some old ideas in this code and much room for improvement. Were we to start this plugin now, we would have done it quite differently! There is still much room for imporovement. We hope the QGIS community will find eVis useful and extend its capabilities to make it even more robust.
+eVis was started in 2007 with QGIS v0.7.0. It was our first experience with QGIS and QT. Since its early beginnings, the QGIS API has under gone many changes and advances, and as a result there are still some old ideas in this code and much room for improvement. Were we to start this plugin now, we would have done it quite differently! There is still much room for imporovement. We hope the QGIS community will find eVis useful and extend its capabilities to make it even more robust.
 
 
 

diff --git a/src/providers/virtual/qgsvirtuallayersourceselectbase.ui b/src/providers/virtual/qgsvirtuallayersourceselectbase.ui
@@ -165,7 +165,7 @@ In particular, saving a virtual layer with embedded layers to a QLR file can be
       <item>
        <widget class="QgsCodeEditorSQL" name="mQueryEdit" native="true">
         <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the SQL query editor. You can edit here an SQL query refering to any existing vector layers or embedded layers.&lt;/p&gt;&lt;p&gt;Virtual layers rely on SQLite and Spatialite. Any functions from SQLite or Spatialite can then be used in the query. To add or access geometries of a table, you can use &quot;tablename.geometry&quot;, regardless of original geometry column's name.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Special comments:&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Because it is not always possible to autodetect the data type of each column in a query, special comments can be used in the query to force a specific type.&lt;/p&gt;&lt;p&gt;Special comments must be placed on the right of a column name and have the form &lt;tt&gt;/*:type*/&lt;/tt&gt; where type can be any of &lt;span style=&quot; font-style:italic;&quot;&gt;int&lt;/span&gt;, &lt;span style=&quot; font-style:italic;&quot;&gt;real&lt;/span&gt; or &lt;span style=&quot; font-style:italic;&quot;&gt;text&lt;/span&gt;. They can also be used to specify the type and SRID of the geometry column with the following syntax: &lt;tt&gt;/*:gtype:srid*/&lt;/tt&gt; where &lt;span style=&quot; font-style:italic;&quot;&gt;gtype&lt;/span&gt; can be &lt;span style=&quot; font-style:italic;&quot;&gt;point&lt;/span&gt;, &lt;span style=&quot; font-style:italic;&quot;&gt;linestring&lt;/span&gt; or &lt;span style=&quot; font-style:italic;&quot;&gt;polygon&lt;/span&gt; (with an optional &lt;span style=&quot; font-style:italic;&quot;&gt;multi&lt;/span&gt; prefix) and &lt;span style=&quot; font-style:italic;&quot;&gt;srid&lt;/span&gt; is an integer identifier.&lt;/p&gt;&lt;p&gt;Example:&lt;/p&gt;&lt;p&gt;&lt;tt&gt;SELECT id + 1 as id /*:int*/, ST_Centroid(geometry) as geom /*:point:4326*/ FROM tab&lt;/tt&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the SQL query editor. You can edit here an SQL query referring to any existing vector layers or embedded layers.&lt;/p&gt;&lt;p&gt;Virtual layers rely on SQLite and Spatialite. Any functions from SQLite or Spatialite can then be used in the query. To add or access geometries of a table, you can use &quot;tablename.geometry&quot;, regardless of original geometry column's name.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Special comments:&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Because it is not always possible to autodetect the data type of each column in a query, special comments can be used in the query to force a specific type.&lt;/p&gt;&lt;p&gt;Special comments must be placed on the right of a column name and have the form &lt;tt&gt;/*:type*/&lt;/tt&gt; where type can be any of &lt;span style=&quot; font-style:italic;&quot;&gt;int&lt;/span&gt;, &lt;span style=&quot; font-style:italic;&quot;&gt;real&lt;/span&gt; or &lt;span style=&quot; font-style:italic;&quot;&gt;text&lt;/span&gt;. They can also be used to specify the type and SRID of the geometry column with the following syntax: &lt;tt&gt;/*:gtype:srid*/&lt;/tt&gt; where &lt;span style=&quot; font-style:italic;&quot;&gt;gtype&lt;/span&gt; can be &lt;span style=&quot; font-style:italic;&quot;&gt;point&lt;/span&gt;, &lt;span style=&quot; font-style:italic;&quot;&gt;linestring&lt;/span&gt; or &lt;span style=&quot; font-style:italic;&quot;&gt;polygon&lt;/span&gt; (with an optional &lt;span style=&quot; font-style:italic;&quot;&gt;multi&lt;/span&gt; prefix) and &lt;span style=&quot; font-style:italic;&quot;&gt;srid&lt;/span&gt; is an integer identifier.&lt;/p&gt;&lt;p&gt;Example:&lt;/p&gt;&lt;p&gt;&lt;tt&gt;SELECT id + 1 as id /*:int*/, ST_Centroid(geometry) as geom /*:point:4326*/ FROM tab&lt;/tt&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
        </widget>
       </item>

diff --git a/tests/src/python/test_authmanager_endpoint.py b/tests/src/python/test_authmanager_endpoint.py
@@ -144,7 +144,7 @@ def _getWMSLayer(cls, layers, layer_name=None, authcfg=None):
             'crs': 'EPSG:4326',
             'url': 'http://127.0.0.1:%s/?map=%s' % (cls.port, cls.project_path),
             'format': 'image/png',
-            # This is needed because of a really wierd implementation in QGIS Server, that
+            # This is needed because of a really weird implementation in QGIS Server, that
             # replaces _ in the the real layer name with spaces
             'layers': urllib.quote(layers.replace('_', ' ')),
             'styles': '',