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 Jun 24, 2015
1 parent 7e8041c commit 3d978be
Show file tree
Hide file tree
Showing 14 changed files with 31 additions and 31 deletions.
8 changes: 4 additions & 4 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
QGIS
Building QGIS from source - step by step
Monday June 22, 2015
Wednesday June 24, 2015


Last Updated: Monday June 22, 2015
Last Change : Monday June 22, 2015
Last Updated: Wednesday June 24, 2015
Last Change : Wednesday June 24, 2015


1. Introduction
Expand Down Expand Up @@ -110,7 +110,7 @@ Optional dependencies:

- for GRASS providers and plugin - GRASS >= 6.0.0. QGIS may be compiled with GRASS 6 or GRASS 7.
It can also be compiled with both GRASS versions in a single build but only if QGIS
is not installed with rpath. The desired GRASS version is choosen on runtime by setting
is not installed with rpath. The desired GRASS version is chosen on runtime by setting
LD_LIBRARY_PATH or PATH.
- for georeferencer - GSL >= 1.8
- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
Expand Down
8 changes: 4 additions & 4 deletions doc/INSTALL.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@
<DIV CLASS="header" ID="header">
<H1>QGIS</H1>
<H2>Building QGIS from source - step by step</H2>
<H3>Monday June 22, 2015</H3>
<H3>Wednesday June 24, 2015</H3>
</DIV>

<DIV CLASS="body" ID="body">
<P>
Last Updated: Monday June 22, 2015
Last Change : Monday June 22, 2015
Last Updated: Wednesday June 24, 2015
Last Change : Wednesday June 24, 2015
</P>
<DIV CLASS="toc">

Expand Down Expand Up @@ -221,7 +221,7 @@ <H1>2. Overview</H1>
<UL>
<LI>for GRASS providers and plugin - GRASS &gt;= 6.0.0. QGIS may be compiled with GRASS 6 or GRASS 7.
It can also be compiled with both GRASS versions in a single build but only if QGIS
is not installed with rpath. The desired GRASS version is choosen on runtime by setting
is not installed with rpath. The desired GRASS version is chosen on runtime by setting
LD_LIBRARY_PATH or PATH.
<LI>for georeferencer - GSL &gt;= 1.8
<LI>for postgis support and SPIT plugin - PostgreSQL &gt;= 8.0.x
Expand Down
2 changes: 1 addition & 1 deletion doc/overview.t2t
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Optional dependencies:

- for GRASS providers and plugin - GRASS >= 6.0.0. QGIS may be compiled with GRASS 6 or GRASS 7.
It can also be compiled with both GRASS versions in a single build but only if QGIS
is not installed with rpath. The desired GRASS version is choosen on runtime by setting
is not installed with rpath. The desired GRASS version is chosen on runtime by setting
LD_LIBRARY_PATH or PATH.
- for georeferencer - GSL >= 1.8
- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
Expand Down
2 changes: 1 addition & 1 deletion scripts/chkspelling.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@


RE=$(echo $(cut -d: -f1 scripts/spelling.dat | sed -e 's/^/\\</; s/$/\\>|/;') | sed -e 's/| /|/g; s/|$//;')
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"
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"

egrep --exclude-dir=.git --color=always "$RE" -ir . | egrep -iv "$EX"
2 changes: 1 addition & 1 deletion scripts/sort_include.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# sorts includes in <...> before "..."
# keep #include "ui_..." on top of list
# can skip includes if an order should be kept
# can exlcude directories (hard-copies of external libraries)
# can exclude directories (hard-copies of external libraries)

SORTING=false
FILE1="sort_include_1.tmp"
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/raster/qgsrastercalculator.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class ANALYSIS_EXPORT QgsRasterCalculator
* @param formulaString formula for raster calculation
* @param outputFile output file path
* @param outputFormat output file format
* @param outputExtent output extent, CRS is specifed by outputCrs parameter
* @param outputExtent output extent, CRS is specified by outputCrs parameter
* @param outputCrs destination CRS for output raster
* @param nOutputColumns number of columns in output raster
* @param nOutputRows number of rows in output raster
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsbrowserdockwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class QgsBrowserPropertiesWidget : public QWidget
virtual void setItem( QgsDataItem* item ) = 0;

