Skip to content

Commit 3d978be

Browse files
committed
indentation and spelling fixes
1 parent 7e8041c commit 3d978be

14 files changed

+31
-31
lines changed

INSTALL

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
QGIS
22
Building QGIS from source - step by step
3-
Monday June 22, 2015
3+
Wednesday June 24, 2015
44

55

6-
Last Updated: Monday June 22, 2015
7-
Last Change : Monday June 22, 2015
6+
Last Updated: Wednesday June 24, 2015
7+
Last Change : Wednesday June 24, 2015
88

99

1010
1. Introduction
@@ -110,7 +110,7 @@ Optional dependencies:
110110

111111
- for GRASS providers and plugin - GRASS >= 6.0.0. QGIS may be compiled with GRASS 6 or GRASS 7.
112112
It can also be compiled with both GRASS versions in a single build but only if QGIS
113-
is not installed with rpath. The desired GRASS version is choosen on runtime by setting
113+
is not installed with rpath. The desired GRASS version is chosen on runtime by setting
114114
LD_LIBRARY_PATH or PATH.
115115
- for georeferencer - GSL >= 1.8
116116
- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x

doc/INSTALL.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@
7777
<DIV CLASS="header" ID="header">
7878
<H1>QGIS</H1>
7979
<H2>Building QGIS from source - step by step</H2>
80-
<H3>Monday June 22, 2015</H3>
80+
<H3>Wednesday June 24, 2015</H3>
8181
</DIV>
8282

8383
<DIV CLASS="body" ID="body">
8484
<P>
85-
Last Updated: Monday June 22, 2015
86-
Last Change : Monday June 22, 2015
85+
Last Updated: Wednesday June 24, 2015
86+
Last Change : Wednesday June 24, 2015
8787
</P>
8888
<DIV CLASS="toc">
8989

@@ -221,7 +221,7 @@ <H1>2. Overview</H1>
221221
<UL>
222222
<LI>for GRASS providers and plugin - GRASS &gt;= 6.0.0. QGIS may be compiled with GRASS 6 or GRASS 7.
223223
It can also be compiled with both GRASS versions in a single build but only if QGIS
224-
is not installed with rpath. The desired GRASS version is choosen on runtime by setting
224+
is not installed with rpath. The desired GRASS version is chosen on runtime by setting
225225
LD_LIBRARY_PATH or PATH.
226226
<LI>for georeferencer - GSL &gt;= 1.8
227227
<LI>for postgis support and SPIT plugin - PostgreSQL &gt;= 8.0.x

doc/overview.t2t

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Optional dependencies:
2929

3030
- for GRASS providers and plugin - GRASS >= 6.0.0. QGIS may be compiled with GRASS 6 or GRASS 7.
3131
It can also be compiled with both GRASS versions in a single build but only if QGIS
32-
is not installed with rpath. The desired GRASS version is choosen on runtime by setting
32+
is not installed with rpath. The desired GRASS version is chosen on runtime by setting
3333
LD_LIBRARY_PATH or PATH.
3434
- for georeferencer - GSL >= 1.8
3535
- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x

scripts/chkspelling.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717

1818

1919
RE=$(echo $(cut -d: -f1 scripts/spelling.dat | sed -e 's/^/\\</; s/$/\\>|/;') | sed -e 's/| /|/g; s/|$//;')
20-
EX="\.(svn-base|tmp|xpm|ts)|spelling\.dat|Exception_to_GPL_for_Qt.txt|sqlite3.c|debian/build|ms-windows/osgeo4w|ChangeLog|src/plugins/grass/qtermwidget|src/app/gps/qwtpolar-1.0"
20+
EX="\.(svn-base|tmp|xpm|ts|o)|spelling\.dat|Exception_to_GPL_for_Qt.txt|sqlite3.c|debian/build|ms-windows/osgeo4w|ChangeLog|src/plugins/grass/qtermwidget|src/app/gps/qwtpolar-1.0"
2121

2222
egrep --exclude-dir=.git --color=always "$RE" -ir . | egrep -iv "$EX"

scripts/sort_include.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# sorts includes in <...> before "..."
2020
# keep #include "ui_..." on top of list
2121
# can skip includes if an order should be kept
22-
# can exlcude directories (hard-copies of external libraries)
22+
# can exclude directories (hard-copies of external libraries)
2323

2424
SORTING=false
2525
FILE1="sort_include_1.tmp"

src/analysis/raster/qgsrastercalculator.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class ANALYSIS_EXPORT QgsRasterCalculator
5757
* @param formulaString formula for raster calculation
5858
* @param outputFile output file path
5959
* @param outputFormat output file format
60-
* @param outputExtent output extent, CRS is specifed by outputCrs parameter
60+
* @param outputExtent output extent, CRS is specified by outputCrs parameter
6161
* @param outputCrs destination CRS for output raster
6262
* @param nOutputColumns number of columns in output raster
6363
* @param nOutputRows number of rows in output raster

src/app/qgsbrowserdockwidget.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class QgsBrowserPropertiesWidget : public QWidget
5050
virtual void setItem( QgsDataItem* item ) = 0;
5151

5252
/** Sets whether the properties widget should display in condensed mode, ie, for display in a dock
53-
* widget rather than it's own seperate dialog.
53+
* widget rather than it's own separate dialog.
5454
* @param condensedMode set to true to enable condensed mode
5555
* @note added in QGIS 2.10
5656
*/

