Skip to content

Commit

Permalink
indentation and spelling fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jul 8, 2016
1 parent 43334df commit e451b9a
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion python/core/geometry/qgsabstractgeometryv2.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgspanelwidget.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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')))
Expand Down
2 changes: 1 addition & 1 deletion src/core/geometry/qgsabstractgeometryv2.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
32 changes: 16 additions & 16 deletions src/core/pal/rtree.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 >
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsproject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
2 changes: 1 addition & 1 deletion src/core/raster/qgsrasterdrawer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgspanelwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
10 changes: 5 additions & 5 deletions src/providers/oracle/qgsoracledataitems.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit e451b9a

Please sign in to comment.