Do not use shared_ptr for comment blocks

Author: adazem009

include/scratchcpp/comment.h

@@ -20,8 +20,8 @@ class LIBSCRATCHCPP_EXPORT Comment : public Entity
         const std::string &blockId() const;
         void setBlockId(const std::string id);
 
-        std::shared_ptr<Block> block() const;
-        void setBlock(std::shared_ptr<Block> block);
+        Block *block() const;
+        void setBlock(Block *block);
 
         double x() const;
         void setX(double x);

src/engine/internal/engine.cpp

@@ -182,7 +182,7 @@ void Engine::resolveIds()
             block->setComment(comment);
 
             if (comment) {
-                comment->setBlock(block);
+                comment->setBlock(block.get());
                 assert(comment->blockId() == block->id());
             }
         }

src/scratch/comment.cpp

@@ -28,13 +28,13 @@ void Comment::setBlockId(const std::string id)
 }
 
 /*! Returns the block the comment is attached to. */
-std::shared_ptr<Block> Comment::block() const
+Block *Comment::block() const
 {
     return impl->block;
 }
 
 /*! Sets the block the comment is attached to. */
-void Comment::setBlock(std::shared_ptr<Block> block)
+void Comment::setBlock(Block *block)
 {
     impl->block = block;
 

src/scratch/comment_p.h

@@ -16,7 +16,7 @@ struct CommentPrivate
         CommentPrivate(const CommentPrivate &) = delete;
 
         std::string blockId;
-        std::shared_ptr<Block> block;
+        Block *block = nullptr;
         double x = 0;
         double y = 0;
         double width = 200;

test/load_project/load_project_test.cpp

@@ -424,7 +424,7 @@ TEST(LoadProjectTest, LoadTestProject)
         auto commentBlock = sprite2->blockAt(sprite2->findBlock("e"));
         ASSERT_EQ(comment->id(), "w");
         ASSERT_EQ(comment->blockId(), "e");
-        ASSERT_EQ(comment->block(), commentBlock);
+        ASSERT_EQ(comment->block(), commentBlock.get());
         ASSERT_EQ(comment->x(), 247.3981475830078);
         ASSERT_EQ(comment->y(), 208);
         ASSERT_EQ(comment->width(), 189.62969970703125);

test/scratch_classes/comment_test.cpp

@@ -29,8 +29,8 @@ TEST(CommentTest, Block)
     ASSERT_TRUE(comment.blockId().empty());
 
     auto block = std::make_shared<Block>("abc", "");
-    comment.setBlock(block);
-    ASSERT_EQ(comment.block(), block);
+    comment.setBlock(block.get());
+    ASSERT_EQ(comment.block(), block.get());
     ASSERT_EQ(comment.blockId(), "abc");
 
     comment.setBlock(nullptr);