Skip to content

Commit

Permalink
fix warnings
Browse files Browse the repository at this point in the history
(cherry picked from commit eefb046)
  • Loading branch information
jef-n committed Mar 23, 2016
1 parent c128a55 commit d10ec1d
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/core/composer/qgscomposermapgrid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1773,6 +1773,7 @@ int QgsComposerMapGrid::xGridLinesCRSTransform( const QgsRectangle& bbox, const
}
catch ( QgsCsException & cse )
{
Q_UNUSED( cse );
QgsDebugMsg( QString( "Caught CRS exception %1" ).arg( cse.what() ) );
}

Expand Down Expand Up @@ -1848,6 +1849,7 @@ int QgsComposerMapGrid::yGridLinesCRSTransform( const QgsRectangle& bbox, const
}
catch ( QgsCsException & cse )
{
Q_UNUSED( cse );
QgsDebugMsg( QString( "Caught CRS exception %1" ).arg( cse.what() ) );
}

Expand Down Expand Up @@ -2406,6 +2408,7 @@ int QgsComposerMapGrid::crsGridParams( QgsRectangle& crsRect, QgsCoordinateTrans
}
catch ( QgsCsException & cse )
{
Q_UNUSED( cse );
QgsDebugMsg( QString( "Caught CRS exception %1" ).arg( cse.what() ) );
return 1;
}
Expand Down
1 change: 1 addition & 0 deletions src/core/geometry/qgsgeometryfactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ QgsAbstractGeometryV2* QgsGeometryFactory::geomFromWkb( QgsConstWkbPtr wkbPtr )
}
catch ( const QgsWkbException &e )
{
Q_UNUSED( e );
QgsDebugMsg( "WKB exception: " + e.what() );
delete geom;
geom = nullptr;
Expand Down
1 change: 1 addition & 0 deletions src/core/qgsmaprenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,7 @@ void QgsMapRenderer::setDestinationCrs( const QgsCoordinateReferenceSystem& crs,
}
catch ( QgsCsException &e )
{
Q_UNUSED( e );
QgsDebugMsg( QString( "Transform error caught: %1" ).arg( e.what() ) );
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/core/qgsmaprenderercustompainterjob.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,12 @@ void QgsMapRendererCustomPainterJob::staticRender( QgsMapRendererCustomPainterJo
}
catch ( QgsException & e )
{
Q_UNUSED( e );
QgsDebugMsg( "Caught unhandled QgsException: " + e.what() );
}
catch ( std::exception & e )
{
Q_UNUSED( e );
QgsDebugMsg( "Caught unhandled std::exception: " + QString::fromAscii( e.what() ) );
}
catch ( ... )
Expand Down
4 changes: 4 additions & 0 deletions src/core/qgsmaprendererparalleljob.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,12 @@ void QgsMapRendererParallelJob::renderLayerStatic( LayerRenderJob& job )
}
catch ( QgsException & e )
{
Q_UNUSED( e );
QgsDebugMsg( "Caught unhandled QgsException: " + e.what() );
}
catch ( std::exception & e )
{
Q_UNUSED( e );
QgsDebugMsg( "Caught unhandled std::exception: " + QString::fromAscii( e.what() ) );
}
catch ( ... )
Expand All @@ -263,10 +265,12 @@ void QgsMapRendererParallelJob::renderLabelsStatic( QgsMapRendererParallelJob* s
}
catch ( QgsException & e )
{
Q_UNUSED( e );
QgsDebugMsg( "Caught unhandled QgsException: " + e.what() );
}
catch ( std::exception & e )
{
Q_UNUSED( e );
QgsDebugMsg( "Caught unhandled std::exception: " + QString::fromAscii( e.what() ) );
}
catch ( ... )
Expand Down
1 change: 1 addition & 0 deletions src/core/qgsmaptopixelgeometrysimplifier.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,7 @@ bool QgsMapToPixelSimplifier::simplifyGeometry( QgsGeometry *geometry, int simpl
}
catch ( const QgsWkbException &e )
{
Q_UNUSED( e );
QgsDebugMsg( QString( "Exception thrown by simplifier: %1" ) .arg( e.what() ) );
}
delete [] targetWkb;
Expand Down
3 changes: 3 additions & 0 deletions src/core/qgspointlocator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,7 @@ bool QgsPointLocator::rebuildIndex( int maxFeaturesToIndex )
}
catch ( const QgsException& e )
{
Q_UNUSED( e );
// See http://hub.qgis.org/issues/12634
QgsDebugMsg( QString( "could not transform bounding box to map, skipping the snap filter (%1)" ).arg( e.what() ) );
}
Expand All @@ -692,6 +693,7 @@ bool QgsPointLocator::rebuildIndex( int maxFeaturesToIndex )
}
catch ( const QgsException& e )
{
Q_UNUSED( e );
// See http://hub.qgis.org/issues/12634
QgsDebugMsg( QString( "could not transform geometry to map, skipping the snap for it (%1)" ).arg( e.what() ) );
continue;
Expand Down Expand Up @@ -770,6 +772,7 @@ void QgsPointLocator::onFeatureAdded( QgsFeatureId fid )
}
catch ( const QgsException& e )
{
Q_UNUSED( e );
// See http://hub.qgis.org/issues/12634
QgsDebugMsg( QString( "could not transform geometry to map, skipping the snap for it (%1)" ).arg( e.what() ) );
return;
Expand Down
1 change: 1 addition & 0 deletions src/gui/qgsmapcanvas.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,7 @@ void QgsMapCanvas::setDestinationCrs( const QgsCoordinateReferenceSystem &crs )
}
catch ( QgsCsException &e )
{
Q_UNUSED( e );
QgsDebugMsg( QString( "Transform error caught: %1" ).arg( e.what() ) );
}
}
Expand Down

0 comments on commit d10ec1d

Please sign in to comment.