mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-18 00:03:05 -04:00
indentation and spelling fixes
This commit is contained in:
parent
7e8041cd98
commit
3d978be35e
8
INSTALL
8
INSTALL
@ -1,10 +1,10 @@
|
|||||||
QGIS
|
QGIS
|
||||||
Building QGIS from source - step by step
|
Building QGIS from source - step by step
|
||||||
Monday June 22, 2015
|
Wednesday June 24, 2015
|
||||||
|
|
||||||
|
|
||||||
Last Updated: Monday June 22, 2015
|
Last Updated: Wednesday June 24, 2015
|
||||||
Last Change : Monday June 22, 2015
|
Last Change : Wednesday June 24, 2015
|
||||||
|
|
||||||
|
|
||||||
1. Introduction
|
1. Introduction
|
||||||
@ -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.
|
- 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
|
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.
|
LD_LIBRARY_PATH or PATH.
|
||||||
- for georeferencer - GSL >= 1.8
|
- for georeferencer - GSL >= 1.8
|
||||||
- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
|
- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
|
||||||
|
@ -77,13 +77,13 @@ label{ background-color: #FFFFCC;
|
|||||||
<DIV CLASS="header" ID="header">
|
<DIV CLASS="header" ID="header">
|
||||||
<H1>QGIS</H1>
|
<H1>QGIS</H1>
|
||||||
<H2>Building QGIS from source - step by step</H2>
|
<H2>Building QGIS from source - step by step</H2>
|
||||||
<H3>Monday June 22, 2015</H3>
|
<H3>Wednesday June 24, 2015</H3>
|
||||||
</DIV>
|
</DIV>
|
||||||
|
|
||||||
<DIV CLASS="body" ID="body">
|
<DIV CLASS="body" ID="body">
|
||||||
<P>
|
<P>
|
||||||
Last Updated: Monday June 22, 2015
|
Last Updated: Wednesday June 24, 2015
|
||||||
Last Change : Monday June 22, 2015
|
Last Change : Wednesday June 24, 2015
|
||||||
</P>
|
</P>
|
||||||
<DIV CLASS="toc">
|
<DIV CLASS="toc">
|
||||||
|
|
||||||
@ -221,7 +221,7 @@ Optional dependencies:
|
|||||||
<UL>
|
<UL>
|
||||||
<LI>for GRASS providers and plugin - GRASS >= 6.0.0. QGIS may be compiled with GRASS 6 or GRASS 7.
|
<LI>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
|
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.
|
LD_LIBRARY_PATH or PATH.
|
||||||
<LI>for georeferencer - GSL >= 1.8
|
<LI>for georeferencer - GSL >= 1.8
|
||||||
<LI>for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
|
<LI>for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
|
||||||
|
@ -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.
|
- 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
|
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.
|
LD_LIBRARY_PATH or PATH.
|
||||||
- for georeferencer - GSL >= 1.8
|
- for georeferencer - GSL >= 1.8
|
||||||
- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
|
- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
|
||||||
|
@ -17,6 +17,6 @@
|
|||||||
|
|
||||||
|
|
||||||
RE=$(echo $(cut -d: -f1 scripts/spelling.dat | sed -e 's/^/\\</; s/$/\\>|/;') | sed -e 's/| /|/g; s/|$//;')
|
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"
|
egrep --exclude-dir=.git --color=always "$RE" -ir . | egrep -iv "$EX"
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
# sorts includes in <...> before "..."
|
# sorts includes in <...> before "..."
|
||||||
# keep #include "ui_..." on top of list
|
# keep #include "ui_..." on top of list
|
||||||
# can skip includes if an order should be kept
|
# 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
|
SORTING=false
|
||||||
FILE1="sort_include_1.tmp"
|
FILE1="sort_include_1.tmp"
|
||||||
|
@ -57,7 +57,7 @@ class ANALYSIS_EXPORT QgsRasterCalculator
|
|||||||
* @param formulaString formula for raster calculation
|
* @param formulaString formula for raster calculation
|
||||||
* @param outputFile output file path
|
* @param outputFile output file path
|
||||||
* @param outputFormat output file format
|
* @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 outputCrs destination CRS for output raster
|
||||||
* @param nOutputColumns number of columns in output raster
|
* @param nOutputColumns number of columns in output raster
|
||||||
* @param nOutputRows number of rows in output raster
|
* @param nOutputRows number of rows in output raster
|
||||||
|
@ -50,7 +50,7 @@ class QgsBrowserPropertiesWidget : public QWidget
|
|||||||
virtual void setItem( QgsDataItem* item ) = 0;
|
virtual void setItem( QgsDataItem* item ) = 0;
|
||||||
|
|
||||||
/** Sets whether the properties widget should display in condensed mode, ie, for display in a dock
|
/** 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
|
* @param condensedMode set to true to enable condensed mode
|
||||||
* @note added in QGIS 2.10
|
* @note added in QGIS 2.10
|
||||||
*/
|
*/
|
||||||
|
@ -325,7 +325,7 @@ class CORE_EXPORT QgsAbstractGeometryV2
|
|||||||
/** Reads a WKB header and tests its validity.
|
/** Reads a WKB header and tests its validity.
|
||||||
* @param wkbPtr
|
* @param wkbPtr
|
||||||
* @param wkbType destination for WKB type from header
|
* @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
|
* @param expectedType expected WKB type
|
||||||
* @returns true if header is valid and matches expected type
|
* @returns true if header is valid and matches expected type
|
||||||
*/
|
*/
|
||||||
|
@ -62,7 +62,7 @@ class CORE_EXPORT QgsCurveV2: public QgsAbstractGeometryV2
|
|||||||
*/
|
*/
|
||||||
virtual void addToPainterPath( QPainterPath& path ) const = 0;
|
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
|
* @param p destination QPainter
|
||||||
*/
|
*/
|
||||||
virtual void drawAsPolygon( QPainter& p ) const = 0;
|
virtual void drawAsPolygon( QPainter& p ) const = 0;
|
||||||
|
@ -60,7 +60,7 @@ class CORE_EXPORT QgsAnimatedIcon : public QObject
|
|||||||
void onFrameChanged();
|
void onFrameChanged();
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
/** Emited when icon changed */
|
/** Emitted when icon changed */
|
||||||
void frameChanged();
|
void frameChanged();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -38,7 +38,7 @@ QgsSingleBandPseudoColorRenderer::~QgsSingleBandPseudoColorRenderer()
|
|||||||
delete mShader;
|
delete mShader;
|
||||||
}
|
}
|
||||||
|
|
||||||
void QgsSingleBandPseudoColorRenderer::setBand(int bandNo)
|
void QgsSingleBandPseudoColorRenderer::setBand( int bandNo )
|
||||||
{
|
{
|
||||||
if ( bandNo > mInput->bandCount() || bandNo <= 0 )
|
if ( bandNo > mInput->bandCount() || bandNo <= 0 )
|
||||||
{
|
{
|
||||||
|
@ -54,10 +54,10 @@ class CORE_EXPORT QgsSingleBandPseudoColorRenderer: public QgsRasterRenderer
|
|||||||
*/
|
*/
|
||||||
int band() const { return mBand; }
|
int band() const { return mBand; }
|
||||||
|
|
||||||
/** Sets the band used by the renderer.
|
/** Sets the band used by the renderer.
|
||||||
* @see band
|
* @see band
|
||||||
* @note added in QGIS 2.10
|
* @note added in QGIS 2.10
|
||||||
*/
|
*/
|
||||||
void setBand( int bandNo );
|
void setBand( int bandNo );
|
||||||
|
|
||||||
double classificationMin() const { return mClassificationMin; }
|
double classificationMin() const { return mClassificationMin; }
|
||||||
|
@ -77,11 +77,11 @@ int main( int argc, char **argv )
|
|||||||
name = map->answer;
|
name = map->answer;
|
||||||
|
|
||||||
#ifdef Q_OS_WIN32
|
#ifdef Q_OS_WIN32
|
||||||
_setmode(_fileno(stdin), _O_BINARY);
|
_setmode( _fileno( stdin ), _O_BINARY );
|
||||||
_setmode(_fileno(stdout), _O_BINARY);
|
_setmode( _fileno( stdout ), _O_BINARY );
|
||||||
setvbuf (stdin, NULL, _IONBF, BUFSIZ);
|
setvbuf( stdin, NULL, _IONBF, BUFSIZ );
|
||||||
// setting _IONBF on stdout works on windows correctly, data written immediately even without fflush(stdout)
|
// 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
|
#endif
|
||||||
|
|
||||||
QFile stdinFile;
|
QFile stdinFile;
|
||||||
@ -145,7 +145,7 @@ int main( int argc, char **argv )
|
|||||||
{
|
{
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
stdinStream >> byteArray;
|
stdinStream >> byteArray;
|
||||||
|
|
||||||
if ( byteArray.size() != expectedSize )
|
if ( byteArray.size() != expectedSize )
|
||||||
{
|
{
|
||||||
@ -178,10 +178,10 @@ int main( int argc, char **argv )
|
|||||||
G_put_raster_row( cf, buf, grass_type );
|
G_put_raster_row( cf, buf, grass_type );
|
||||||
|
|
||||||
#ifndef Q_OS_WIN
|
#ifndef Q_OS_WIN
|
||||||
// Because stdin is somewhere buffered on Windows (not clear if in QProcess or by Windows)
|
// 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
|
// we cannot in QgsGrassImport wait for this because it hangs. Setting _IONBF on stdin does not help
|
||||||
// and there is no flush() on QProcess.
|
// and there is no flush() on QProcess.
|
||||||
// OTOH, smaller stdin buffer is probably blocking QgsGrassImport so that the import can be canceled immediately.
|
// OTOH, smaller stdin buffer is probably blocking QgsGrassImport so that the import can be canceled immediately.
|
||||||
stdoutStream << ( bool )true; // row written
|
stdoutStream << ( bool )true; // row written
|
||||||
stdoutFile.flush();
|
stdoutFile.flush();
|
||||||
#endif
|
#endif
|
||||||
|
@ -122,7 +122,7 @@ QVector<QgsDataItem*> QgsGrassMapsetItem::createChildren()
|
|||||||
foreach ( QString name, vectorNames )
|
foreach ( QString name, vectorNames )
|
||||||
{
|
{
|
||||||
// Skip temporary import maps. If Vect_open_old during refresh fails due to missing topo, hist file remains open
|
// 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
|
// TODO: add some auto cleaning mechanism to remove temporary maps left after import fail
|
||||||
// keep excluded tmp name in sync with qgis.v.in
|
// keep excluded tmp name in sync with qgis.v.in
|
||||||
QgsDebugMsg( "name = " + name );
|
QgsDebugMsg( "name = " + name );
|
||||||
|
Loading…
x
Reference in New Issue
Block a user