diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-08 10:38:32 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-08 10:38:32 (GMT) |
commit | 0aadb2f3e79f7aec63d8de43534916bb7358f135 (patch) | |
tree | 211b939b77c914eea991e4a619fc0ae0e8c5d3d5 /src/entry.h | |
parent | ef06c8d14c7889e723331601ac847cc481966f5c (diff) | |
parent | 6d4835dbe01a27923db8a1e4559b61da5065cb7a (diff) | |
download | Doxygen-0aadb2f3e79f7aec63d8de43534916bb7358f135.zip Doxygen-0aadb2f3e79f7aec63d8de43534916bb7358f135.tar.gz Doxygen-0aadb2f3e79f7aec63d8de43534916bb7358f135.tar.bz2 |
Merge branch 'master' into feature/bug_coverity_unint
Diffstat (limited to 'src/entry.h')
-rw-r--r-- | src/entry.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/entry.h b/src/entry.h index 9d4ae9d..0391075 100644 --- a/src/entry.h +++ b/src/entry.h @@ -202,26 +202,26 @@ class Entry /*! Returns the list of children for this Entry * @see addSubEntry() and removeSubEntry() */ - const std::vector< std::unique_ptr<Entry> > &children() const { return m_sublist; } + const std::vector< std::shared_ptr<Entry> > &children() const { return m_sublist; } /*! @name add entry as a child and pass ownership. * @note This makes the entry passed invalid! (TODO: tclscanner.l still has use after move!) * @{ */ void moveToSubEntryAndKeep(Entry* e); - void moveToSubEntryAndKeep(std::unique_ptr<Entry> &e); + void moveToSubEntryAndKeep(std::shared_ptr<Entry> &e); /*! @} */ /*! @name add entry as a child, pass ownership and reinitialize entry */ void moveToSubEntryAndRefresh(Entry* &e); - void moveToSubEntryAndRefresh(std::unique_ptr<Entry> &e); + void moveToSubEntryAndRefresh(std::shared_ptr<Entry> &e); /*! take \a child of of to list of children and move it into \a moveTo */ - void moveFromSubEntry(const Entry *child,std::unique_ptr<Entry> &moveTo); + void moveFromSubEntry(const Entry *child,std::shared_ptr<Entry> &moveTo); /*! make a copy of \a e and add it as a child to this entry */ void copyToSubEntry (Entry* e); - void copyToSubEntry (const std::unique_ptr<Entry> &e); + void copyToSubEntry (const std::shared_ptr<Entry> &e); /*! Removes entry \a e from the list of children. * The entry will be deleted if found. @@ -332,7 +332,7 @@ class Entry private: Entry *m_parent; //!< parent node in the tree - std::vector< std::unique_ptr<Entry> > m_sublist; + std::vector< std::shared_ptr<Entry> > m_sublist; Entry &operator=(const Entry &); FileDef *m_fileDef; }; |