diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp index a567fd378380..706a7cb88ba9 100644 --- a/src/app/qgsrasterlayerproperties.cpp +++ b/src/app/qgsrasterlayerproperties.cpp @@ -1388,6 +1388,8 @@ void QgsRasterLayerProperties::pixelSelected( const QgsPoint& canvasPoint ) } } } +#else + Q_UNUSED( canvasPoint ); #endif //0 } diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp index 63fa3bb5a47f..e25a4dd0b987 100644 --- a/src/core/raster/qgsrasterlayer.cpp +++ b/src/core/raster/qgsrasterlayer.cpp @@ -1068,7 +1068,7 @@ QPixmap QgsRasterLayer::legendAsPixmap() * @param theWithNameFlag - boolena flag whether to overlay the legend name in the text * @return a pixmap representing a legend image */ -QPixmap QgsRasterLayer::legendAsPixmap( bool theWithNameFlag ) +QPixmap QgsRasterLayer::legendAsPixmap( bool ) { return QPixmap(); } //end of legendAsPixmap function @@ -1077,7 +1077,7 @@ QPixmap QgsRasterLayer::legendAsPixmap( bool theWithNameFlag ) * \param theLabelCount number of vertical labels to display * @return a pixmap representing a legend image */ -QPixmap QgsRasterLayer::legendAsPixmap( int theLabelCount ) +QPixmap QgsRasterLayer::legendAsPixmap( int ) { return QPixmap(); }//end of getDetailedLegend @@ -1778,12 +1778,12 @@ void QgsRasterLayer::closeDataProvider() mPyramidList.clear(); } -void QgsRasterLayer::setColorShadingAlgorithm( ColorShadingAlgorithm theShadingAlgorithm ) +void QgsRasterLayer::setColorShadingAlgorithm( ColorShadingAlgorithm ) { //legacy method } -void QgsRasterLayer::setColorShadingAlgorithm( QString theShaderAlgorithm ) +void QgsRasterLayer::setColorShadingAlgorithm( QString ) { //legacy method } @@ -1957,12 +1957,12 @@ void QgsRasterLayer::setDrawingStyle( QString const & theDrawingStyleQString ) } } -void QgsRasterLayer::setGrayBandName( QString const & theBandName ) +void QgsRasterLayer::setGrayBandName( QString const & ) { //legacy method } -void QgsRasterLayer::setGreenBandName( QString const & theBandName ) +void QgsRasterLayer::setGreenBandName( QString const & ) { //legacy method } @@ -2006,12 +2006,12 @@ void QgsRasterLayer::setMinimumMaximumUsingDataset() //legacy method } -void QgsRasterLayer::setMinimumValue( unsigned int theBand, double theValue, bool theGenerateLookupTableFlag ) +void QgsRasterLayer::setMinimumValue( unsigned int, double, bool ) { //legacy method } -void QgsRasterLayer::setMinimumValue( QString theBand, double theValue, bool theGenerateLookupTableFlag ) +void QgsRasterLayer::setMinimumValue( QString, double, bool ) { //legacy method } @@ -2032,12 +2032,12 @@ void QgsRasterLayer::setNoDataValue( double theNoDataValue ) } } -void QgsRasterLayer::setRasterShaderFunction( QgsRasterShaderFunction* theFunction ) +void QgsRasterLayer::setRasterShaderFunction( QgsRasterShaderFunction* ) { //legacy method } -void QgsRasterLayer::setRedBandName( QString const & theBandName ) +void QgsRasterLayer::setRedBandName( QString const & ) { //legacy method } @@ -2053,7 +2053,7 @@ void QgsRasterLayer::setSubLayerVisibility( QString name, bool vis ) } -void QgsRasterLayer::setTransparentBandName( QString const & theBandName ) +void QgsRasterLayer::setTransparentBandName( QString const & ) { //legacy method } diff --git a/src/core/raster/qgsrasterlayer.h b/src/core/raster/qgsrasterlayer.h index 932a0583b8c9..ddf50ad45b1c 100644 --- a/src/core/raster/qgsrasterlayer.h +++ b/src/core/raster/qgsrasterlayer.h @@ -482,10 +482,10 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer QPixmap legendAsPixmap(); /** \brief Overloaded version of above function that can print layer name onto legend */ - QPixmap legendAsPixmap( bool ); + Q_DECL_DEPRECATED QPixmap legendAsPixmap( bool ); /** \brief Use this method when you want an annotated legend suitable for print output etc */ - QPixmap legendAsPixmap( int theLabelCount ); + Q_DECL_DEPRECATED QPixmap legendAsPixmap( int theLabelCount ); /** \brief Accessor for maximum value user for contrast enhancement */ double maximumValue( unsigned int theBand ); @@ -534,7 +534,7 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer void setColorShadingAlgorithm( QgsRasterLayer::ColorShadingAlgorithm theShaderAlgorithm ); /** \brief Mutator for color shader algorithm */ - void setColorShadingAlgorithm( QString theShaderAlgorithm ); + Q_DECL_DEPRECATED void setColorShadingAlgorithm( QString theShaderAlgorithm ); /** \brief Mutator for contrast enhancement algorithm */ void setContrastEnhancementAlgorithm( QgsContrastEnhancement::ContrastEnhancementAlgorithm theAlgorithm, @@ -550,16 +550,16 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer void setDrawingStyle( const QString & theDrawingStyleQString ); /** \brief Mutator for gray band name mapping */ - void setGrayBandName( const QString & theBandName ); + Q_DECL_DEPRECATED void setGrayBandName( const QString & theBandName ); /** \brief Mutator for green band name mapping */ - void setGreenBandName( const QString & theBandName ); + Q_DECL_DEPRECATED void setGreenBandName( const QString & theBandName ); /** \brief Mutator for setting the maximum value for contrast enhancement */ void setMaximumValue( unsigned int theBand, double theValue, bool theGenerateLookupTableFlag = true ); /** \brief Mutator for setting the maximum value for contrast enhancement */ - void setMaximumValue( QString theBand, double theValue, bool theGenerateLookupTableFlag = true ); + Q_DECL_DEPRECATED void setMaximumValue( QString theBand, double theValue, bool theGenerateLookupTableFlag = true ); /** \brief Sets the minimum and maximum values for the band(s) currently * being displayed using the only pixel values from the last/current extent @@ -571,23 +571,23 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer void setMinimumMaximumUsingDataset(); /** \brief Mutator for setting the minimum value for contrast enhancement */ - void setMinimumValue( unsigned int theBand, double theValue, bool theGenerateLookupTableFlag = true ); + Q_DECL_DEPRECATED void setMinimumValue( unsigned int theBand, double theValue, bool theGenerateLookupTableFlag = true ); /** \brief Mutator for setting the minimum value for contrast enhancement */ - void setMinimumValue( QString theBand, double theValue, bool theGenerateLookupTableFlag = true ); + Q_DECL_DEPRECATED void setMinimumValue( QString theBand, double theValue, bool theGenerateLookupTableFlag = true ); /** \brief Mutator that allows the NO_DATA entry for this raster to be overridden */ void setNoDataValue( double theNoData ); /** \brief Set the raster shader function to a user defined function \note ownership of the shader function is transfered to raster shader */ - void setRasterShaderFunction( QgsRasterShaderFunction* theFunction ); + Q_DECL_DEPRECATED void setRasterShaderFunction( QgsRasterShaderFunction* theFunction ); /** \brief Mutator for red band name (allows alternate mappings e.g. map blue as red color) */ - void setRedBandName( const QString & theBandName ); + Q_DECL_DEPRECATED void setRedBandName( const QString & theBandName ); /** \brief Mutator for transparent band name mapping */ - void setTransparentBandName( const QString & theBandName ); + Q_DECL_DEPRECATED void setTransparentBandName( const QString & theBandName ); /** \brief [ data provider interface ] A wrapper function to emit a progress update signal */ void showProgress( int theValue ); diff --git a/src/mapserver/qgssldparser.cpp b/src/mapserver/qgssldparser.cpp index ea5a178fc62a..b98e2f6308b1 100644 --- a/src/mapserver/qgssldparser.cpp +++ b/src/mapserver/qgssldparser.cpp @@ -504,6 +504,9 @@ bool QgsSLDParser::rasterSymbologyFromUserStyle( const QDomElement& userStyleEle //set pseudo color mode return true; +#else + Q_UNUSED( userStyleElement ); + Q_UNUSED( r ); #endif //0 }