Skip to content

Commit

Permalink
Fix warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
mhugent committed Aug 24, 2015
1 parent f5e763a commit ed69f1c
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 2 deletions.
3 changes: 1 addition & 2 deletions src/app/qgsmaptooladdpart.cpp
Expand Up @@ -70,7 +70,7 @@ void QgsMapToolAddPart::canvasMapReleaseEvent( QgsMapMouseEvent * e )
return;
}

int errorCode;
int errorCode = 0;
switch ( mode() )
{
case CapturePoint:
Expand Down Expand Up @@ -142,7 +142,6 @@ void QgsMapToolAddPart::canvasMapReleaseEvent( QgsMapMouseEvent * e )
}

vlayer->beginEditCommand( tr( "Part added" ) );
int errorCode = 0;
if ( mode() == CapturePolygon )
{
//avoid intersections
Expand Down
1 change: 1 addition & 0 deletions src/core/geometry/qgsabstractgeometryv2.h
Expand Up @@ -217,6 +217,7 @@ class CORE_EXPORT QgsAbstractGeometryV2

/** Transforms the geometry using a coordinate transform
* @param ct coordinate transform
@param d transformation direction
*/
virtual void transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform ) = 0;

Expand Down
4 changes: 4 additions & 0 deletions src/core/geometry/qgscircularstringv2.h
Expand Up @@ -68,6 +68,10 @@ class CORE_EXPORT QgsCircularStringV2: public QgsCurveV2
virtual QgsLineStringV2* curveToLine() const override;

void draw( QPainter& p ) const override;
/** Transforms the geometry using a coordinate transform
* @param ct coordinate transform
@param d transformation direction
*/
void transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform ) override;
void transform( const QTransform& t ) override;
#if 0
Expand Down
4 changes: 4 additions & 0 deletions src/core/geometry/qgscompoundcurvev2.h
Expand Up @@ -81,6 +81,10 @@ class CORE_EXPORT QgsCompoundCurveV2: public QgsCurveV2
void addVertex( const QgsPointV2& pt );

void draw( QPainter& p ) const override;
/** Transforms the geometry using a coordinate transform
* @param ct coordinate transform
@param d transformation direction
*/
void transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform ) override;
void transform( const QTransform& t ) override;
void addToPainterPath( QPainterPath& path ) const override;
Expand Down
4 changes: 4 additions & 0 deletions src/core/geometry/qgscurvepolygonv2.h
Expand Up @@ -76,6 +76,10 @@ class CORE_EXPORT QgsCurvePolygonV2: public QgsSurfaceV2
bool removeInteriorRing( int nr );

virtual void draw( QPainter& p ) const override;
/** Transforms the geometry using a coordinate transform
* @param ct coordinate transform
@param d transformation direction
*/
void transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform ) override;
void transform( const QTransform& t ) override;

Expand Down
4 changes: 4 additions & 0 deletions src/core/geometry/qgsgeometrycollectionv2.h
Expand Up @@ -63,6 +63,10 @@ class CORE_EXPORT QgsGeometryCollectionV2: public QgsAbstractGeometryV2
*/
virtual bool removeGeometry( int nr );

/** Transforms the geometry using a coordinate transform
* @param ct coordinate transform
@param d transformation direction
*/
virtual void transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform ) override;
void transform( const QTransform& t ) override;
#if 0
Expand Down
5 changes: 5 additions & 0 deletions src/core/geometry/qgslinestringv2.h
Expand Up @@ -64,6 +64,11 @@ class CORE_EXPORT QgsLineStringV2: public QgsCurveV2
void append( const QgsLineStringV2* line );

void draw( QPainter& p ) const override;

/** Transforms the geometry using a coordinate transform
* @param ct coordinate transform
@param d transformation direction
*/
void transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform ) override;
void transform( const QTransform& t ) override;

Expand Down
5 changes: 5 additions & 0 deletions src/core/geometry/qgspointv2.h
Expand Up @@ -67,6 +67,11 @@ class CORE_EXPORT QgsPointV2: public QgsAbstractGeometryV2
virtual QgsRectangle calculateBoundingBox() const override { return QgsRectangle( mX, mY, mX, mY );}

void draw( QPainter& p ) const override;

/** Transforms the geometry using a coordinate transform
* @param ct coordinate transform
@param d transformation direction
*/
void transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform ) override;
void transform( const QTransform& t ) override;

Expand Down

0 comments on commit ed69f1c

Please sign in to comment.