From 3919b3012b2a9b88b7b30e09c5d66b7ee4bd41ab Mon Sep 17 00:00:00 2001
From: Rebecca Cox <rebecca.cox@acando.no>
Date: Mon, 6 Nov 2017 10:26:16 +0100
Subject: [PATCH] Remove "uiConfigName" from uiOrdering-functions

---
 ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp | 8 ++++----
 ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp      | 8 ++++----
 ApplicationCode/ProjectDataModel/RimWellLogPlot.h        | 4 ++--
 ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp     | 6 +++---
 ApplicationCode/ProjectDataModel/RimWellLogTrack.h       | 4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
index ab692e7114..89bd6e164e 100644
--- a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
+++ b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
@@ -1184,16 +1184,16 @@ void RimWellRftPlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
     {
         RimWellLogTrack* track = m_wellLogPlot->trackByIndex(0);
 
-        track->uiOrderingForShowFormationNamesAndCase(uiConfigName, uiOrdering);
+        track->uiOrderingForShowFormationNamesAndCase(uiOrdering);
 
         caf::PdmUiGroup* legendAndAxisGroup = uiOrdering.addNewGroup("Legend and Axis");
         legendAndAxisGroup->setCollapsedByDefault(true);
         
-        m_wellLogPlot->uiOrderingForPlot(uiConfigName, *legendAndAxisGroup);
+        m_wellLogPlot->uiOrderingForPlot(*legendAndAxisGroup);
 
-        track->uiOrderingForVisibleXRange(uiConfigName, *legendAndAxisGroup);
+        track->uiOrderingForVisibleXRange(*legendAndAxisGroup);
 
-        m_wellLogPlot->uiOrderingForVisibleDepthRange(uiConfigName, *legendAndAxisGroup);
+        m_wellLogPlot->uiOrderingForVisibleDepthRange(*legendAndAxisGroup);
     }
 
     uiOrdering.skipRemainingFields(true);
diff --git a/ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp b/ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp
index d3f8208946..a75320a5d5 100644
--- a/ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp
@@ -532,7 +532,7 @@ bool RimWellLogPlot::isPltPlotChild() const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlot::uiOrderingForVisibleDepthRange(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
+void RimWellLogPlot::uiOrderingForVisibleDepthRange(caf::PdmUiOrdering& uiOrdering)
 {
     caf::PdmUiGroup* gridGroup = uiOrdering.addNewGroup("Visible Depth Range");
     gridGroup->add(&m_isAutoScaleDepthEnabled);
@@ -543,7 +543,7 @@ void RimWellLogPlot::uiOrderingForVisibleDepthRange(QString uiConfigName, caf::P
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlot::uiOrderingForPlot(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
+void RimWellLogPlot::uiOrderingForPlot(caf::PdmUiOrdering& uiOrdering)
 {
     RimWellRftPlot* rftp;
     firstAncestorOrThisOfType(rftp);
@@ -580,8 +580,8 @@ void RimWellLogPlot::depthZoomMinMax(double* minimumDepth, double* maximumDepth)
 void RimWellLogPlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
 {
     uiOrdering.add(&m_userName);
-    uiOrderingForPlot(uiConfigName, uiOrdering);
-    uiOrderingForVisibleDepthRange(uiConfigName, uiOrdering);
+    uiOrderingForPlot(uiOrdering);
+    uiOrderingForVisibleDepthRange(uiOrdering);
 
     uiOrdering.skipRemainingFields(true);
 }
diff --git a/ApplicationCode/ProjectDataModel/RimWellLogPlot.h b/ApplicationCode/ProjectDataModel/RimWellLogPlot.h
index c9a38c457c..b92ac0d402 100644
--- a/ApplicationCode/ProjectDataModel/RimWellLogPlot.h
+++ b/ApplicationCode/ProjectDataModel/RimWellLogPlot.h
@@ -107,8 +107,8 @@ public:
     RimWellPltPlot*                                 pltPlot() const;
     bool                                            isPltPlotChild() const;
 
-    void                                            uiOrderingForVisibleDepthRange(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
-    void                                            uiOrderingForPlot(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
+    void                                            uiOrderingForVisibleDepthRange(caf::PdmUiOrdering& uiOrdering);
+    void                                            uiOrderingForPlot(caf::PdmUiOrdering& uiOrdering);
 
 protected:
 
diff --git a/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp b/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
index 6e0ec96198..55c1ef0432 100644
--- a/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
@@ -763,7 +763,7 @@ void RimWellLogTrack::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
         }
     }
 
-    uiOrderingForVisibleXRange(uiConfigName, uiOrdering);
+    uiOrderingForVisibleXRange(uiOrdering);
 
     uiOrdering.skipRemainingFields(true);
 }
@@ -893,7 +893,7 @@ std::vector<RimWellLogCurve* > RimWellLogTrack::curvesVector()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogTrack::uiOrderingForShowFormationNamesAndCase(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
+void RimWellLogTrack::uiOrderingForShowFormationNamesAndCase(caf::PdmUiOrdering& uiOrdering)
 {
     caf::PdmUiGroup* formationGroup = uiOrdering.addNewGroup("Formation Names");
     formationGroup->setCollapsedByDefault(true);
@@ -904,7 +904,7 @@ void RimWellLogTrack::uiOrderingForShowFormationNamesAndCase(QString uiConfigNam
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogTrack::uiOrderingForVisibleXRange(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
+void RimWellLogTrack::uiOrderingForVisibleXRange(caf::PdmUiOrdering& uiOrdering)
 {
     caf::PdmUiGroup* gridGroup = uiOrdering.addNewGroup("Visible X Axis Range");
     gridGroup->add(&m_isAutoScaleXEnabled);
diff --git a/ApplicationCode/ProjectDataModel/RimWellLogTrack.h b/ApplicationCode/ProjectDataModel/RimWellLogTrack.h
index a9684c694a..82fa69691c 100644
--- a/ApplicationCode/ProjectDataModel/RimWellLogTrack.h
+++ b/ApplicationCode/ProjectDataModel/RimWellLogTrack.h
@@ -99,8 +99,8 @@ public:
     QString description();
     std::vector<RimWellLogCurve* > curvesVector();
 
-    void uiOrderingForShowFormationNamesAndCase(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
-    void uiOrderingForVisibleXRange(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
+    void uiOrderingForShowFormationNamesAndCase(caf::PdmUiOrdering& uiOrdering);
+    void uiOrderingForVisibleXRange(caf::PdmUiOrdering& uiOrdering);
 
 private:
     virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;