fix warnings

qgis · Oct 12, 2012 · 21c5bd4 · 21c5bd4
1 parent 160b58f
commit 21c5bd4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/core/raster/qgsrasterblock.h b/src/core/raster/qgsrasterblock.h
@@ -214,26 +214,26 @@ class CORE_EXPORT QgsRasterBlock
     /** \brief Set color on position
      *  @param row row index
      *  @param column column index
-     *  @param index_or_rgb the color to be set, QRgb value
+     *  @param color the color to be set, QRgb value
      *  @return true on success */
     bool setColor( int row, int column, QRgb color );
 
     /** \brief Set color on index (indexed line by line)
      *  @param index data matrix index
-     *  @param index_or_rgb the color to be set, QRgb value
+     *  @param color the color to be set, QRgb value
      *  @return true on success */
     bool setColor( size_t index, QRgb color );
 
     /** \brief Get pointer to data
      *  @param row row index
      *  @param column column index
-     *  @retun pointer to data
+     *  @return pointer to data
      */
     char * bits( int row, int column );
 
     /** \brief Get pointer to data
      *  @param index data matrix index
-     *  @retun pointer to data
+     *  @return pointer to data
      */
     char * bits( size_t index );
 

diff --git a/src/core/raster/qgsrasteriterator.h b/src/core/raster/qgsrasteriterator.h
@@ -57,13 +57,11 @@ class CORE_EXPORT QgsRasterIterator
        @param bandNumber band to read
        @param nCols number of columns on output device
        @param nRows number of rows on output device
-       @param rasterData to return the pointer to raster data in
        @param topLeftCol top left column
        @param topLeftRow top left row
        @return false if the last part was already returned*/
     bool readNextRasterPart( int bandNumber,
                              int& nCols, int& nRows,
-                             //void** rasterData,
                              QgsRasterBlock **block,
                              int& topLeftCol, int& topLeftRow );
 

diff --git a/src/mapserver/qgssldparser.cpp b/src/mapserver/qgssldparser.cpp
@@ -142,6 +142,8 @@ int QgsSLDParser::numberOfLayers() const
 
 void QgsSLDParser::layersAndStylesCapabilities( QDomElement& parentElement, QDomDocument& doc, const QString& version, bool fullProjectSettings ) const
 {
+  Q_UNUSED( version );
+  Q_UNUSED( fullProjectSettings );
   //iterate over all <UserLayer> nodes
   if ( mXMLDoc )
   {