Skip to content
Permalink
Browse files

Coding style and SIP_DEPRECATED

  • Loading branch information
elpaso committed Nov 30, 2018
1 parent 1672d43 commit 50e5414232eb0a24becb1505e87e39d68bcd075e
@@ -27,7 +27,7 @@ Represents an individual raster layer/band number entry within a raster calculat
%Docstring
Creates a list of raster entries from the current project.

If there are more than one layers with the same data source
If there is more than one layer with the same data source
only one of them is added to the list, duplicate names are
also handled by appending an _n integer to the base name.

@@ -386,10 +386,9 @@ QVector<QgsRasterCalculatorEntry> QgsRasterCalculatorEntry::rasterEntries()
QMap<QString, QgsMapLayer *>::const_iterator layerIt = layers.constBegin();
for ( ; layerIt != layers.constEnd(); ++layerIt )
{
QgsRasterLayer *rlayer = dynamic_cast<QgsRasterLayer *>( layerIt.value() );
QgsRasterLayer *rlayer = qobject_cast<QgsRasterLayer *>( layerIt.value() );
if ( rlayer && rlayer->dataProvider() && rlayer->dataProvider()->name() == QLatin1String( "gdal" ) )
{

//get number of bands
for ( int i = 0; i < rlayer->bandCount(); ++i )
{
@@ -43,7 +43,7 @@ class ANALYSIS_EXPORT QgsRasterCalculatorEntry
/**
* Creates a list of raster entries from the current project.
*
* If there are more than one layers with the same data source
* If there is more than one layer with the same data source
* only one of them is added to the list, duplicate names are
* also handled by appending an _n integer to the base name.
*
@@ -55,7 +55,7 @@ class APP_EXPORT QgsRasterCalcDialog: public QDialog, private Ui::QgsRasterCalcD
* \return a vector of raster entries from the current project
* \deprecated since QGIS 3.6 use QgsRasterCalculatorEntry::rasterEntries() instead
*/
Q_DECL_DEPRECATED QVector<QgsRasterCalculatorEntry> rasterEntries() const;
Q_DECL_DEPRECATED QVector<QgsRasterCalculatorEntry> rasterEntries() const SIP_DEPRECATED;

private slots:
void mRasterBandsListWidget_itemDoubleClicked( QListWidgetItem *item );

0 comments on commit 50e5414

Please sign in to comment.
You can’t perform that action at this time.