Skip to content

Commit e451b9a

Browse files
committed
indentation and spelling fixes
1 parent 43334df commit e451b9a

File tree

9 files changed

+28
-28
lines changed

9 files changed

+28
-28
lines changed

python/core/geometry/qgsabstractgeometryv2.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ class QgsAbstractGeometryV2
207207
* @param transformZ set to true to also transform z coordinates. This requires that
208208
* the z coordinates in the geometry represent height relative to the vertical datum
209209
* of the source CRS (generally ellipsoidal heights) and are expressed in its vertical
210-
* units (generally metres). If false, then z coordinates will not be changed by the
210+
* units (generally meters). If false, then z coordinates will not be changed by the
211211
* transform.
212212
*/
213213
virtual void transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,

python/gui/qgspanelwidget.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class QgsPanelWidget : public QWidget
122122
protected:
123123

124124
/**
125-
* @brief Overriden key press event to handle the esc event on the widget.
125+
* @brief Overridden key press event to handle the esc event on the widget.
126126
* @param event The key event
127127
*/
128128
void keyPressEvent( QKeyEvent* event );

python/plugins/processing/modeler/ModelerParameterDefinitionDialog.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def setupUi(self):
128128
self.verticalLayout.addLayout(self.horizontalLayoutParent)
129129
elif self.paramType in (
130130
ModelerParameterDefinitionDialog.PARAMETER_TABLE_FIELD,
131-
ModelerParameterDefinitionDialog.PARAMETER_TABLE_MULTIPLE_FIELD)\
131+
ModelerParameterDefinitionDialog.PARAMETER_TABLE_MULTIPLE_FIELD)\
132132
or isinstance(self.param, (ParameterTableField,
133133
ParameterTableMultipleField)):
134134
self.horizontalLayoutParent.addWidget(QLabel(self.tr('Parent layer')))

src/core/geometry/qgsabstractgeometryv2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ class CORE_EXPORT QgsAbstractGeometryV2
191191
* @param transformZ set to true to also transform z coordinates. This requires that
192192
* the z coordinates in the geometry represent height relative to the vertical datum
193193
* of the source CRS (generally ellipsoidal heights) and are expressed in its vertical
194-
* units (generally metres). If false, then z coordinates will not be changed by the
194+
* units (generally meters). If false, then z coordinates will not be changed by the
195195
* transform.
196196
*/
197197
virtual void transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,

src/core/pal/rtree.hpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,22 @@ namespace pal
4343
class RTFileStream; // File I/O helper class, look below for implementation and notes.
4444

4545

46-
/** \ingroup core
47-
Implementation of RTree, a multidimensional bounding rectangle tree.
48-
Example usage: For a 3-dimensional tree use RTree<Object*, float, 3> myTree;
49-
50-
This modified, templated C++ version by Greg Douglas at Auran (http://www.auran.com)
51-
52-
DATATYPE Referenced data, should be int, void*, obj* etc. no larger than sizeof<void*> and simple type
53-
ELEMTYPE Type of element such as int or float
54-
NUMDIMS Number of dimensions such as 2 or 3
55-
ELEMTYPEREAL Type of element that allows fractional and large values such as float or double, for use in volume calcs
56-
57-
NOTES: Inserting and removing data requires the knowledge of its constant Minimal Bounding Rectangle.
58-
This version uses new/delete for nodes, I recommend using a fixed size allocator for efficiency.
59-
Instead of using a callback function for returned results, I recommend and efficient pre-sized, grow-only memory
60-
array similar to MFC CArray or STL Vector for returning search query result.
61-
*/
46+
/** \ingroup core
47+
Implementation of RTree, a multidimensional bounding rectangle tree.
48+
Example usage: For a 3-dimensional tree use RTree<Object*, float, 3> myTree;
49+
50+
This modified, templated C++ version by Greg Douglas at Auran (http://www.auran.com)
51+
52+
DATATYPE Referenced data, should be int, void*, obj* etc. no larger than sizeof<void*> and simple type
53+
ELEMTYPE Type of element such as int or float
54+
NUMDIMS Number of dimensions such as 2 or 3
55+
ELEMTYPEREAL Type of element that allows fractional and large values such as float or double, for use in volume calcs
56+
57+
NOTES: Inserting and removing data requires the knowledge of its constant Minimal Bounding Rectangle.
58+
This version uses new/delete for nodes, I recommend using a fixed size allocator for efficiency.
59+
Instead of using a callback function for returned results, I recommend and efficient pre-sized, grow-only memory
60+
array similar to MFC CArray or STL Vector for returning search query result.
61+
*/
6262

6363
template < class DATATYPE, class ELEMTYPE, int NUMDIMS,
6464
class ELEMTYPEREAL = ELEMTYPE, int TMAXNODES = 8, int TMINNODES = TMAXNODES / 2 >

src/core/qgsproject.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -985,7 +985,7 @@ bool QgsProject::read( QDomNode &layerNode )
985985
QList< QPair< QgsVectorLayer*, QDomElement > > vectorLayerList;
986986
if ( addLayer( layerNode.toElement(), brokenNodes, vectorLayerList ) )
987987
{
988-
// have to try to update joins for all layers now - a previously added layer may be dependant on this newly
988+
// have to try to update joins for all layers now - a previously added layer may be dependent on this newly
989989
// added layer for joins
990990
QVector<QgsVectorLayer*> vectorLayers = QgsMapLayerRegistry::instance()->layers<QgsVectorLayer*>();
991991
Q_FOREACH ( QgsVectorLayer* layer, vectorLayers )

src/core/raster/qgsrasterdrawer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class CORE_EXPORT QgsRasterDrawer
3939
/** Draws raster data.
4040
* @param p destination QPainter
4141
* @param viewPort viewport to render
42-
* @param theQgsMapToPixel map to pixel convertor
42+
* @param theQgsMapToPixel map to pixel converter
4343
* @param ctx render context
4444
*/
4545
void draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel, const QgsRenderContext *ctx = nullptr );

src/gui/qgspanelwidget.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ class GUI_EXPORT QgsPanelWidget : public QWidget
141141
protected:
142142

143143
/**
144-
* @brief Overriden key press event to handle the esc event on the widget.
144+
* @brief Overridden key press event to handle the esc event on the widget.
145145
* @param event The key event
146146
*/
147147
void keyPressEvent( QKeyEvent* event );

src/providers/oracle/qgsoracledataitems.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ void QgsOracleConnectionItem::refresh()
6868

6969
void QgsOracleConnectionItem::setAllAsPopulated()
7070
{
71-
Q_FOREACH ( QgsDataItem *child, mChildren )
72-
{
73-
child->setState( Populated );
74-
}
75-
setState( Populated );
71+
Q_FOREACH ( QgsDataItem *child, mChildren )
72+
{
73+
child->setState( Populated );
74+
}
75+
setState( Populated );
7676
}
7777

7878
QVector<QgsDataItem*> QgsOracleConnectionItem::createChildren()

0 commit comments

Comments
 (0)