STYLE: use labelRange and range-based-for in paraview readers

- also use updated forAll* macros

applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.cxx

@@ -106,7 +106,7 @@ vtkPVblockMeshReader::~vtkPVblockMeshReader()
 
     if (FileName)
     {
-        delete [] FileName;
+        delete[] FileName;
     }
 
     BlockSelection->RemoveAllObservers();
@@ -263,12 +263,11 @@ void vtkPVblockMeshReader::updatePatchNamesView(const bool show)
     }
 
     // Get all the pqRenderView instances
-    QList<pqRenderView*> renderViews = smModel->findItems<pqRenderView*>();
-    for (int viewI=0; viewI<renderViews.size(); ++viewI)
+    for (auto view : smModel->findItems<pqRenderView*>())
     {
         backend_->renderPatchNames
         (
-            renderViews[viewI]->getRenderViewProxy()->GetRenderer(),
+            view->getRenderViewProxy()->GetRenderer(),
             show
         );
     }
@@ -295,12 +294,11 @@ void vtkPVblockMeshReader::updatePointNumbersView(const bool show)
     }
 
     // Get all the pqRenderView instances
-    QList<pqRenderView*> renderViews = smModel->findItems<pqRenderView*>();
-    for (int viewI=0; viewI<renderViews.size(); ++viewI)
+    for (auto view : smModel->findItems<pqRenderView*>())
     {
         backend_->renderPointNumbers
         (
-            renderViews[viewI]->getRenderViewProxy()->GetRenderer(),
+            view->getRenderViewProxy()->GetRenderer(),
             show
         );
     }

applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C

@@ -52,7 +52,7 @@ namespace Foam
 
 vtkTextActor* Foam::vtkPVblockMesh::createTextActor
 (
-    const string& s,
+    const std::string& s,
     const point& pt
 )
 {
@@ -81,9 +81,9 @@ vtkTextActor* Foam::vtkPVblockMesh::createTextActor
 void Foam::vtkPVblockMesh::resetCounters()
 {
     // Reset mesh part ids and sizes
-    arrayRangeBlocks_.reset();
-    arrayRangeEdges_.reset();
-    arrayRangeCorners_.reset();
+    rangeBlocks_.reset();
+    rangeEdges_.reset();
+    rangeCorners_.reset();
 }
 
 
@@ -92,15 +92,13 @@ void Foam::vtkPVblockMesh::updateInfoBlocks
     vtkDataArraySelection* select
 )
 {
-    arrayRange& range = arrayRangeBlocks_;
-
     if (debug)
     {
         Info<< "<beg> updateInfoBlocks"
             << " [meshPtr=" << (meshPtr_ ? "set" : "null") << "]" << endl;
     }
 
-    range.reset(select->GetNumberOfArrays());
+    rangeBlocks_.reset(select->GetNumberOfArrays());
 
     const blockMesh& blkMesh = *meshPtr_;
 
@@ -122,10 +120,9 @@ void Foam::vtkPVblockMesh::updateInfoBlocks
 
         // Add "blockId" or "blockId - zoneName" to GUI list
         select->AddArray(ostr.str().c_str());
+        ++rangeBlocks_;
     }
 
-    range += nBlocks;
-
     if (debug)
     {
         Info<< "<end> updateInfoBlocks" << endl;
@@ -138,15 +135,13 @@ void Foam::vtkPVblockMesh::updateInfoEdges
     vtkDataArraySelection* select
 )
 {
-    arrayRange& range = arrayRangeEdges_;
-
     if (debug)
     {
         Info<< "<beg> updateInfoEdges"
             << " [meshPtr=" << (meshPtr_ ? "set" : "null") << "]" << endl;
     }
 
-    range.reset(select->GetNumberOfArrays());
+    rangeEdges_.reset(select->GetNumberOfArrays());
 
     const blockMesh& blkMesh = *meshPtr_;
     const blockEdgeList& edges = blkMesh.edges();
@@ -161,10 +156,9 @@ void Foam::vtkPVblockMesh::updateInfoEdges
 
         // Add "beg:end - type" to GUI list
         select->AddArray(ostr.str().c_str());
+        ++rangeEdges_;
     }
 