src/core/geometry/qgsabstractgeometryv2.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ class CORE_EXPORT QgsAbstractGeometryV2
325325
/** Reads a WKB header and tests its validity.
326326
* @param wkbPtr
327327
* @param wkbType destination for WKB type from header
328-
* @param endianSwap will be set to true if endian from WKB must be swapped to match QGIS platform endianess
328+
* @param endianSwap will be set to true if endian from WKB must be swapped to match QGIS platform endianness
329329
* @param expectedType expected WKB type
330330
* @returns true if header is valid and matches expected type
331331
*/

src/core/geometry/qgscurvev2.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class CORE_EXPORT QgsCurveV2: public QgsAbstractGeometryV2
6262
*/
6363
virtual void addToPainterPath( QPainterPath& path ) const = 0;
6464

65-
/** Draws the curve as a polygon on the specifed QPainter.
65+
/** Draws the curve as a polygon on the specified QPainter.
6666
* @param p destination QPainter
6767
*/
6868
virtual void drawAsPolygon( QPainter& p ) const = 0;

src/core/qgsdataitem.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class CORE_EXPORT QgsAnimatedIcon : public QObject
6060
void onFrameChanged();
6161

6262
signals:
63-
/** Emited when icon changed */
63+
/** Emitted when icon changed */
6464
void frameChanged();
6565

6666
private:

src/core/raster/qgssinglebandpseudocolorrenderer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ QgsSingleBandPseudoColorRenderer::~QgsSingleBandPseudoColorRenderer()
3838
delete mShader;
3939
}
4040

41-
void QgsSingleBandPseudoColorRenderer::setBand(int bandNo)
41+
void QgsSingleBandPseudoColorRenderer::setBand( int bandNo )
4242
{
4343
if ( bandNo > mInput->bandCount() || bandNo <= 0 )
4444
{

src/core/raster/qgssinglebandpseudocolorrenderer.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ class CORE_EXPORT QgsSingleBandPseudoColorRenderer: public QgsRasterRenderer
5454
*/
5555
int band() const { return mBand; }
5656

57-
/** Sets the band used by the renderer.
58-
* @see band
59-
* @note added in QGIS 2.10
60-
*/
57+
/** Sets the band used by the renderer.
58+
* @see band
59+
* @note added in QGIS 2.10
60+
*/
6161
void setBand( int bandNo );
6262

6363
double classificationMin() const { return mClassificationMin; }

src/providers/grass/qgis.r.in.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ int main( int argc, char **argv )
7777
name = map->answer;
7878

7979
#ifdef Q_OS_WIN32
80-
_setmode(_fileno(stdin), _O_BINARY);
81-
_setmode(_fileno(stdout), _O_BINARY);
82-
setvbuf (stdin, NULL, _IONBF, BUFSIZ);
80+
_setmode( _fileno( stdin ), _O_BINARY );
81+
_setmode( _fileno( stdout ), _O_BINARY );
82+
setvbuf( stdin, NULL, _IONBF, BUFSIZ );
8383
// setting _IONBF on stdout works on windows correctly, data written immediately even without fflush(stdout)
84-
setvbuf (stdout, NULL, _IONBF, BUFSIZ);
84+
setvbuf( stdout, NULL, _IONBF, BUFSIZ );
8585
#endif
8686

8787
QFile stdinFile;
@@ -145,7 +145,7 @@ int main( int argc, char **argv )
145145
{
146146
break;
147147
}
148-
stdinStream >> byteArray;
148+
stdinStream >> byteArray;
149149

150150
if ( byteArray.size() != expectedSize )
151151
{
@@ -178,10 +178,10 @@ int main( int argc, char **argv )
178178
G_put_raster_row( cf, buf, grass_type );
179179

180180
#ifndef Q_OS_WIN
181-
// Because stdin is somewhere buffered on Windows (not clear if in QProcess or by Windows)
182-
// we cannot in QgsGrassImport wait for this because it hangs. Setting _IONBF on stdin does not help
183-
// and there is no flush() on QProcess.
184-
// OTOH, smaller stdin buffer is probably blocking QgsGrassImport so that the import can be canceled immediately.
181+
// Because stdin is somewhere buffered on Windows (not clear if in QProcess or by Windows)
182+
// we cannot in QgsGrassImport wait for this because it hangs. Setting _IONBF on stdin does not help
183+
// and there is no flush() on QProcess.
184+
// OTOH, smaller stdin buffer is probably blocking QgsGrassImport so that the import can be canceled immediately.
185185
stdoutStream << ( bool )true; // row written
186186
stdoutFile.flush();
187187
#endif

src/providers/grass/qgsgrassprovidermodule.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ QVector<QgsDataItem*> QgsGrassMapsetItem::createChildren()
122122
foreach ( QString name, vectorNames )
123123
{
124124
// Skip temporary import maps. If Vect_open_old during refresh fails due to missing topo, hist file remains open
125-
// and Windows do no allow to delete temporary map to qgis.v.in. In any case we dont want to show temporary import maps.
125+
// and Windows do no allow to delete temporary map to qgis.v.in. In any case we don't want to show temporary import maps.
126126
// TODO: add some auto cleaning mechanism to remove temporary maps left after import fail
127127
// keep excluded tmp name in sync with qgis.v.in
128128
QgsDebugMsg( "name = " + name );

0 commit comments

Comments
 (0)