diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-06-15 17:58:15 +0900 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-17 15:50:45 +0000 |
| commit | 09800956191c90035872cbc18cd304fee043c710 (patch) | |
| tree | 9d255ad7629fedc181e8b5cf965a3075a328caaf /slideshow | |
| parent | 9cc52266bd1a4d01552675f151ce2da8c5210f84 (diff) | |
Replace boost::scoped_array<T> with std::unique_ptr<T[]>
This may reduce some degree of dependency on boost.
Done by running a script like:
git grep -l '#include *.boost/scoped_array.hpp.' \
| xargs sed -i -e 's@#include *.boost/scoped_array.hpp.@#include <memory>@'
git grep -l '\(boost::\)\?scoped_array<\([^<>]*\)>' \
| xargs sed -i -e 's/\(boost::\)\?scoped_array<\([^<>]*\)>/std::unique_ptr<\2[]>/'
... and then killing duplicate or unnecessary includes,
while changing manually
m_xOutlineStylesCandidates in xmloff/source/text/txtimp.cxx,
extensions/source/ole/unoconversionutilities.hxx, and
extensions/source/ole/oleobjw.cxx.
Change-Id: I3955ed3ad99b94499a7bd0e6e3a09078771f9bfd
Reviewed-on: https://gerrit.libreoffice.org/16289
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/sp_debug.cxx | 1 | ||||
| -rw-r--r-- | slideshow/source/engine/transitions/randomwipe.hxx | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/slideshow/source/engine/sp_debug.cxx b/slideshow/source/engine/sp_debug.cxx index a94980958199..660df09203b2 100644 --- a/slideshow/source/engine/sp_debug.cxx +++ b/slideshow/source/engine/sp_debug.cxx @@ -32,7 +32,6 @@ #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS) #include <boost/assert.hpp> -#include <boost/scoped_array.hpp> #include <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> #include <boost/detail/lightweight_mutex.hpp> diff --git a/slideshow/source/engine/transitions/randomwipe.hxx b/slideshow/source/engine/transitions/randomwipe.hxx index c7100e733694..bafde24edd1b 100644 --- a/slideshow/source/engine/transitions/randomwipe.hxx +++ b/slideshow/source/engine/transitions/randomwipe.hxx @@ -22,7 +22,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/point/b2dpoint.hxx> -#include <boost/scoped_array.hpp> +#include <memory> #include "parametricpolypolygon.hxx" #include "transitiontools.hxx" @@ -39,7 +39,7 @@ public: false: generates a dissolve wipe */ ); virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE; private: - ::boost::scoped_array< ::basegfx::B2DPoint > m_positions; + ::std::unique_ptr< ::basegfx::B2DPoint []> m_positions; sal_Int32 m_nElements; ::basegfx::B2DPolygon m_rect; }; |