Store member variable createConnectedElement by value

Was stored as pointer before. This change solves potentially dangling pointers after object goes out-of-scope.
DLR-SC · Jan 20, 2025 · 3414751 · 3414751
1 parent b31ae2f
commit 3414751
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/TIGLViewer/src/ModificatorContainerWidget.cpp b/TIGLViewer/src/ModificatorContainerWidget.cpp
@@ -137,7 +137,7 @@ void ModificatorContainerWidget::setSectionModificator(QList<tigl::CTiglSectionE
 }
 
 
-void ModificatorContainerWidget::setSectionsModificator(Ui::ElementModificatorInterface& element)
+void ModificatorContainerWidget::setSectionsModificator(const Ui::ElementModificatorInterface& element)
 {
     hideAllSpecializedWidgets();
     ui->sectionsModificator->setCreateConnectedElement(element);

diff --git a/TIGLViewer/src/ModificatorContainerWidget.h b/TIGLViewer/src/ModificatorContainerWidget.h
@@ -79,7 +79,7 @@ public slots:
     void setFuselagesModificator(tigl::CCPACSFuselages& fuselages);
     void setElementModificator(tigl::CTiglSectionElement& element);
     void setSectionModificator(QList<tigl::CTiglSectionElement*> elements);
-    void setSectionsModificator(Ui::ElementModificatorInterface& conntedElementI);
+    void setSectionsModificator(Ui::ElementModificatorInterface const& conntedElementI);
     // for positioning, we need two different calls for wing and for fuselage. Otherwise, we miss to invalidate the
     // associated wing or fuselage
     void setPositioningModificator(tigl::CCPACSWing& wing, tigl::CCPACSPositioning& positioning);

diff --git a/TIGLViewer/src/ModificatorManager.cpp b/TIGLViewer/src/ModificatorManager.cpp
@@ -166,7 +166,7 @@ void ModificatorManager::dispatch(cpcr::CPACSTreeItem* item)
         };
 
         auto element = get_element_interface(typePtr);
-        modificatorContainerWidget->setSectionsModificator(element);
+        modificatorContainerWidget->setSectionsModificator(std::move(element));
     }
     else if (item->getType() == "positioning" ) {
         tigl::CTiglUIDManager& uidManager = doc->GetConfiguration().GetUIDManager();

diff --git a/TIGLViewer/src/modificators/ModificatorSectionsWidget.cpp b/TIGLViewer/src/modificators/ModificatorSectionsWidget.cpp
@@ -30,7 +30,6 @@ ModificatorSectionsWidget::ModificatorSectionsWidget(QWidget* parent)
     , ui(new Ui::ModificatorSectionsWidget)
 {
     ui->setupUi(this);
-    createConnectedElement = nullptr;
     connect(ui->addConnectedElementBtn, SIGNAL(pressed()), this, SLOT(execNewConnectedElementDialog()));
     connect(ui->deleteConnectedElementBtn, SIGNAL(pressed()), this, SLOT(execDeleteConnectedElementDialog()));
 }
@@ -40,14 +39,14 @@ ModificatorSectionsWidget::~ModificatorSectionsWidget()
     delete ui;
 }
 
-void ModificatorSectionsWidget::setCreateConnectedElement(Ui::ElementModificatorInterface& element)
+void ModificatorSectionsWidget::setCreateConnectedElement(Ui::ElementModificatorInterface const& element)
 {
-    createConnectedElement = &element;
+    createConnectedElement = element;
 }
 
 void ModificatorSectionsWidget::execNewConnectedElementDialog()
 {
-    if (createConnectedElement == nullptr) {
+    if (createConnectedElement == std::nullopt) {
         LOG(ERROR) << "ModificatorSectionsWidget:: is not correctly set!";
         return;
     }
@@ -88,7 +87,7 @@ void ModificatorSectionsWidget::execNewConnectedElementDialog()
 void ModificatorSectionsWidget::execDeleteConnectedElementDialog()
 {
 
-    if (createConnectedElement == nullptr) {
+    if (createConnectedElement == std::nullopt) {
         LOG(ERROR) << "ModificatorWingsWidget::execDeleteWingDialog: wings is not set!";
         return;
     }

diff --git a/TIGLViewer/src/modificators/ModificatorSectionsWidget.h b/TIGLViewer/src/modificators/ModificatorSectionsWidget.h
@@ -21,6 +21,7 @@
 
 #include <QWidget>
 #include <string>
+#include <optional>
 #include "CCPACSFuselage.h"
 #include "CCPACSWing.h"
 
@@ -77,11 +78,12 @@ public slots:
     explicit ModificatorSectionsWidget(QWidget* parent = nullptr);
     ~ModificatorSectionsWidget();
 
-    void setCreateConnectedElement(Ui::ElementModificatorInterface& element);
+    void setCreateConnectedElement(Ui::ElementModificatorInterface const& element);
 
 private:
     Ui::ModificatorSectionsWidget* ui;
-    Ui::ElementModificatorInterface* createConnectedElement;
+    // std::optional used here to account for empty initializiation of member variable in construtor (ptr and nullptr used before)
+    std::optional<Ui::ElementModificatorInterface> createConnectedElement;
 };
 
 #endif // MODIFICATORSECTIONSWIDGET_H