From c2b543b375820d8a1a1ec81b84258727d49e92b5 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Thu, 12 Oct 2017 21:07:31 +0200
Subject: [PATCH] #1977 Curve Calculator : Rename to
 RiuSummaryCurveDefSelectionEditor

---
 .../UserInterface/CMakeLists_files.cmake       |  4 ++--
 .../RiuSummaryCurveDefSelectionDialog.cpp      |  4 ++--
 .../RiuSummaryCurveDefSelectionDialog.h        |  5 +++--
 ...p => RiuSummaryCurveDefSelectionEditor.cpp} | 18 +++++++++---------
 ...t.h => RiuSummaryCurveDefSelectionEditor.h} |  6 +++---
 5 files changed, 19 insertions(+), 18 deletions(-)
 rename ApplicationCode/UserInterface/{RiuSummaryCurveDefSelectionWidget.cpp => RiuSummaryCurveDefSelectionEditor.cpp} (94%)
 rename ApplicationCode/UserInterface/{RiuSummaryCurveDefSelectionWidget.h => RiuSummaryCurveDefSelectionEditor.h} (93%)

diff --git a/ApplicationCode/UserInterface/CMakeLists_files.cmake b/ApplicationCode/UserInterface/CMakeLists_files.cmake
index b51bf91eb9..f90925817e 100644
--- a/ApplicationCode/UserInterface/CMakeLists_files.cmake
+++ b/ApplicationCode/UserInterface/CMakeLists_files.cmake
@@ -54,7 +54,7 @@ ${CEE_CURRENT_LIST_DIR}RiuContextMenuLauncher.h
 ${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefinitionKeywords.h
 ${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelection.h
 ${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionDialog.h
-${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionWidget.h
+${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionEditor.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
@@ -105,7 +105,7 @@ ${CEE_CURRENT_LIST_DIR}RiuPlotObjectPicker.cpp
 ${CEE_CURRENT_LIST_DIR}RiuContextMenuLauncher.cpp
 ${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelection.cpp
 ${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionDialog.cpp
-${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionWidget.cpp
+${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionEditor.cpp
 )
 
 list(APPEND CODE_HEADER_FILES
diff --git a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.cpp b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.cpp
index e1a5ac423d..737536c1f2 100644
--- a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.cpp
+++ b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.cpp
@@ -18,7 +18,7 @@
 
 #include "RiuSummaryCurveDefSelectionDialog.h"
 
-#include "RiuSummaryCurveDefSelectionWidget.h"
+#include "RiuSummaryCurveDefSelectionEditor.h"
 
 #include <QVBoxLayout>
 #include <QDialogButtonBox>
@@ -29,7 +29,7 @@
 RiuSummaryCurveDefSelectionDialog::RiuSummaryCurveDefSelectionDialog(QWidget* parent)
     : QDialog(parent)
 {
-    m_addrSelWidget = new RiuSummaryCurveDefSelectionWidget(this);
+    m_addrSelWidget = std::unique_ptr<RiuSummaryCurveDefSelectionEditor>(new RiuSummaryCurveDefSelectionEditor());
     QWidget* addrWidget = m_addrSelWidget->getOrCreateWidget(this);
 
     QVBoxLayout* mainLayout = new QVBoxLayout(this);
diff --git a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.h b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.h
index 9cdae3355b..b412114962 100644
--- a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.h
+++ b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.h
@@ -19,8 +19,9 @@
 #pragma once
 
 #include <QDialog>
+#include <memory>
 
-class RiuSummaryCurveDefSelectionWidget;
+class RiuSummaryCurveDefSelectionEditor;
 class RiuSummaryCurveDefSelection;
 
 //==================================================================================================
@@ -36,5 +37,5 @@ public:
     RiuSummaryCurveDefSelection* summaryAddressSelection() const;
 
 private:
-    RiuSummaryCurveDefSelectionWidget* m_addrSelWidget;
+    std::unique_ptr<RiuSummaryCurveDefSelectionEditor> m_addrSelWidget;
 };
diff --git a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionWidget.cpp b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.cpp
similarity index 94%
rename from ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionWidget.cpp
rename to ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.cpp
index f543e92a89..9e9099412a 100644
--- a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionWidget.cpp
+++ b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.cpp
@@ -16,7 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiuSummaryCurveDefSelectionWidget.h"
+#include "RiuSummaryCurveDefSelectionEditor.h"
 
 #include "RiuSummaryCurveDefSelection.h"
 #include "RiuSummaryCurveDefinitionKeywords.h"
@@ -33,7 +33,7 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RiuSummaryCurveDefSelectionWidget::RiuSummaryCurveDefSelectionWidget(QWidget* parent)
+RiuSummaryCurveDefSelectionEditor::RiuSummaryCurveDefSelectionEditor()
 {
     m_summaryAddressSelection = std::unique_ptr<RiuSummaryCurveDefSelection>(new RiuSummaryCurveDefSelection());
 
@@ -43,15 +43,15 @@ RiuSummaryCurveDefSelectionWidget::RiuSummaryCurveDefSelectionWidget(QWidget* pa
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RiuSummaryCurveDefSelectionWidget::~RiuSummaryCurveDefSelectionWidget()
+RiuSummaryCurveDefSelectionEditor::~RiuSummaryCurveDefSelectionEditor()
 {
-
+    this->setPdmObject(nullptr);
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RiuSummaryCurveDefSelection* RiuSummaryCurveDefSelectionWidget::summaryAddressSelection() const
+RiuSummaryCurveDefSelection* RiuSummaryCurveDefSelectionEditor::summaryAddressSelection() const
 {
     return m_summaryAddressSelection.get();
 }
@@ -59,7 +59,7 @@ RiuSummaryCurveDefSelection* RiuSummaryCurveDefSelectionWidget::summaryAddressSe
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RiuSummaryCurveDefSelectionWidget::recursivelyConfigureAndUpdateTopLevelUiItems(const std::vector<caf::PdmUiItem *>& topLevelUiItems, const QString& uiConfigName)
+void RiuSummaryCurveDefSelectionEditor::recursivelyConfigureAndUpdateTopLevelUiItems(const std::vector<caf::PdmUiItem *>& topLevelUiItems, const QString& uiConfigName)
 {
     if (!m_firstRowLeftLayout || !m_firstRowRightLayout) return;
 
@@ -99,7 +99,7 @@ void RiuSummaryCurveDefSelectionWidget::recursivelyConfigureAndUpdateTopLevelUiI
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QWidget* RiuSummaryCurveDefSelectionWidget::createWidget(QWidget* parent)
+QWidget* RiuSummaryCurveDefSelectionEditor::createWidget(QWidget* parent)
 {
     QWidget* widget = new QWidget(parent);
 
@@ -139,7 +139,7 @@ QWidget* RiuSummaryCurveDefSelectionWidget::createWidget(QWidget* parent)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RiuSummaryCurveDefSelectionWidget::configureAndUpdateFields(int widgetStartIndex, 
+void RiuSummaryCurveDefSelectionEditor::configureAndUpdateFields(int widgetStartIndex, 
                                                                 QBoxLayout* layout,
                                                                 const std::vector<caf::PdmUiItem *>& uiItems,
                                                                 const QString& uiConfigName)
@@ -209,7 +209,7 @@ void RiuSummaryCurveDefSelectionWidget::configureAndUpdateFields(int widgetStart
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QMinimizePanel* RiuSummaryCurveDefSelectionWidget::createGroupBoxWithContent(caf::PdmUiGroup* group,
+QMinimizePanel* RiuSummaryCurveDefSelectionEditor::createGroupBoxWithContent(caf::PdmUiGroup* group,
                                                                             const QString& uiConfigName)
 {
     QMinimizePanel* groupBox = findOrCreateGroupBox(this->widget(), group, uiConfigName);
diff --git a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionWidget.h b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.h
similarity index 93%
rename from ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionWidget.h
rename to ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.h
index cd8ff156ae..281fec6f37 100644
--- a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionWidget.h
+++ b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.h
@@ -43,11 +43,11 @@ namespace caf {
 ///  
 ///  
 //==================================================================================================
-class RiuSummaryCurveDefSelectionWidget : public caf::PdmUiWidgetBasedObjectEditor
+class RiuSummaryCurveDefSelectionEditor : public caf::PdmUiWidgetBasedObjectEditor
 {
 public:
-    RiuSummaryCurveDefSelectionWidget(QWidget* parent);
-    ~RiuSummaryCurveDefSelectionWidget();
+    RiuSummaryCurveDefSelectionEditor();
+    ~RiuSummaryCurveDefSelectionEditor();
 
     RiuSummaryCurveDefSelection* summaryAddressSelection() const;