Issue 134, use std::unique_ptr in SemanticFeatureModel (#137)

FrankYFTang · web-flow · commit 68e23ee24e8c · 2025-06-27T13:50:11.000-07:00
diff --git a/inflection/src/inflection/dialog/SemanticFeatureModel.cpp b/inflection/src/inflection/dialog/SemanticFeatureModel.cpp
@@ -37,7 +37,6 @@ SemanticFeatureModel::SemanticFeatureModel(const ::inflection::util::ULocale& lo
 
 SemanticFeatureModel::~SemanticFeatureModel()
 {
-    delete defaultDisplayFunction;
     for (const auto& defaultFeatureFunction : defaultFeatureFunctions) {
         delete defaultFeatureFunction.second;
     }
@@ -119,13 +118,12 @@ void SemanticFeatureModel::putDefaultFeatureFunctionByName(::std::u16string_view
 
 const DefaultDisplayFunction* SemanticFeatureModel::getDefaultDisplayFunction() const
 {
-    return defaultDisplayFunction;
+    return defaultDisplayFunction.get();
 }
 
 void SemanticFeatureModel::setDefaultDisplayFunction(DefaultDisplayFunction* defaultDisplayFunction)
 {
-    delete this->defaultDisplayFunction;
-    this->defaultDisplayFunction = defaultDisplayFunction;
+    this->defaultDisplayFunction.reset(defaultDisplayFunction);
 }
 
 ::std::vector<SemanticFeature*> SemanticFeatureModel::createDefaultSemanticFeatures(const ::inflection::util::ULocale& locale)
diff --git a/inflection/src/inflection/dialog/SemanticFeatureModel.hpp b/inflection/src/inflection/dialog/SemanticFeatureModel.hpp
@@ -10,6 +10,7 @@
 #include <inflection/util/ULocale.hpp>
 #include <inflection/Object.hpp>
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <tuple>
@@ -31,7 +32,7 @@ class INFLECTION_CLASS_API inflection::dialog::SemanticFeatureModel final
     ::std::map<SemanticValue, SemanticFeatureModel_DisplayData> semanticValueMap {  };
     ::std::map<::inflection::dialog::SemanticFeature, DefaultFeatureFunction*> defaultFeatureFunctions {  };
     ::inflection::util::ULocale locale;
-    DefaultDisplayFunction* defaultDisplayFunction {  };
+    std::unique_ptr<DefaultDisplayFunction> defaultDisplayFunction;
 
 public:
     static constexpr auto SPEAK = u"speak";

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ SemanticFeatureModel::SemanticFeatureModel(const ::inflection::util::ULocale& lo`
`37`	`37`
`38`	`38`	`SemanticFeatureModel::~SemanticFeatureModel()`
`39`	`39`	`{`
`40`		`- delete defaultDisplayFunction;`
`41`	`40`	`for (const auto& defaultFeatureFunction : defaultFeatureFunctions) {`
`42`	`41`	`delete defaultFeatureFunction.second;`
`43`	`42`	`}`
`@@ -119,13 +118,12 @@ void SemanticFeatureModel::putDefaultFeatureFunctionByName(::std::u16string_view`
`119`	`118`
`120`	`119`	`const DefaultDisplayFunction* SemanticFeatureModel::getDefaultDisplayFunction() const`
`121`	`120`	`{`
`122`		`- return defaultDisplayFunction;`
	`121`	`+ return defaultDisplayFunction.get();`
`123`	`122`	`}`
`124`	`123`
`125`	`124`	`void SemanticFeatureModel::setDefaultDisplayFunction(DefaultDisplayFunction* defaultDisplayFunction)`
`126`	`125`	`{`
`127`		`- delete this->defaultDisplayFunction;`
`128`		`- this->defaultDisplayFunction = defaultDisplayFunction;`
	`126`	`+ this->defaultDisplayFunction.reset(defaultDisplayFunction);`
`129`	`127`	`}`
`130`	`128`
`131`	`129`	`::std::vector<SemanticFeature*> SemanticFeatureModel::createDefaultSemanticFeatures(const ::inflection::util::ULocale& locale)`