From 767439cfc26eea2633b013604241c79448756c13 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Sat, 31 Mar 2012 23:50:46 +0200 Subject: [PATCH] fix warnings --- src/analysis/vector/qgsgeometryanalyzer.h | 6 ++++-- src/core/qgscoordinatereferencesystem.cpp | 1 + src/core/qgssearchstringparser.yy | 1 + src/plugins/grass/qtermwidget/Screen.cpp | 1 + src/plugins/heatmap/heatmapgui.cpp | 1 + 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/analysis/vector/qgsgeometryanalyzer.h b/src/analysis/vector/qgsgeometryanalyzer.h index d917fc4b6e3..5d33f4f00d2 100644 --- a/src/analysis/vector/qgsgeometryanalyzer.h +++ b/src/analysis/vector/qgsgeometryanalyzer.h @@ -111,6 +111,8 @@ class ANALYSIS_EXPORT QgsGeometryAnalyzer @param unlocatedFeatureIds out: ids of event features where linear referencing was not successful @param locationField1 attribute index of location field in event layer @param locationField2 attribute index of location end field (or -1 for point layer) + @param offsetField attribute index for offset field + @param offsetScale factor to scale offset @param forceSingleGeometry force layer to single point/line type. Feature attributes are copied in case of multiple matches @param memoryProvider memory provider to write output to (can be 0 if output is written to a file) @param p progress dialog or 0 if no progress dialog should be shown @@ -146,8 +148,8 @@ class ANALYSIS_EXPORT QgsGeometryAnalyzer bool forceSingleType = false ); /**Create geometry offset relative to line geometry. @param geom the geometry to modify - @param the line geometry to wich the feature is referenced - @param offset the offset value in layer unit. Negativ value means offset towards left, positive value is offset to the right side*/ + @param lineGeom the line geometry to which the feature is referenced + @param offset the offset value in layer unit. Negative values mean offset towards left, positive values offset to the right side*/ void createOffsetGeometry( QgsGeometry* geom, QgsGeometry* lineGeom, double offset ); QgsPoint createPointOffset( double x, double y, double dist, QgsGeometry* lineGeom ) const; unsigned char* locateBetweenWkbString( unsigned char* ptr, QgsMultiPolyline& result, double fromMeasure, double toMeasure ); diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp index 65e97deea95..66e51252317 100644 --- a/src/core/qgscoordinatereferencesystem.cpp +++ b/src/core/qgscoordinatereferencesystem.cpp @@ -303,6 +303,7 @@ bool QgsCoordinateReferenceSystem::axisInverted() const ? ( orientation == OAO_East || orientation == OAO_West || orientation == OAO_Other ) : ( orientation == OAO_North || orientation == OAO_South ); QgsDebugMsg( QString( "srid:%1 axis0:%2 orientation:%3 inverted:%4" ).arg( mSRID ).arg( axis0 ).arg( OSRAxisEnumToName( orientation ) ).arg( mAxisInverted ) ); + Q_UNUSED( axis0 ); } return mAxisInverted != 0; diff --git a/src/core/qgssearchstringparser.yy b/src/core/qgssearchstringparser.yy index ddaaa8dad21..ac28076b38a 100644 --- a/src/core/qgssearchstringparser.yy +++ b/src/core/qgssearchstringparser.yy @@ -215,6 +215,7 @@ void addToTmpNodes(QgsSearchTreeNode* node) void joinTmpNodes(QgsSearchTreeNode* parent, QgsSearchTreeNode* left, QgsSearchTreeNode* right) { bool res; + Q_UNUSED(res); if (left) { diff --git a/src/plugins/grass/qtermwidget/Screen.cpp b/src/plugins/grass/qtermwidget/Screen.cpp index 1e45b489c50..8402db39d96 100644 --- a/src/plugins/grass/qtermwidget/Screen.cpp +++ b/src/plugins/grass/qtermwidget/Screen.cpp @@ -566,6 +566,7 @@ void Screen::copyFromScreen( Character* dest , int startLine , int count ) const void Screen::getImage( Character* dest, int size, int startLine, int endLine ) const { + Q_UNUSED( size ); Q_ASSERT( startLine >= 0 ); Q_ASSERT( endLine >= startLine && endLine < hist->getLines() + lines ); diff --git a/src/plugins/heatmap/heatmapgui.cpp b/src/plugins/heatmap/heatmapgui.cpp index 3fea4c998bd..845d0d6c7eb 100644 --- a/src/plugins/heatmap/heatmapgui.cpp +++ b/src/plugins/heatmap/heatmapgui.cpp @@ -216,6 +216,7 @@ void HeatmapGui::on_mInputVectorCombo_currentIndexChanged( int index ) void HeatmapGui::on_radiusFieldCombo_currentIndexChanged( int index ) { + Q_UNUSED( index ); updateBBox(); QgsDebugMsg( QString( "Radius Field index changed to %1" ).arg( index ) ); }