crwimage_int: remove C pointers

Easier to use references.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Author: neheb

src/crwimage_int.cpp

@@ -134,22 +134,16 @@ const CrwSubDir CrwMap::crwSubDir_[] = {
 CiffComponent::CiffComponent(uint16_t tag, uint16_t dir) : dir_(dir), tag_(tag) {
 }
 
-CiffDirectory::~CiffDirectory() {
-  for (auto&& component : components_) {
-    delete component;
-  }
-}
-
-CiffComponent* CiffComponent::add(UniquePtr component) {
+const CiffComponent::UniquePtr& CiffComponent::add(UniquePtr component) {
   return doAdd(std::move(component));
 }
 
-CiffComponent* CiffEntry::doAdd(UniquePtr /*component*/) {
+const CiffComponent::UniquePtr& CiffEntry::doAdd(UniquePtr /*component*/) {
   throw Error(ErrorCode::kerFunctionNotSupported, "CiffEntry::add");
 }  // CiffEntry::doAdd
 
-CiffComponent* CiffDirectory::doAdd(UniquePtr component) {
-  components_.push_back(component.release());
+const CiffComponent::UniquePtr& CiffDirectory::doAdd(UniquePtr component) {
+  components_.push_back(std::move(component));
   return components_.back();
 }  // CiffDirectory::doAdd
 
@@ -517,20 +511,20 @@ void CiffHeader::add(uint16_t crwTagId, uint16_t crwDir, DataBuf&& buf) {
   if (!pRootDir_) {
     pRootDir_ = std::make_unique<CiffDirectory>();
   }
-  if (auto child = pRootDir_->add(crwDirs, crwTagId)) {
+  if (const auto& child = pRootDir_->add(crwDirs, crwTagId)) {
     child->setValue(std::move(buf));
   }
 }  // CiffHeader::add
 
-CiffComponent* CiffComponent::add(CrwDirs& crwDirs, uint16_t crwTagId) {
+const CiffComponent::UniquePtr& CiffComponent::add(CrwDirs& crwDirs, uint16_t crwTagId) {
   return doAdd(crwDirs, crwTagId);
 }  // CiffComponent::add
 
-CiffComponent* CiffComponent::doAdd(CrwDirs& /*crwDirs*/, uint16_t /*crwTagId*/) {
-  return nullptr;
+const CiffComponent::UniquePtr& CiffComponent::doAdd(CrwDirs& /*crwDirs*/, uint16_t /*crwTagId*/) {
+  throw Error(ErrorCode::kerFunctionNotSupported, "CiffEntry::doAdd");
 }  // CiffComponent::doAdd
 
-CiffComponent* CiffDirectory::doAdd(CrwDirs& crwDirs, uint16_t crwTagId) {
+const CiffComponent::UniquePtr& CiffDirectory::doAdd(CrwDirs& crwDirs, uint16_t crwTagId) {
   /*
     add()
       if stack not empty
@@ -602,7 +596,6 @@ void CiffDirectory::doRemove(CrwDirs& crwDirs, uint16_t crwTagId) {
     // Find the tag
     auto it = std::find_if(components_.begin(), components_.end(), [=](const auto& c) { return c->tag() == crwTagId; });
     if (it != components_.end()) {
-      delete *it;
       components_.erase(it);
     }
   }

src/crwimage_int.hpp

@@ -54,16 +54,14 @@ class CiffComponent {
   //! CiffComponent auto_ptr type
   using UniquePtr = std::unique_ptr<CiffComponent>;
   //! Container type to hold all metadata
-  using Components = std::vector<CiffComponent*>;
+  using Components = std::vector<UniquePtr>;
 
   //! @name Creators
   //@{
   //! Default constructor
   CiffComponent() = default;
   //! Constructor taking a tag and directory
   CiffComponent(uint16_t tag, uint16_t dir);
-  CiffComponent(const CiffComponent&) = delete;
-  CiffComponent& operator=(const CiffComponent&) = delete;
   //! Virtual destructor.
   virtual ~CiffComponent() = default;
   //@}
@@ -73,7 +71,7 @@ class CiffComponent {
   // Default assignment operator is fine
 
   //! Add a component to the composition
-  CiffComponent* add(UniquePtr component);
+  const UniquePtr& add(UniquePtr component);
   /*!
     @brief Add \em crwTagId to the parse tree, if it doesn't exist
            yet. \em crwDirs contains the path of subdirectories, starting
@@ -87,7 +85,7 @@ class CiffComponent {
 
     @return A pointer to the newly added component.
    */
-  CiffComponent* add(CrwDirs& crwDirs, uint16_t crwTagId);
+  const UniquePtr& add(CrwDirs& crwDirs, uint16_t crwTagId);
   /*!
     @brief Remove \em crwTagId from the parse tree, if it exists yet. \em
            crwDirs contains the path of subdirectories, starting with the
@@ -231,9 +229,9 @@ class CiffComponent {
   //! @name Manipulators
   //@{
   //! Implements add()
-  virtual CiffComponent* doAdd(UniquePtr component) = 0;
+  virtual const UniquePtr& doAdd(UniquePtr component) = 0;
   //! Implements add(). The default implementation does nothing.
-  virtual CiffComponent* doAdd(CrwDirs& crwDirs, uint16_t crwTagId);
+  virtual const UniquePtr& doAdd(CrwDirs& crwDirs, uint16_t crwTagId);
   //! Implements remove(). The default implementation does nothing.
   virtual void doRemove(CrwDirs& crwDirs, uint16_t crwTagId);
   //! Implements read(). The default implementation reads a directory entry.
@@ -291,7 +289,7 @@ class CiffEntry : public CiffComponent {
   //@{
   using CiffComponent::doAdd;
   // See base class comment
-  CiffComponent* doAdd(UniquePtr component) override;
+  const UniquePtr& doAdd(UniquePtr component) override;
   /*!
     @brief Implements write(). Writes only the value data of the entry,
            using writeValueData().
@@ -312,15 +310,6 @@ class CiffDirectory : public CiffComponent {
   using CiffComponent::CiffComponent;
 
  public:
-  //! @name Creators
-  //@{
-  //! Virtual destructor
-  ~CiffDirectory() override;
-  //@}
-
-  CiffDirectory(const CiffDirectory&) = delete;
-  CiffDirectory& operator=(const CiffDirectory&) = delete;
-
   //! @name Manipulators
   //@{
   // Default assignment operator is fine
@@ -339,9 +328,9 @@ class CiffDirectory : public CiffComponent {
   //! @name Manipulators
   //@{
   // See base class comment
-  CiffComponent* doAdd(UniquePtr component) override;
+  const UniquePtr& doAdd(UniquePtr component) override;
   // See base class comment
-  CiffComponent* doAdd(CrwDirs& crwDirs, uint16_t crwTagId) override;
+  const UniquePtr& doAdd(CrwDirs& crwDirs, uint16_t crwTagId) override;
   // See base class comment
   void doRemove(CrwDirs& crwDirs, uint16_t crwTagId) override;
   /*!