Remove unused member

qgis · Jun 13, 2018 · 443852270de2000da643f6c5220dd534def5f4a1 · 4438522
1 parent 79c907b
commit 443852270de2000da643f6c5220dd534def5f4a1
Unified Split

Showing with 2 additions and 8 deletions.

+2 −7 src/core/raster/qgsrasteriterator.cpp

+0 −1 src/core/raster/qgsrasteriterator.h
diff --git a/src/core/raster/qgsrasteriterator.cpp b/src/core/raster/qgsrasteriterator.cpp
@@ -54,7 +54,6 @@ void QgsRasterIterator::startRasterRead( int bandNumber, int nCols, int nRows, c
   pInfo.nRows = nRows;
   pInfo.currentCol = 0;
   pInfo.currentRow = 0;
-  pInfo.prj = nullptr;
   mRasterPartInfos.insert( bandNumber, pInfo );
 }
 
@@ -91,8 +90,6 @@ bool QgsRasterIterator::readNextRasterPart( int bandNumber, int &nCols, int &nRo
   }
 
   //remove last data block
-  delete pInfo.prj;
-  pInfo.prj = nullptr;
 
   //already at end
   if ( pInfo.currentCol == pInfo.nCols && pInfo.currentRow == pInfo.nRows )
@@ -140,11 +137,9 @@ void QgsRasterIterator::stopRasterRead( int bandNumber )
 
 void QgsRasterIterator::removePartInfo( int bandNumber )
 {
-  QMap<int, RasterPartInfo>::iterator partIt = mRasterPartInfos.find( bandNumber );
-  if ( partIt != mRasterPartInfos.end() )
+  auto partIt = mRasterPartInfos.constFind( bandNumber );
+  if ( partIt != mRasterPartInfos.constEnd() )
   {
-    RasterPartInfo &pInfo = partIt.value();
-    delete pInfo.prj;
     mRasterPartInfos.remove( bandNumber );
   }
 }
diff --git a/src/core/raster/qgsrasteriterator.h b/src/core/raster/qgsrasteriterator.h
@@ -100,7 +100,6 @@ class CORE_EXPORT QgsRasterIterator
       int currentRow;
       int nCols;
       int nRows;
-      QgsRasterProjector *prj; //raster projector (or 0 if no reprojection is done)
     };
 
     QgsRasterInterface *mInput = nullptr;