Skip to content

Commit

Permalink
fix some warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Sep 30, 2015
1 parent 2126011 commit 928504a
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 4 deletions.
2 changes: 2 additions & 0 deletions src/core/auth/qgsauthmanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3049,6 +3049,7 @@ bool QgsAuthManager::reencryptAllAuthenticationSettings( const QString &prevpass
return true;
// end remove

#if 0
if ( isDisabled() )
return false;

Expand Down Expand Up @@ -3123,6 +3124,7 @@ bool QgsAuthManager::reencryptAllAuthenticationSettings( const QString &prevpass
}

return true;
#endif
}

bool QgsAuthManager::reencryptAllAuthenticationIdentities( const QString &prevpass, const QString &prevciv )
Expand Down
2 changes: 0 additions & 2 deletions src/core/geometry/qgsabstractgeometryv2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,6 @@ QgsPointV2 QgsAbstractGeometryV2::centroid() const
{
return QgsPointV2( Cx / ( 3. * A ), Cy / ( 3. * A ) );
}

return QgsPointV2();
}

bool QgsAbstractGeometryV2::isEmpty() const
Expand Down
1 change: 0 additions & 1 deletion src/core/geometry/qgsgeos.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1652,7 +1652,6 @@ QgsAbstractGeometryV2* QgsGeos::reshapeGeometry( const QgsLineStringV2& reshapeW
}
CATCH_GEOS_WITH_ERRMSG( 0 )
}
return 0;
}

GEOSGeometry* QgsGeos::reshapeLine( const GEOSGeometry* line, const GEOSGeometry* reshapeLineGeos )
Expand Down
1 change: 0 additions & 1 deletion src/core/qgsdistancearea.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,6 @@ double QgsDistanceArea::measure( const QgsAbstractGeometryV2* geomV2 ) const
return area;
}
}
return 0.0;
}

double QgsDistanceArea::measure( const QgsGeometry *geometry ) const
Expand Down

0 comments on commit 928504a

Please sign in to comment.