diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-20 21:27:01 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-20 22:43:52 +0200 |
| commit | cd74d49de55e87a4e801e8a245d198ea51d0ec34 (patch) | |
| tree | 01f0afd36edcacdbca76440d19f8555311358b6a /include/svtools | |
| parent | 1fc105cec523a081f18ca78fff43e58e3a881232 (diff) | |
svtools: replace boost::ptr_vector with std::vector<std::unique_ptr>
Change-Id: I895c950c11499afb278b989565f3eae33aaf4a76
Diffstat (limited to 'include/svtools')
| -rw-r--r-- | include/svtools/treelist.hxx | 2 | ||||
| -rw-r--r-- | include/svtools/treelistentries.hxx | 5 | ||||
| -rw-r--r-- | include/svtools/treelistentry.hxx | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx index c12cf85caf9d..510014ab507c 100644 --- a/include/svtools/treelist.hxx +++ b/include/svtools/treelist.hxx @@ -109,7 +109,7 @@ class SVT_DLLPUBLIC SvTreeList SVT_DLLPRIVATE void SetAbsolutePositions(); SVT_DLLPRIVATE void CloneChildren( - SvTreeListEntries& rDst, sal_uLong& rCloneCount, SvTreeListEntries& rSrc, SvTreeListEntry* pNewParent) const; + SvTreeListEntries& rDst, sal_uLong& rCloneCount, SvTreeListEntries& rSrc, SvTreeListEntry& rNewParent) const; /** * Invalidate the cached position data to have them re-generated before diff --git a/include/svtools/treelistentries.hxx b/include/svtools/treelistentries.hxx index 051be7658c61..a7880f87d237 100644 --- a/include/svtools/treelistentries.hxx +++ b/include/svtools/treelistentries.hxx @@ -10,10 +10,11 @@ #ifndef INCLUDED_SVTOOLS_TREELISTENTRIES_HXX #define INCLUDED_SVTOOLS_TREELISTENTRIES_HXX -#include <boost/ptr_container/ptr_vector.hpp> +#include <vector> +#include <memory> class SvTreeListEntry; -typedef boost::ptr_vector<SvTreeListEntry> SvTreeListEntries; +typedef std::vector<std::unique_ptr<SvTreeListEntry>> SvTreeListEntries; #endif diff --git a/include/svtools/treelistentry.hxx b/include/svtools/treelistentry.hxx index 2fcd6282673a..640aaf34c0d4 100644 --- a/include/svtools/treelistentry.hxx +++ b/include/svtools/treelistentry.hxx @@ -57,7 +57,7 @@ class SVT_DLLPUBLIC SvTreeListEntry typedef std::vector<std::unique_ptr<SvLBoxItem>> ItemsType; SvTreeListEntry* pParent; - SvTreeListEntries maChildren; + SvTreeListEntries m_Children; sal_uLong nAbsPos; sal_uLong nListPos; ItemsType m_Items; @@ -82,8 +82,8 @@ public: bool HasChildListPos() const; sal_uLong GetChildListPos() const; - SvTreeListEntries& GetChildEntries() { return maChildren;} - const SvTreeListEntries& GetChildEntries() const { return maChildren;} + SvTreeListEntries& GetChildEntries() { return m_Children; } + const SvTreeListEntries& GetChildEntries() const { return m_Children; } void Clone(SvTreeListEntry* pSource); |