From 827468b764fa3ff804ee79489d5b6549600b2843 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Thu, 25 Jan 2018 12:27:36 +0100
Subject: [PATCH] #2402 Code cleanup

---
 .../RimStimPlanFractureTemplate.cpp           | 20 +++++++++++++++++--
 .../Completions/RimStimPlanFractureTemplate.h | 15 +++++++-------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp b/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
index b035bc7c02..e6a3694b12 100644
--- a/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
@@ -58,7 +58,7 @@ CAF_PDM_SOURCE_INIT(RimStimPlanFractureTemplate, "RimStimPlanFractureTemplate");
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimStimPlanFractureTemplate::RimStimPlanFractureTemplate(void)
+RimStimPlanFractureTemplate::RimStimPlanFractureTemplate()
 {
     CAF_PDM_InitObject("Fracture Template", ":/FractureTemplate16x16.png", "", "");
 
@@ -86,6 +86,22 @@ RimStimPlanFractureTemplate::~RimStimPlanFractureTemplate()
 {
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+int RimStimPlanFractureTemplate::activeTimeStepIndex()
+{
+    return m_activeTimeStepIndex;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RimStimPlanFractureTemplate::showStimPlanMesh()
+{
+    return m_showStimPlanMesh;
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
@@ -227,7 +243,7 @@ bool RimStimPlanFractureTemplate::setBorderPolygonResultNameToDefault()
     }
 
     // else: Set to first property
-    if (uiResultNamesWithUnit().size() > 0)
+    if (!uiResultNamesWithUnit().empty())
     {
         m_borderPolygonResultName = uiResultNamesWithUnit()[0].first;
         return true;
diff --git a/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h b/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h
index d70290aadf..34a8056460 100644
--- a/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h
+++ b/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h
@@ -49,11 +49,11 @@ class RimStimPlanFractureTemplate : public RimFractureTemplate
      CAF_PDM_HEADER_INIT;
 
 public:
-    RimStimPlanFractureTemplate(void);
-    virtual ~RimStimPlanFractureTemplate(void);
+    RimStimPlanFractureTemplate();
+    virtual ~RimStimPlanFractureTemplate();
     
-    int                                     activeTimeStepIndex() { return m_activeTimeStepIndex; }
-    bool                                    showStimPlanMesh()    { return m_showStimPlanMesh;}
+    int                                     activeTimeStepIndex();
+    bool                                    showStimPlanMesh();
 
     void                                    loadDataAndUpdate(); 
     void                                    setDefaultsBasedOnXMLfile();
@@ -67,12 +67,12 @@ public:
 
     // Fracture geometry
      
-    const RigFractureGrid*                  fractureGrid() const;
+    const RigFractureGrid*                  fractureGrid() const override;
     void                                    updateFractureGrid();
     void                                    fractureTriangleGeometry(std::vector<cvf::Vec3f>* nodeCoords,
                                                                      std::vector<cvf::uint>* triangleIndices, 
                                                                      RiaEclipseUnitTools::UnitSystem  neededUnit) override;
-    std::vector<cvf::Vec3f>                 fractureBorderPolygon(RiaEclipseUnitTools::UnitSystem neededUnit);
+    std::vector<cvf::Vec3f>                 fractureBorderPolygon(RiaEclipseUnitTools::UnitSystem neededUnit) override;
 
     // Result Access
 
@@ -89,7 +89,7 @@ public:
 protected:
     virtual void                            fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
     virtual QList<caf::PdmOptionItemInfo>   calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
-    virtual void                            defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
+    virtual void                            defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
     virtual void                            defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute * attribute) override;
 
 private:
@@ -113,5 +113,4 @@ private:
     cvf::ref<RigStimPlanFractureDefinition> m_stimPlanFractureDefinitionData;
     caf::PdmField<double>                   m_conductivityScalingFactor;
     cvf::ref<RigFractureGrid>               m_fractureGrid;
-
 };