Block: Return by reference where possible

Author: adazem009

include/scratchcpp/block.h

@@ -27,15 +27,15 @@ class LIBSCRATCHCPP_EXPORT Block : public Entity
 
         void compile(Compiler *compiler);
 
-        std::string opcode() const;
+        const std::string &opcode() const;
 
         std::shared_ptr<Block> next() const;
-        std::string nextId() const;
+        const std::string &nextId() const;
         void setNext(std::shared_ptr<Block> block);
         void setNextId(const std::string &nextId);
 
         std::shared_ptr<Block> parent() const;
-        std::string parentId() const;
+        const std::string &parentId() const;
         void setParent(std::shared_ptr<Block> block);
         void setParentId(const std::string &id);
 
@@ -57,7 +57,7 @@ class LIBSCRATCHCPP_EXPORT Block : public Entity
         bool topLevel() const;
 
         std::shared_ptr<Comment> comment() const;
-        std::string commentId() const;
+        const std::string &commentId() const;
         void setComment(std::shared_ptr<Comment> comment);
         void setCommentId(const std::string &commentId);
 

src/scratch/block.cpp

@@ -24,7 +24,7 @@ void Block::compile(Compiler *compiler)
 }
 
 /*! Returns the opcode. */
-std::string Block::opcode() const
+const std::string &Block::opcode() const
 {
     return impl->opcode;
 }
@@ -101,7 +101,7 @@ std::shared_ptr<Block> Block::next() const
 }
 
 /*! Returns the ID of the next block. */
-std::string Block::nextId() const
+const std::string &Block::nextId() const
 {
     return impl->nextId;
 }
@@ -131,7 +131,7 @@ std::shared_ptr<Block> Block::parent() const
 }
 
 /*! Returns the ID of the parent block. */
-std::string Block::parentId() const
+const std::string &Block::parentId() const
 {
     return impl->parentId;
 }
@@ -301,7 +301,7 @@ std::shared_ptr<Comment> Block::comment() const
 }
 
 /*! Returns the ID of the comment which is attached to this block. */
-std::string Block::commentId() const
+const std::string &Block::commentId() const
 {
     return impl->commentId;
 }