sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Coding style and SIP_DEPRECATED

Browse Source
This commit is contained in:
Alessandro Pasotti 2018-11-30 09:03:28 +01:00
parent 1672d434ce
commit 50e5414232
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/analysis/auto_generated/raster/qgsrastercalculator.sip.in
View File

@ -27,7 +27,7 @@ Represents an individual raster layer/band number entry within a raster calculat
%Docstring %Docstring
Creates a list of raster entries from the current project. 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 only one of them is added to the list, duplicate names are
also handled by appending an _n integer to the base name. also handled by appending an _n integer to the base name.

3
src/analysis/raster/qgsrastercalculator.cpp
View File

@ -386,10 +386,9 @@ QVector<QgsRasterCalculatorEntry> QgsRasterCalculatorEntry::rasterEntries()
QMap<QString, QgsMapLayer *>::const_iterator layerIt = layers.constBegin(); QMap<QString, QgsMapLayer *>::const_iterator layerIt = layers.constBegin();
for ( ; layerIt != layers.constEnd(); ++layerIt ) 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" ) ) if ( rlayer && rlayer->dataProvider() && rlayer->dataProvider()->name() == QLatin1String( "gdal" ) )
{ {
//get number of bands //get number of bands
for ( int i = 0; i < rlayer->bandCount(); ++i ) for ( int i = 0; i < rlayer->bandCount(); ++i )
{ {

2
src/analysis/raster/qgsrastercalculator.h
View File

@ -43,7 +43,7 @@ class ANALYSIS_EXPORT QgsRasterCalculatorEntry
/** /**
* Creates a list of raster entries from the current project. * 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 * only one of them is added to the list, duplicate names are
* also handled by appending an _n integer to the base name. * also handled by appending an _n integer to the base name.
* *

2
src/app/qgsrastercalcdialog.h
View File

@ -55,7 +55,7 @@ class APP_EXPORT QgsRasterCalcDialog: public QDialog, private Ui::QgsRasterCalcD
* \return a vector of raster entries from the current project * \return a vector of raster entries from the current project
* \deprecated since QGIS 3.6 use QgsRasterCalculatorEntry::rasterEntries() instead * \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: private slots:
void mRasterBandsListWidget_itemDoubleClicked( QListWidgetItem *item ); void mRasterBandsListWidget_itemDoubleClicked( QListWidgetItem *item );