Skip to content

Commit 99b584e

Browse files
committed
fix warnings
1 parent 5a3a87f commit 99b584e

6 files changed

Lines changed: 10 additions & 5 deletions

File tree

src/core/qgslogger.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ const QString QgsLogger::logFile()
200200
return logFile;
201201
}
202202

203-
const void QgsLogger::logMessageToFile( QString theMessage )
203+
void QgsLogger::logMessageToFile( QString theMessage )
204204
{
205205
if ( ! logFile().isEmpty() )
206206
{

src/core/qgslogger.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class CORE_EXPORT QgsLogger
112112
static int debugLevel();
113113

114114
/** Logs the message passed in to the logfile defined in QGIS_LOG_FILE if any. **/
115-
static const void logMessageToFile( QString theMessage );
115+
static void logMessageToFile( QString theMessage );
116116

117117
private:
118118
/**Reads the environment variable QGIS_LOG_FILE. Returns NULL if the variable is not set,

src/core/qgsvectorfilewriter.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535

3636
#include <cassert>
3737
#include <cstdlib> // size_t
38+
#include <limits> // std::numeric_limits
3839

3940
#include <ogr_api.h>
4041
#include <ogr_srs_api.h>

src/core/raster/qgsrasterlayer.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3081,8 +3081,10 @@ void QgsRasterLayer::updateProgress( int theProgress, int theMax )
30813081
emit drawingProgress( theProgress, theMax );
30823082
}
30833083

3084-
void QgsRasterLayer::onProgress( int theType, double theProgress, QString theMesssage )
3084+
void QgsRasterLayer::onProgress( int theType, double theProgress, QString theMessage )
30853085
{
3086+
Q_UNUSED( theType );
3087+
Q_UNUSED( theMessage );
30863088
QgsDebugMsg( QString( "theProgress = %1" ).arg( theProgress ) );
30873089
emit progressUpdate(( int )theProgress );
30883090
}
@@ -3099,6 +3101,7 @@ void QgsRasterLayer::onProgress( int theType, double theProgress, QString theMes
30993101
*/
31003102
bool QgsRasterLayer::readSymbology( const QDomNode& layer_node, QString& errorMessage )
31013103
{
3104+
Q_UNUSED( errorMessage );
31023105
QDomNode mnl = layer_node.namedItem( "rasterproperties" );
31033106
QDomNode snode = mnl.namedItem( "mDrawingStyle" );
31043107
QDomElement myElement = snode.toElement();
@@ -4515,6 +4518,7 @@ void *QgsRasterLayer::readData( int bandNo, QgsRasterViewPort *viewPort )
45154518
*/
45164519
bool QgsRasterLayer::readFile( QString const &theFilename )
45174520
{
4521+
Q_UNUSED( theFilename );
45184522
mValid = false;
45194523
return true;
45204524
} // QgsRasterLayer::readFile

src/core/raster/qgsrasterlayer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
544544
double minimumValue( QString theBand );
545545

546546
/** \brief Get an 100x100 pixmap of the color palette. If the layer has no palette a white pixmap will be returned */
547-
QPixmap paletteAsPixmap( int theBand = 1 );
547+
QPixmap paletteAsPixmap( int theBandNumber = 1 );
548548

549549
/** \brief [ data provider interface ] Which provider is being used for this Raster Layer? */
550550
QString providerKey() const;

src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void QgsZonalStatisticsDialog::insertAvailableLayers()
5757
QgsVectorLayer* vl = dynamic_cast<QgsVectorLayer*>( layer_it.value() );
5858
if(vl && vl->geometryType() == QGis::Polygon)
5959
{
60-
mPolygonLayerComboBox->addItem( vl->name(), QVariant( vl->getLayerID() ) );
60+
mPolygonLayerComboBox->addItem( vl->name(), QVariant( vl->id() ) );
6161
}
6262
}
6363
}

0 commit comments

Comments
 (0)