/** Sets whether the properties widget should display in condensed mode, ie, for display in a dock
* widget rather than it's own seperate dialog.
* widget rather than it's own separate dialog.
* @param condensedMode set to true to enable condensed mode
* @note added in QGIS 2.10
*/
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 @@ -325,7 +325,7 @@ class CORE_EXPORT QgsAbstractGeometryV2
/** Reads a WKB header and tests its validity.
* @param wkbPtr
* @param wkbType destination for WKB type from header
* @param endianSwap will be set to true if endian from WKB must be swapped to match QGIS platform endianess
* @param endianSwap will be set to true if endian from WKB must be swapped to match QGIS platform endianness
* @param expectedType expected WKB type
* @returns true if header is valid and matches expected type
*/
Expand Down
2 changes: 1 addition & 1 deletion src/core/geometry/qgscurvev2.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class CORE_EXPORT QgsCurveV2: public QgsAbstractGeometryV2
*/
virtual void addToPainterPath( QPainterPath& path ) const = 0;

/** Draws the curve as a polygon on the specifed QPainter.
/** Draws the curve as a polygon on the specified QPainter.
* @param p destination QPainter
*/
virtual void drawAsPolygon( QPainter& p ) const = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsdataitem.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class CORE_EXPORT QgsAnimatedIcon : public QObject
void onFrameChanged();

signals:
/** Emited when icon changed */
/** Emitted when icon changed */
void frameChanged();

private:
Expand Down
2 changes: 1 addition & 1 deletion src/core/raster/qgssinglebandpseudocolorrenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ QgsSingleBandPseudoColorRenderer::~QgsSingleBandPseudoColorRenderer()
delete mShader;
}

void QgsSingleBandPseudoColorRenderer::setBand(int bandNo)
void QgsSingleBandPseudoColorRenderer::setBand( int bandNo )
{
if ( bandNo > mInput->bandCount() || bandNo <= 0 )
{
Expand Down
8 changes: 4 additions & 4 deletions src/core/raster/qgssinglebandpseudocolorrenderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ class CORE_EXPORT QgsSingleBandPseudoColorRenderer: public QgsRasterRenderer
*/
int band() const { return mBand; }

/** Sets the band used by the renderer.
* @see band
* @note added in QGIS 2.10
*/
/** Sets the band used by the renderer.
* @see band
* @note added in QGIS 2.10
*/
void setBand( int bandNo );

double classificationMin() const { return mClassificationMin; }
Expand Down
18 changes: 9 additions & 9 deletions src/providers/grass/qgis.r.in.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ int main( int argc, char **argv )
name = map->answer;

#ifdef Q_OS_WIN32
_setmode(_fileno(stdin), _O_BINARY);
_setmode(_fileno(stdout), _O_BINARY);
setvbuf (stdin, NULL, _IONBF, BUFSIZ);
_setmode( _fileno( stdin ), _O_BINARY );
_setmode( _fileno( stdout ), _O_BINARY );
setvbuf( stdin, NULL, _IONBF, BUFSIZ );
// setting _IONBF on stdout works on windows correctly, data written immediately even without fflush(stdout)
setvbuf (stdout, NULL, _IONBF, BUFSIZ);
setvbuf( stdout, NULL, _IONBF, BUFSIZ );
#endif

QFile stdinFile;
Expand Down Expand Up @@ -145,7 +145,7 @@ int main( int argc, char **argv )
{
break;
}
stdinStream >> byteArray;
stdinStream >> byteArray;

if ( byteArray.size() != expectedSize )
{
Expand Down Expand Up @@ -178,10 +178,10 @@ int main( int argc, char **argv )
G_put_raster_row( cf, buf, grass_type );

#ifndef Q_OS_WIN
// Because stdin is somewhere buffered on Windows (not clear if in QProcess or by Windows)
// we cannot in QgsGrassImport wait for this because it hangs. Setting _IONBF on stdin does not help
// and there is no flush() on QProcess.
// OTOH, smaller stdin buffer is probably blocking QgsGrassImport so that the import can be canceled immediately.
// Because stdin is somewhere buffered on Windows (not clear if in QProcess or by Windows)
// we cannot in QgsGrassImport wait for this because it hangs. Setting _IONBF on stdin does not help
// and there is no flush() on QProcess.
// OTOH, smaller stdin buffer is probably blocking QgsGrassImport so that the import can be canceled immediately.
stdoutStream << ( bool )true; // row written
stdoutFile.flush();
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/providers/grass/qgsgrassprovidermodule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ QVector<QgsDataItem*> QgsGrassMapsetItem::createChildren()
foreach ( QString name, vectorNames )
{
// Skip temporary import maps. If Vect_open_old during refresh fails due to missing topo, hist file remains open
// and Windows do no allow to delete temporary map to qgis.v.in. In any case we dont want to show temporary import maps.
// 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.
// TODO: add some auto cleaning mechanism to remove temporary maps left after import fail
// keep excluded tmp name in sync with qgis.v.in
QgsDebugMsg( "name = " + name );
Expand Down

0 comments on commit 3d978be

Please sign in to comment.