-    range += edges.size();
-
     if (debug)
     {
         Info<< "<end> updateInfoEdges" << endl;
@@ -185,9 +179,9 @@ Foam::vtkPVblockMesh::vtkPVblockMesh
     meshPtr_(nullptr),
     meshRegion_(polyMesh::defaultRegion),
     meshDir_(polyMesh::meshSubDir),
-    arrayRangeBlocks_("block"),
-    arrayRangeEdges_("edges"),
-    arrayRangeCorners_("corners")
+    rangeBlocks_("block"),
+    rangeEdges_("edges"),
+    rangeCorners_("corners")
 {
     if (debug)
     {

applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.H

@@ -101,13 +101,13 @@ class vtkPVblockMesh
 
         //- First instance and size of bleckMesh blocks
         //  used to index into blockStatus_
-        arrayRange arrayRangeBlocks_;
+        arrayRange rangeBlocks_;
 
         //- First instance and size of CurvedEdges (only partially used)
-        arrayRange arrayRangeEdges_;
+        arrayRange rangeEdges_;
 
         //- First instance and size of block corners (only partially used)
-        arrayRange arrayRangeCorners_;
+        arrayRange rangeCorners_;
 
         //- List of patch names for rendering to window
         List<vtkTextActor*> patchTextActorsPtrs_;
@@ -119,7 +119,11 @@ class vtkPVblockMesh
     // Private Member Functions
 
         //- Create a text actor
-        static vtkTextActor* createTextActor(const string& s, const point& pt);
+        static vtkTextActor* createTextActor
+        (
+            const std::string& s,
+            const point& pt
+        );
 
         //- Reset data counters
         void resetCounters();

applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C

@@ -68,7 +68,7 @@ void Foam::vtkPVblockMesh::convertMeshBlocks
 )
 {
     vtkDataArraySelection* selection = reader_->GetBlockSelection();
-    arrayRange& range = arrayRangeBlocks_;
+    arrayRange& range = rangeBlocks_;
     range.block(blockNo);   // set output block
     label datasetNo = 0;    // restart at dataset 0
 
@@ -85,11 +85,12 @@ void Foam::vtkPVblockMesh::convertMeshBlocks
 
     for
     (
-        int partId = range.start();
-        partId < range.end();
-        ++partId, ++blockI
+        auto iter = range.cbegin();
+        iter != range.cend();
+        ++iter, ++blockI
     )
     {
+        const auto partId = *iter;
         if (!blockStatus_[partId])
         {
             continue;
@@ -135,7 +136,7 @@ void Foam::vtkPVblockMesh::convertMeshBlocks
         );
 
         vtkmesh->Delete();
-        datasetNo++;
+        ++datasetNo;
     }
 
 
@@ -159,7 +160,7 @@ void Foam::vtkPVblockMesh::convertMeshEdges
 )
 {
     vtkDataArraySelection* selection = reader_->GetCurvedEdgesSelection();
-    arrayRange& range = arrayRangeEdges_;
+    arrayRange& range = rangeEdges_;
 
     range.block(blockNo);      // set output block
     label datasetNo = 0;       // restart at dataset 0
@@ -172,11 +173,12 @@ void Foam::vtkPVblockMesh::convertMeshEdges
 
     for
     (
-        int partId = range.start();
-        partId < range.end();
-        ++partId, ++edgeI
+        auto iter = range.cbegin();
+        iter != range.cend();
+        ++iter, ++edgeI
     )
     {
+        const auto partId = *iter;
         if (!edgeStatus_[partId])
         {
             continue;
@@ -271,7 +273,7 @@ void Foam::vtkPVblockMesh::convertMeshCorners
     int& blockNo
 )
 {
-    arrayRange& range = arrayRangeCorners_;
+    arrayRange& range = rangeCorners_;
     range.block(blockNo);      // set output block
     label datasetNo = 0;       // restart at dataset 0
 
@@ -315,12 +317,7 @@ void Foam::vtkPVblockMesh::convertMeshCorners
         addToBlock(output, vtkmesh, range, datasetNo, range.name());
         vtkmesh->Delete();
 
-        datasetNo++;
-    }
-
-    // anything added?
-    if (datasetNo)
-    {
+        ++datasetNo;
         ++blockNo;
     }