Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Misc. source comment typos
+ added 2 strings in to spelling.dat file
  • Loading branch information
luzpaz authored and nyalldawson committed Mar 12, 2018
1 parent d04b3d9 commit b82ec17
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion python/analysis/interpolation/NormVecDecorator.sip
Expand Up @@ -56,7 +56,7 @@ Eliminates the horizontal triangles by swapping or by insertion of new points. I
%End
bool estimateFirstDerivative( int pointno );
%Docstring
Estimates the first derivative a point. Return true in case of succes and false otherwise
Estimates the first derivative a point. Return true in case of success and false otherwise
:rtype: bool
%End
bool estimateFirstDerivatives( QgsFeedback *feedback = 0 );
Expand Down
2 changes: 2 additions & 0 deletions scripts/spell_check/spelling.dat
Expand Up @@ -466,6 +466,7 @@ amung:among
amunition:ammunition
an other:another
analagous:analogous
analise:analyze
analitic:analytic
analogeous:analogous
analysator:analyzer
Expand Down Expand Up @@ -7576,6 +7577,7 @@ woudn't:wouldn't
would'nt:wouldn't
would't:wouldn't
wouldnt:wouldn't
wraper:wrapper
wresters:wrestlers
wriet:write
writeable:writable
Expand Down
4 changes: 2 additions & 2 deletions src/analysis/interpolation/NormVecDecorator.cpp
Expand Up @@ -59,7 +59,7 @@ int NormVecDecorator::addPoint( const QgsPoint &p )
estimateFirstDerivative( pointno );
//update also the neighbours of the new point
const QList<int> list = mTIN->getSurroundingTriangles( pointno );
auto it = list.constBegin();//iterate through the list and analize it
auto it = list.constBegin();//iterate through the list and analyze it
while ( it != list.constEnd() )
{
int point;
Expand Down Expand Up @@ -393,7 +393,7 @@ bool NormVecDecorator::estimateFirstDerivative( int pointno )
return false;
}

auto it = vlist.constBegin();//iterate through the list and analize it
auto it = vlist.constBegin();//iterate through the list and analyze it
while ( it != vlist.constEnd() )
{
int p1, p2, p3, flag;
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/interpolation/NormVecDecorator.h
Expand Up @@ -50,7 +50,7 @@ class ANALYSIS_EXPORT NormVecDecorator: public TriDecorator
bool calcPoint( double x, double y, QgsPoint &result SIP_OUT ) override;
//! Eliminates the horizontal triangles by swapping or by insertion of new points. If alreadyestimated is true, a re-estimation of the normals will be done
void eliminateHorizontalTriangles() override;
//! Estimates the first derivative a point. Return true in case of succes and false otherwise
//! Estimates the first derivative a point. Return true in case of success and false otherwise
bool estimateFirstDerivative( int pointno );
//! This method adds the functionality of estimating normals at the data points. Return true in the case of success and false otherwise
bool estimateFirstDerivatives( QgsFeedback *feedback = nullptr );
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgslabelsearchtree.h
Expand Up @@ -32,7 +32,7 @@ class QgsPointXY;

/**
* \ingroup core
* A class to query the labeling structure at a given point (small wraper around pal RTree class)
* A class to query the labeling structure at a given point (small wrapper around pal RTree class)
*/
class CORE_EXPORT QgsLabelSearchTree
{
Expand Down
2 changes: 1 addition & 1 deletion src/core/raster/qgsrasterdataprovider.h
Expand Up @@ -407,7 +407,7 @@ class CORE_EXPORT QgsRasterDataProvider : public QgsDataProvider, public QgsRast
virtual bool setEditable( bool enabled ) { Q_UNUSED( enabled ); return false; }

//! Writes into the provider datasource
// TODO: add data type (may be defferent from band type)
// TODO: add data type (may be different from band type)
virtual bool write( void *data, int band, int width, int height, int xOffset, int yOffset )
{
Q_UNUSED( data );
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/grass/qgsgrassmapcalc.h
Expand Up @@ -117,7 +117,7 @@ class QgsGrassMapcalc: public QMainWindow, private Ui::QgsGrassMapcalcBase,
//! Reset tool actions togles
void setToolActionsOff( void );

//! Set currnt tool and toggle menu
//! Set current tool and toggle menu
void setTool( int );

//! Map selection changed
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/grass/qtermwidget/History.h
Expand Up @@ -71,7 +71,7 @@ class HistoryFile
//pointer to start of mmap'ed file data, or 0 if the file is not mmap'ed
char* fileMap;

//incremented whenver 'add' is called and decremented whenever
//incremented whenever 'add' is called and decremented whenever
//'get' is called.
//this is used to detect when a large number of lines are being read and processed from the history
//and automatically mmap the file for better performance (saves the overhead of many lseek-read calls).
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/grass/qtermwidget/Session.cpp
Expand Up @@ -288,7 +288,7 @@ void Session::run()
* Thats bad for BSD as its /usr/local/bin/bash there - its also bad for arch as its /usr/bin/bash there too!
* So i added a check to see if /bin/bash exists - if no then we use $SHELL - if that does not exist either, we fall back to /bin/sh
* As far as i know /bin/sh exists on every unix system.. You could also just put some ifdef __FREEBSD__ here but i think these 2 filechecks are worth
* their computing time on any system - especially with the problem on arch linux beeing there too.
* their computing time on any system - especially with the problem on arch linux being there too.
*/
QString exec = QFile::encodeName(_program);
// if 'exec' is not specified, fall back to default shell. if that
Expand Down
2 changes: 1 addition & 1 deletion src/providers/grass/qgsgrassgislib.cpp
Expand Up @@ -100,7 +100,7 @@ QgsGrassGisLib::QgsGrassGisLib()
QString libPath = gisBase + "\\lib\\libgrass_gis." + QString( GRASS_VERSION ) + ".dll";
#else
QString libPath = QString( GRASS_LIBRARY_GIS );
// Prefere GISBASE if set
// Prefer GISBASE if set
if ( !gisBase.isEmpty() )
{
libPath = gisBase + "/lib/" + QFileInfo( libPath ).fileName();
Expand Down
2 changes: 1 addition & 1 deletion src/providers/ogr/qgsogrprovider.cpp
Expand Up @@ -3992,7 +3992,7 @@ void QgsOgrProvider::open( OpenMode mode )
// Ensure subset is set (setSubsetString does nothing if the passed sql subset string is equal to mSubsetString, which is the case when reloading the dataset)
QString origSubsetString = mSubsetString;
mSubsetString.clear();
// Block signals to avoid endless recusion reloadData -> emit dataChanged -> reloadData
// Block signals to avoid endless recursion reloadData -> emit dataChanged -> reloadData
blockSignals( true );
// Do not update capabilities: it will be done later
mValid = _setSubsetString( origSubsetString, true, false );
Expand Down
4 changes: 2 additions & 2 deletions src/providers/wcs/qgswcscapabilities.cpp
Expand Up @@ -224,8 +224,8 @@ bool QgsWcsCapabilities::retrieveServerCapabilities()
}
else
{
// We prefer 1.0 because 1.1 has many issues, each server implements it in defferent
// way with various particularities
// We prefer 1.0 because 1.1 has many issues, each server implements it in
// a different way with various particularities.
// It may happen that server supports 1.1.0 but gives error for 1.1
versions << QStringLiteral( "1.0.0" ) << QStringLiteral( "1.1.0,1.0.0" );
}
Expand Down

0 comments on commit b82ec17

Please sign in to comment.