diff --git a/ApplicationCode/ModelVisualization/Intersections/RivHexGridIntersectionTools.h b/ApplicationCode/ModelVisualization/Intersections/RivHexGridIntersectionTools.h index 9ee1ec9388..0cc00291d5 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivHexGridIntersectionTools.h +++ b/ApplicationCode/ModelVisualization/Intersections/RivHexGridIntersectionTools.h @@ -71,7 +71,7 @@ private: class RivFemIntersectionGrid : public RivIntersectionHexGridInterface { public: - RivFemIntersectionGrid(const RigFemPart * femPart); + explicit RivFemIntersectionGrid(const RigFemPart * femPart); virtual cvf::Vec3d displayOffset() const; virtual cvf::BoundingBox boundingBox() const; diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp index a2e18da07e..34c11a9777 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp @@ -349,8 +349,7 @@ cvf::ref RivIntersectionBoxPartMgr::createHexGr m_rimIntersectionBox->firstAncestorOrThisOfType(eclipseView); if (eclipseView) { - RigMainGrid* grid = NULL; - grid = eclipseView->mainGrid(); + RigMainGrid* grid = eclipseView->mainGrid(); return new RivEclipseIntersectionGrid(grid, eclipseView->currentActiveCellInfo(), m_rimIntersectionBox->showInactiveCells()); } diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.h b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.h index 1b8f0ebc63..e5afcbc5b8 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.h +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.h @@ -45,7 +45,7 @@ class RimIntersectionBox; class RivIntersectionBoxPartMgr : public cvf::Object { public: - RivIntersectionBoxPartMgr(const RimIntersectionBox* intersectionBox); + explicit RivIntersectionBoxPartMgr(const RimIntersectionBox* intersectionBox); void applySingleColorEffect(); void updateCellResultColor(size_t timeStepIndex); diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxSourceInfo.h b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxSourceInfo.h index b8a9901dda..078c102cf0 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxSourceInfo.h +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxSourceInfo.h @@ -29,7 +29,7 @@ class RimIntersectionBox; class RivIntersectionBoxSourceInfo : public cvf::Object { public: - RivIntersectionBoxSourceInfo(RivIntersectionBoxGeometryGenerator* geometryGenerator); + explicit RivIntersectionBoxSourceInfo(RivIntersectionBoxGeometryGenerator* geometryGenerator); const std::vector& triangleToCellIndex() const; diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp index 9d78e729f6..89aa89b230 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp @@ -737,8 +737,7 @@ cvf::ref RivIntersectionPartMgr::createHexGridI m_rimCrossSection->firstAncestorOrThisOfType(eclipseView); if (eclipseView) { - RigMainGrid* grid = NULL; - grid = eclipseView->mainGrid(); + RigMainGrid* grid = eclipseView->mainGrid(); return new RivEclipseIntersectionGrid(grid, eclipseView->currentActiveCellInfo(), m_rimCrossSection->showInactiveCells()); } diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h index 831fd0d8e7..76b75c1034 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h @@ -55,7 +55,7 @@ class RivIntersectionVertexWeights; class RivIntersectionPartMgr : public cvf::Object { public: - RivIntersectionPartMgr(const RimIntersection* rimCrossSection); + explicit RivIntersectionPartMgr(const RimIntersection* rimCrossSection); void applySingleColorEffect(); void updateCellResultColor(size_t timeStepIndex); diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.h b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.h index 436a0a6c75..7cd3b94fc4 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.h +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.h @@ -30,7 +30,7 @@ class RimIntersection; class RivIntersectionSourceInfo : public cvf::Object { public: - RivIntersectionSourceInfo(RivIntersectionGeometryGenerator* geometryGenerator); + explicit RivIntersectionSourceInfo(RivIntersectionGeometryGenerator* geometryGenerator); const std::vector& triangleToCellIndex() const; std::array triangle(int triangleIdx) const; diff --git a/ApplicationCode/ModelVisualization/RivCellEdgeEffectGenerator.h b/ApplicationCode/ModelVisualization/RivCellEdgeEffectGenerator.h index 3619ee63f9..80f5c9da24 100644 --- a/ApplicationCode/ModelVisualization/RivCellEdgeEffectGenerator.h +++ b/ApplicationCode/ModelVisualization/RivCellEdgeEffectGenerator.h @@ -101,7 +101,7 @@ class RivTernaryScalarMapper; class CellEdgeEffectGenerator : public caf::EffectGenerator { public: - CellEdgeEffectGenerator(const cvf::ScalarMapper* edgeScalarMapper); + explicit CellEdgeEffectGenerator(const cvf::ScalarMapper* edgeScalarMapper); void setScalarMapper(const cvf::ScalarMapper* cellScalarMapper); void setTernaryScalarMapper(const RivTernaryScalarMapper* ternaryScalarMapper); diff --git a/ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.cpp b/ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.cpp index 06afe5c970..fb3472b98f 100644 --- a/ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.cpp +++ b/ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.cpp @@ -471,7 +471,6 @@ void RivPipeGeometryGenerator::updateFilteredPipeCenterCoords() double squareDistanceTolerance = 1e-4*1e-4; const size_t lastOriginalCoordIdx = m_originalPipeCenterCoords->size() - 1; - const size_t originalSegmentCount = m_originalPipeCenterCoords->size() - 1; size_t firstSegmentWithLength = findFirstSegmentWithLenght(squareDistanceTolerance); diff --git a/ApplicationCode/ModelVisualization/RivReservoirPipesPartMgr.h b/ApplicationCode/ModelVisualization/RivReservoirPipesPartMgr.h index f544b689d6..5797deb923 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirPipesPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivReservoirPipesPartMgr.h @@ -38,7 +38,7 @@ class RivWellHeadPartMgr; class RivReservoirPipesPartMgr : public cvf::Object { public: - RivReservoirPipesPartMgr(RimEclipseView* reservoirView); + explicit RivReservoirPipesPartMgr(RimEclipseView* reservoirView); ~RivReservoirPipesPartMgr(); void clearGeometryCache(); diff --git a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h index 362d6742f9..84f1c0b3c9 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h @@ -46,7 +46,7 @@ namespace cvf class RivReservoirViewPartMgr: public cvf::Object { public: - RivReservoirViewPartMgr(RimEclipseView * resv); + explicit RivReservoirViewPartMgr(RimEclipseView * resv); cvf::Transform* scaleTransform() { return m_scaleTransform.p();} diff --git a/ApplicationCode/ModelVisualization/RivReservoirWellSpheresPartMgr.h b/ApplicationCode/ModelVisualization/RivReservoirWellSpheresPartMgr.h index d736ba2883..3cf95c8f9a 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirWellSpheresPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivReservoirWellSpheresPartMgr.h @@ -35,7 +35,7 @@ class RivWellSpheresPartMgr; class RivReservoirWellSpheresPartMgr : public cvf::Object { public: - RivReservoirWellSpheresPartMgr(RimEclipseView* reservoirView); + explicit RivReservoirWellSpheresPartMgr(RimEclipseView* reservoirView); ~RivReservoirWellSpheresPartMgr(); void clearGeometryCache(); diff --git a/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp b/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp index e50c221ce3..1fa6218e6c 100644 --- a/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp @@ -188,8 +188,6 @@ void RivSimWellPipesPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasicLi if (m_needsTransformUpdate) buildWellPipeParts(); - const RigWellResultFrame& wellResultFrame = m_rimWell->wellResults()->wellResultFrame(frameIndex); - std::list::iterator it; for (it = m_wellBranches.begin(); it != m_wellBranches.end(); ++it) { diff --git a/ApplicationCode/ModelVisualization/RivSourceInfo.h b/ApplicationCode/ModelVisualization/RivSourceInfo.h index a346307a84..5a70203839 100644 --- a/ApplicationCode/ModelVisualization/RivSourceInfo.h +++ b/ApplicationCode/ModelVisualization/RivSourceInfo.h @@ -27,7 +27,7 @@ class RivSourceInfo : public cvf::Object { public: - RivSourceInfo(size_t gridIndex) : m_gridIndex(gridIndex) {} + explicit RivSourceInfo(size_t gridIndex) : m_gridIndex(gridIndex) {} size_t gridIndex() const { return m_gridIndex; } bool hasCellFaceMapping() const; diff --git a/ApplicationCode/ModelVisualization/RivTernarySaturationOverlayItem.h b/ApplicationCode/ModelVisualization/RivTernarySaturationOverlayItem.h index f2cdf4eb7a..23a1c29133 100644 --- a/ApplicationCode/ModelVisualization/RivTernarySaturationOverlayItem.h +++ b/ApplicationCode/ModelVisualization/RivTernarySaturationOverlayItem.h @@ -38,7 +38,7 @@ class Font; class RivTernarySaturationOverlayItem : public cvf::OverlayItem { public: - RivTernarySaturationOverlayItem(cvf::Font* font); + explicit RivTernarySaturationOverlayItem(cvf::Font* font); ~RivTernarySaturationOverlayItem(); void setRangeText(const cvf::String& soilRange, const cvf::String& sgasRange, const cvf::String& swatRange); diff --git a/ApplicationCode/ModelVisualization/RivTernaryScalarMapper.h b/ApplicationCode/ModelVisualization/RivTernaryScalarMapper.h index 2503bde2e9..2b3a297d89 100644 --- a/ApplicationCode/ModelVisualization/RivTernaryScalarMapper.h +++ b/ApplicationCode/ModelVisualization/RivTernaryScalarMapper.h @@ -35,7 +35,7 @@ namespace cvf class RivTernaryScalarMapper : public cvf::Object { public: - RivTernaryScalarMapper(const cvf::Color3f& undefScalarColor); + explicit RivTernaryScalarMapper(const cvf::Color3f& undefScalarColor); void setTernaryRanges(double soilLower, double soilUpper, double sgasLower, double sgasUpper); diff --git a/ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.h b/ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.h index 386e83d8f6..6c8131905e 100644 --- a/ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.h @@ -42,7 +42,7 @@ namespace cvf class RivWellPathCollectionPartMgr : public cvf::Object { public: - RivWellPathCollectionPartMgr(RimWellPathCollection* wellPathCollection); + explicit RivWellPathCollectionPartMgr(RimWellPathCollection* wellPathCollection); ~RivWellPathCollectionPartMgr(); void scheduleGeometryRegen(); diff --git a/ApplicationCode/ModelVisualization/RivWellPathPartMgr.h b/ApplicationCode/ModelVisualization/RivWellPathPartMgr.h index 18e8e1c646..adffbb73bf 100644 --- a/ApplicationCode/ModelVisualization/RivWellPathPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivWellPathPartMgr.h @@ -40,7 +40,7 @@ class RimWellPath; class RivWellPathPartMgr : public cvf::Object { public: - RivWellPathPartMgr(RimWellPath* wellPath); + explicit RivWellPathPartMgr(RimWellPath* wellPath); ~RivWellPathPartMgr(); void setScaleTransform(cvf::Transform * scaleTransform); diff --git a/ApplicationCode/ModelVisualization/RivWellPathSourceInfo.h b/ApplicationCode/ModelVisualization/RivWellPathSourceInfo.h index 27d24ad0bd..6bb3935cdf 100644 --- a/ApplicationCode/ModelVisualization/RivWellPathSourceInfo.h +++ b/ApplicationCode/ModelVisualization/RivWellPathSourceInfo.h @@ -33,7 +33,7 @@ class RimWellPath; class RivWellPathSourceInfo : public cvf::Object { public: - RivWellPathSourceInfo(RimWellPath* wellPath); + explicit RivWellPathSourceInfo(RimWellPath* wellPath); RimWellPath* wellPath() const;