indentation and spelling fixes

qgis · Jul 8, 2016 · e451b9a · e451b9a
1 parent 43334df
commit e451b9a
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 28 deletions.
diff --git a/python/core/geometry/qgsabstractgeometryv2.sip b/python/core/geometry/qgsabstractgeometryv2.sip
@@ -207,7 +207,7 @@ class QgsAbstractGeometryV2
      * @param transformZ set to true to also transform z coordinates. This requires that
      * the z coordinates in the geometry represent height relative to the vertical datum
      * of the source CRS (generally ellipsoidal heights) and are expressed in its vertical
-     * units (generally metres). If false, then z coordinates will not be changed by the
+     * units (generally meters). If false, then z coordinates will not be changed by the
      * transform.
      */
     virtual void transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,

diff --git a/python/gui/qgspanelwidget.sip b/python/gui/qgspanelwidget.sip
@@ -122,7 +122,7 @@ class QgsPanelWidget : public QWidget
   protected:
 
     /**
-     * @brief Overriden key press event to handle the esc event on the widget.
+     * @brief Overridden key press event to handle the esc event on the widget.
      * @param event The key event
      */
     void keyPressEvent( QKeyEvent* event );

diff --git a/python/plugins/processing/modeler/ModelerParameterDefinitionDialog.py b/python/plugins/processing/modeler/ModelerParameterDefinitionDialog.py
@@ -128,7 +128,7 @@ def setupUi(self):
             self.verticalLayout.addLayout(self.horizontalLayoutParent)
         elif self.paramType in (
             ModelerParameterDefinitionDialog.PARAMETER_TABLE_FIELD,
-                        ModelerParameterDefinitionDialog.PARAMETER_TABLE_MULTIPLE_FIELD)\
+            ModelerParameterDefinitionDialog.PARAMETER_TABLE_MULTIPLE_FIELD)\
             or isinstance(self.param, (ParameterTableField,
                                        ParameterTableMultipleField)):
             self.horizontalLayoutParent.addWidget(QLabel(self.tr('Parent layer')))

diff --git a/src/core/geometry/qgsabstractgeometryv2.h b/src/core/geometry/qgsabstractgeometryv2.h
@@ -191,7 +191,7 @@ class CORE_EXPORT QgsAbstractGeometryV2
      * @param transformZ set to true to also transform z coordinates. This requires that
      * the z coordinates in the geometry represent height relative to the vertical datum
      * of the source CRS (generally ellipsoidal heights) and are expressed in its vertical
-     * units (generally metres). If false, then z coordinates will not be changed by the
+     * units (generally meters). If false, then z coordinates will not be changed by the
      * transform.
      */
     virtual void transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,

diff --git a/src/core/pal/rtree.hpp b/src/core/pal/rtree.hpp
@@ -43,22 +43,22 @@ namespace pal
   class RTFileStream;  // File I/O helper class, look below for implementation and notes.
 
 
-/** \ingroup core
-   Implementation of RTree, a multidimensional bounding rectangle tree.
-   Example usage: For a 3-dimensional tree use RTree<Object*, float, 3> myTree;
-
-   This modified, templated C++ version by Greg Douglas at Auran (http://www.auran.com)
-
-   DATATYPE Referenced data, should be int, void*, obj* etc. no larger than sizeof<void*> and simple type
-   ELEMTYPE Type of element such as int or float
-   NUMDIMS Number of dimensions such as 2 or 3
-   ELEMTYPEREAL Type of element that allows fractional and large values such as float or double, for use in volume calcs
-
-   NOTES: Inserting and removing data requires the knowledge of its constant Minimal Bounding Rectangle.
-          This version uses new/delete for nodes, I recommend using a fixed size allocator for efficiency.
-          Instead of using a callback function for returned results, I recommend and efficient pre-sized, grow-only memory
-          array similar to MFC CArray or STL Vector for returning search query result.
-*/
+  /** \ingroup core
+     Implementation of RTree, a multidimensional bounding rectangle tree.
+     Example usage: For a 3-dimensional tree use RTree<Object*, float, 3> myTree;
+
+     This modified, templated C++ version by Greg Douglas at Auran (http://www.auran.com)
+
+     DATATYPE Referenced data, should be int, void*, obj* etc. no larger than sizeof<void*> and simple type
+     ELEMTYPE Type of element such as int or float
+     NUMDIMS Number of dimensions such as 2 or 3
+     ELEMTYPEREAL Type of element that allows fractional and large values such as float or double, for use in volume calcs
+
+     NOTES: Inserting and removing data requires the knowledge of its constant Minimal Bounding Rectangle.
+            This version uses new/delete for nodes, I recommend using a fixed size allocator for efficiency.
+            Instead of using a callback function for returned results, I recommend and efficient pre-sized, grow-only memory
+            array similar to MFC CArray or STL Vector for returning search query result.
+  */
 
   template < class DATATYPE, class ELEMTYPE, int NUMDIMS,
   class ELEMTYPEREAL = ELEMTYPE, int TMAXNODES = 8, int TMINNODES = TMAXNODES / 2 >

diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -985,7 +985,7 @@ bool QgsProject::read( QDomNode &layerNode )
   QList< QPair< QgsVectorLayer*, QDomElement > > vectorLayerList;
   if ( addLayer( layerNode.toElement(), brokenNodes, vectorLayerList ) )
   {
-    // have to try to update joins for all layers now - a previously added layer may be dependant on this newly
+    // have to try to update joins for all layers now - a previously added layer may be dependent on this newly
     // added layer for joins
     QVector<QgsVectorLayer*> vectorLayers = QgsMapLayerRegistry::instance()->layers<QgsVectorLayer*>();
     Q_FOREACH ( QgsVectorLayer* layer, vectorLayers )

diff --git a/src/core/raster/qgsrasterdrawer.h b/src/core/raster/qgsrasterdrawer.h
@@ -39,7 +39,7 @@ class CORE_EXPORT 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
      */
     void draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel, const QgsRenderContext *ctx = nullptr );

diff --git a/src/gui/qgspanelwidget.h b/src/gui/qgspanelwidget.h
@@ -141,7 +141,7 @@ class GUI_EXPORT QgsPanelWidget : public QWidget
   protected:
 
     /**
-     * @brief Overriden key press event to handle the esc event on the widget.
+     * @brief Overridden key press event to handle the esc event on the widget.
      * @param event The key event
      */
     void keyPressEvent( QKeyEvent* event );

diff --git a/src/providers/oracle/qgsoracledataitems.cpp b/src/providers/oracle/qgsoracledataitems.cpp
@@ -68,11 +68,11 @@ void QgsOracleConnectionItem::refresh()
 
 void QgsOracleConnectionItem::setAllAsPopulated()
 {
-    Q_FOREACH ( QgsDataItem *child, mChildren )
-    {
-      child->setState( Populated );
-    }
-    setState( Populated );
+  Q_FOREACH ( QgsDataItem *child, mChildren )
+  {
+    child->setState( Populated );
+  }
+  setState( Populated );
 }
 
 QVector<QgsDataItem*> QgsOracleConnectionItem::createChildren()