sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix warnings

Browse Source
This commit is contained in:
Juergen E. Fischer 2016-01-18 00:26:59 +01:00
parent 6435a20b33
commit 00d60dbca3
6 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/astyle.sh
View File

@ -14,7 +14,6 @@
# # # #
########################################################################### ###########################################################################
for ASTYLE in $(dirname $0)/qgisstyle $(dirname $0)/RelWithDebInfo/qgisstyle for ASTYLE in $(dirname $0)/qgisstyle $(dirname $0)/RelWithDebInfo/qgisstyle
do do
if type -p $ASTYLE >/dev/null; then if type -p $ASTYLE >/dev/null; then
@ -48,14 +47,15 @@ if ! type -p autopep8 >/dev/null; then
} }
fi fi
ASTYLEOPTS=$(dirname $0)/astyle.options
if type -p cygpath >/dev/null; then
ASTYLEOPTS="$(cygpath -w $ASTYLEOPTS)"
fi
set -e set -e
astyleit() astyleit() {
{ $ASTYLE --options="$ASTYLEOPTS" "$1"
$ASTYLE \
"--options=$(dirname $0)/astyle.options" \
"$1"
scripts/unify_includes.pl "$1" scripts/unify_includes.pl "$1"
} }

4
src/core/geometry/qgsinternalgeometryengine.cpp
View File

@ -54,8 +54,8 @@ QgsGeometry QgsInternalGeometryEngine::extrude( double x, double y )
linesToProcess << static_cast<QgsLineStringV2*>( curve->segmentize() ); linesToProcess << static_cast<QgsLineStringV2*>( curve->segmentize() );
} }
QgsMultiPolygonV2* multipolygon = linesToProcess.size() > 1 ? new QgsMultiPolygonV2() : nullptr; QgsMultiPolygonV2 *multipolygon = linesToProcess.size() > 1 ? new QgsMultiPolygonV2() : nullptr;
QgsPolygonV2* polygon; QgsPolygonV2 *polygon = nullptr;
if ( !linesToProcess.empty() ) if ( !linesToProcess.empty() )
{ {

3
src/core/pal/feature.cpp
View File

@ -324,7 +324,7 @@ int FeaturePart::createCandidatesAtOrderedPositionsOverPoint( double x, double y
double alpha = 0.0; double alpha = 0.0;
double deltaX = 0; double deltaX = 0;
double deltaY = 0; double deltaY = 0;
LabelPosition::Quadrant quadrant; LabelPosition::Quadrant quadrant = LabelPosition::QuadrantAboveLeft;
switch ( position ) switch ( position )
{ {
case QgsPalLayerSettings::TopLeft: case QgsPalLayerSettings::TopLeft:
@ -421,7 +421,6 @@ int FeaturePart::createCandidatesAtOrderedPositionsOverPoint( double x, double y
lPos << new LabelPosition( i, labelX, labelY, labelWidth, labelHeight, angle, cost, this, false, quadrant ); lPos << new LabelPosition( i, labelX, labelY, labelWidth, labelHeight, angle, cost, this, false, quadrant );
//TODO - tweak //TODO - tweak
cost += 0.001; cost += 0.001;

10
src/core/qgsexpression.cpp
View File

@ -2110,8 +2110,8 @@ static QVariant fcnAzimuth( const QVariantList& values, const QgsExpressionConte
return 0.0; return 0.0;
else if ( pt1->y() > pt2->y() ) else if ( pt1->y() > pt2->y() )
return M_PI; return M_PI;
else return 0; else
return 1; return 0;
} }
if ( pt1->y() == pt2->y() ) if ( pt1->y() == pt2->y() )
@ -2120,8 +2120,8 @@ static QVariant fcnAzimuth( const QVariantList& values, const QgsExpressionConte
return M_PI / 2; return M_PI / 2;
else if ( pt1->x() > pt2->x() ) else if ( pt1->x() > pt2->x() )
return M_PI + ( M_PI / 2 ); return M_PI + ( M_PI / 2 );
else return 0; else
return 1; return 0;
} }
if ( pt1->x() < pt2->x() ) if ( pt1->x() < pt2->x() )
@ -2150,8 +2150,6 @@ static QVariant fcnAzimuth( const QVariantList& values, const QgsExpressionConte
+ ( M_PI + ( M_PI / 2 ) ); + ( M_PI + ( M_PI / 2 ) );
} }
} }
return QVariant();
} }
static QVariant fcnExtrude( const QVariantList& values, const QgsExpressionContext*, QgsExpression* parent ) static QVariant fcnExtrude( const QVariantList& values, const QgsExpressionContext*, QgsExpression* parent )

2
src/core/symbology-ng/qgs25drenderer.cpp
View File

@ -84,7 +84,7 @@ Qgs25DRenderer::Qgs25DRenderer()
setShadowSpread( 4 ); setShadowSpread( 4 );
setShadowColor( QColor( "#1111111" ) ); setShadowColor( QColor( "#1111111" ) );
setHeight( 20 ); setHeight( "20" );
setAngle( 40 ); setAngle( 40 );
QgsFeatureRequest::OrderBy orderBy; QgsFeatureRequest::OrderBy orderBy;

2
src/providers/virtual/qgsvirtuallayerblob.h
View File

@ -35,7 +35,7 @@ struct SpatialiteBlobHeader
{ {
unsigned char start; unsigned char start;
unsigned char endianness; unsigned char endianness;
uint32_t srid; int32_t srid;
double mbrMinX; double mbrMinX;
double mbrMinY; double mbrMinY;
double mbrMaxX; double mbrMaxX;