Update block generation

Author: kharold23

src/model/BlockFactory.h

@@ -42,6 +42,6 @@
 /**
  * @brief General functional for the creation of different types of blocks
  */
-using BlockFactoryFunc = std::function<Block*(int, Model*)>;
+using BlockFactoryFunc = std::function<std::shared_ptr<Block>(int, Model*)>;
 
 #endif

src/model/Model.cpp

@@ -32,8 +32,8 @@
 
 template <typename block_type>
 BlockFactoryFunc block_factory() {
-  return [](int count, Model *model) -> Block * {
-    return new block_type(count, model);
+  return [](int count, Model *model) -> std::shared_ptr<Block>{
+    return std::make_shared<block_type>(count, model);
   };
 }
 
@@ -60,27 +60,27 @@ Model::Model() {
 
 Model::~Model() {}
 
-Block *Model::create_block(const std::string &block_type) {
+std::shared_ptr<Block> Model::create_block(const std::string &block_type) {
   // Get block from factory
   auto it = block_factory_map.find(block_type);
   if (it == block_factory_map.end()) {
     throw std::runtime_error("Invalid block type " + block_type);
   }
-  Block *block = it->second(block_count, this);
+  std::shared_ptr<Block> block = it->second(block_count, this);
   return block;
 }
 
-int Model::add_block(Block *block, const std::string_view &name,
+int Model::add_block(std::shared_ptr<Block> block, const std::string_view &name,
                      const std::vector<int> &block_param_ids, bool internal) {
   // Set global parameter IDs
   block->setup_params_(block_param_ids);
 
   auto name_string = static_cast<std::string>(name);
 
   if (internal) {
-    hidden_blocks.push_back(std::shared_ptr<Block>(block));
+    hidden_blocks.push_back(block);
   } else {
-    blocks.push_back(std::shared_ptr<Block>(block));
+    blocks.push_back(block);
   }
 
   block_types.push_back(block->block_type);

src/model/Model.h

@@ -99,7 +99,7 @@ class Model {
    * @param block_name The block name (defined in block_factory_map)
    * @return int Global ID of the block
    */
-  Block *create_block(const std::string &block_name);
+  std::shared_ptr<Block> create_block(const std::string &block_name);
 
   /**
    * @brief Add a block to the model (without parameters)
@@ -110,7 +110,7 @@ class Model {
    * @param internal Toggle whether block is internal
    * @return int Global ID of the block
    */
-  int add_block(Block *block, const std::string_view &name,
+  int add_block(std::shared_ptr<Block> block, const std::string_view &name,
                 const std::vector<int> &block_param_ids, bool internal = false);
 
   /**