fix warnings

qgis · Jun 16, 2011 · 99b584e · 99b584e
1 parent 5a3a87f
commit 99b584e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/src/core/qgslogger.cpp b/src/core/qgslogger.cpp
@@ -200,7 +200,7 @@ const QString QgsLogger::logFile()
   return logFile;
 }
 
-const void QgsLogger::logMessageToFile( QString theMessage )
+void QgsLogger::logMessageToFile( QString theMessage )
 {
   if ( ! logFile().isEmpty() )
   {

diff --git a/src/core/qgslogger.h b/src/core/qgslogger.h
@@ -112,7 +112,7 @@ class CORE_EXPORT QgsLogger
     static int debugLevel();
 
     /** Logs the message passed in to the logfile defined in QGIS_LOG_FILE if any. **/
-    static const void logMessageToFile( QString theMessage );
+    static void logMessageToFile( QString theMessage );
 
   private:
     /**Reads the environment variable QGIS_LOG_FILE. Returns NULL if the variable is not set,

diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -35,6 +35,7 @@
 
 #include <cassert>
 #include <cstdlib> // size_t
+#include <limits> // std::numeric_limits
 
 #include <ogr_api.h>
 #include <ogr_srs_api.h>

diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -3081,8 +3081,10 @@ void QgsRasterLayer::updateProgress( int theProgress, int theMax )
   emit drawingProgress( theProgress, theMax );
 }
 
-void QgsRasterLayer::onProgress( int theType, double theProgress, QString theMesssage )
+void QgsRasterLayer::onProgress( int theType, double theProgress, QString theMessage )
 {
+  Q_UNUSED( theType );
+  Q_UNUSED( theMessage );
   QgsDebugMsg( QString( "theProgress = %1" ).arg( theProgress ) );
   emit progressUpdate(( int )theProgress );
 }
@@ -3099,6 +3101,7 @@ void QgsRasterLayer::onProgress( int theType, double theProgress, QString theMes
  */
 bool QgsRasterLayer::readSymbology( const QDomNode& layer_node, QString& errorMessage )
 {
+  Q_UNUSED( errorMessage );
   QDomNode mnl = layer_node.namedItem( "rasterproperties" );
   QDomNode snode = mnl.namedItem( "mDrawingStyle" );
   QDomElement myElement = snode.toElement();
@@ -4515,6 +4518,7 @@ void *QgsRasterLayer::readData( int bandNo, QgsRasterViewPort *viewPort )
  */
 bool QgsRasterLayer::readFile( QString const &theFilename )
 {
+  Q_UNUSED( theFilename );
   mValid = false;
   return true;
 } // QgsRasterLayer::readFile

diff --git a/src/core/raster/qgsrasterlayer.h b/src/core/raster/qgsrasterlayer.h
@@ -544,7 +544,7 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
     double minimumValue( QString theBand );
 
     /** \brief Get an 100x100 pixmap of the color palette. If the layer has no palette a white pixmap will be returned */
-    QPixmap paletteAsPixmap( int theBand = 1 );
+    QPixmap paletteAsPixmap( int theBandNumber = 1 );
 
     /**  \brief [ data provider interface ] Which provider is being used for this Raster Layer? */
     QString providerKey() const;

diff --git a/src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp b/src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp
@@ -57,7 +57,7 @@ void QgsZonalStatisticsDialog::insertAvailableLayers()
       QgsVectorLayer* vl = dynamic_cast<QgsVectorLayer*>( layer_it.value() );
       if(vl && vl->geometryType() == QGis::Polygon)
       {
-        mPolygonLayerComboBox->addItem( vl->name(), QVariant( vl->getLayerID() ) );
+        mPolygonLayerComboBox->addItem( vl->name(), QVariant( vl->id() ) );
       }
     }
   }