Skip to content

Commit

Permalink
Minor coverity fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Nov 22, 2015
1 parent 73ac9f9 commit 88beaae
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions src/analysis/interpolation/LinTriangleInterpolator.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ class ANALYSIS_EXPORT LinTriangleInterpolator : public TriangleInterpolator
};

inline LinTriangleInterpolator::LinTriangleInterpolator()
: mTIN( 0 )
{

}
Expand Down
4 changes: 2 additions & 2 deletions src/analysis/interpolation/ParametricLine.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ class ANALYSIS_EXPORT ParametricLine

//-----------------------------------------constructors and destructor----------------------

inline ParametricLine::ParametricLine() : mParent( 0 ), mControlPoly( 0 )
inline ParametricLine::ParametricLine() : mDegree( 0 ), mParent( 0 ), mControlPoly( 0 )
{

}

inline ParametricLine::ParametricLine( ParametricLine* par, QVector<Point3D*>* controlpoly ) : mParent( par ), mControlPoly( controlpoly )
inline ParametricLine::ParametricLine( ParametricLine* par, QVector<Point3D*>* controlpoly ) : mDegree( 0 ), mParent( par ), mControlPoly( controlpoly )
{

}
Expand Down
4 changes: 2 additions & 2 deletions src/core/symbology-ng/qgssymbolv2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -874,9 +874,9 @@ QRectF QgsMarkerSymbolV2::bounds( const QPointF& point, QgsRenderContext& contex
for ( QgsSymbolLayerV2List::const_iterator it = mLayers.constBegin(); it != mLayers.constEnd(); ++it )
{
if ( bound.isNull() )
bound = dynamic_cast< QgsMarkerSymbolLayerV2* >( *it )->bounds( point, symbolContext );
bound = static_cast< QgsMarkerSymbolLayerV2* >( *it )->bounds( point, symbolContext );
else
bound = bound.united( dynamic_cast< QgsMarkerSymbolLayerV2* >( *it )->bounds( point, symbolContext ) );
bound = bound.united( static_cast< QgsMarkerSymbolLayerV2* >( *it )->bounds( point, symbolContext ) );
}
return bound;
}
Expand Down
2 changes: 1 addition & 1 deletion src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ QgsVectorFieldSymbolLayer* QgsVectorFieldSymbolLayer::clone() const
{
clonedLayer->setSubSymbol( mLineSymbol->clone() );
}
return dynamic_cast< QgsVectorFieldSymbolLayer* >( clonedLayer );
return static_cast< QgsVectorFieldSymbolLayer* >( clonedLayer );
}

QgsStringMap QgsVectorFieldSymbolLayer::properties() const
Expand Down

0 comments on commit 88beaae

Please sign in to comment.