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 /extensions/source/scanner | |
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 'extensions/source/scanner')
-rw-r--r-- | extensions/source/scanner/grid.cxx | 6 | ||||
-rw-r--r-- | extensions/source/scanner/sane.cxx | 12 | ||||
-rw-r--r-- | extensions/source/scanner/sanedlg.cxx | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index 496542f42fad..67a47a6e9394 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -29,7 +29,7 @@ #include <vcl/builderfactory.hxx> #include <algorithm> -#include <boost/scoped_array.hpp> +#include <memory> class GridWindow : public vcl::Window { @@ -392,8 +392,8 @@ void GridWindow::computeNew() int i; // get node arrays - boost::scoped_array<double> nodex(new double[ nSorted ]); - boost::scoped_array<double> nodey(new double[ nSorted ]); + std::unique_ptr<double[]> nodex(new double[ nSorted ]); + std::unique_ptr<double[]> nodey(new double[ nSorted ]); for( i = 0L; i < nSorted; i++ ) transform( m_aHandles[i].maPos, nodex[ i ], nodey[ i ] ); diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index 1a7a1060963f..cde72244d725 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -31,7 +31,7 @@ #include <sys/types.h> #include <sal/config.h> #include <sal/macros.h> -#include <boost/scoped_array.hpp> +#include <memory> #if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL #include <stdarg.h> @@ -359,7 +359,7 @@ bool Sane::GetOptionValue( int n, OString& rRet ) bool bSuccess = false; if( ! maHandle || mppOptions[n]->type != SANE_TYPE_STRING ) return false; - boost::scoped_array<char> pRet(new char[mppOptions[n]->size+1]); + std::unique_ptr<char[]> pRet(new char[mppOptions[n]->size+1]); SANE_Status nStatus = ControlOption( n, SANE_ACTION_GET_VALUE, pRet.get() ); if( nStatus == SANE_STATUS_GOOD ) { @@ -377,7 +377,7 @@ bool Sane::GetOptionValue( int n, double& rRet, int nElement ) mppOptions[n]->type != SANE_TYPE_FIXED ) ) return false; - boost::scoped_array<SANE_Word> pRet(new SANE_Word[mppOptions[n]->size/sizeof(SANE_Word)]); + std::unique_ptr<SANE_Word[]> pRet(new SANE_Word[mppOptions[n]->size/sizeof(SANE_Word)]); SANE_Status nStatus = ControlOption( n, SANE_ACTION_GET_VALUE, pRet.get() ); if( nStatus == SANE_STATUS_GOOD ) { @@ -396,7 +396,7 @@ bool Sane::GetOptionValue( int n, double* pSet ) mppOptions[n]->type == SANE_TYPE_INT ) ) return false; - boost::scoped_array<SANE_Word> pFixedSet(new SANE_Word[mppOptions[n]->size/sizeof(SANE_Word)]); + std::unique_ptr<SANE_Word[]> pFixedSet(new SANE_Word[mppOptions[n]->size/sizeof(SANE_Word)]); SANE_Status nStatus = ControlOption( n, SANE_ACTION_GET_VALUE, pFixedSet.get() ); if( nStatus != SANE_STATUS_GOOD ) return false; @@ -443,7 +443,7 @@ bool Sane::SetOptionValue( int n, double fSet, int nElement ) SANE_Status nStatus; if( mppOptions[n]->size/sizeof(SANE_Word) > 1 ) { - boost::scoped_array<SANE_Word> pSet(new SANE_Word[mppOptions[n]->size/sizeof(SANE_Word)]); + std::unique_ptr<SANE_Word[]> pSet(new SANE_Word[mppOptions[n]->size/sizeof(SANE_Word)]); nStatus = ControlOption( n, SANE_ACTION_GET_VALUE, pSet.get() ); if( nStatus == SANE_STATUS_GOOD ) { @@ -470,7 +470,7 @@ bool Sane::SetOptionValue( int n, double* pSet ) if( ! maHandle || ( mppOptions[n]->type != SANE_TYPE_INT && mppOptions[n]->type != SANE_TYPE_FIXED ) ) return false; - boost::scoped_array<SANE_Word> pFixedSet(new SANE_Word[mppOptions[n]->size/sizeof(SANE_Word)]); + std::unique_ptr<SANE_Word[]> pFixedSet(new SANE_Word[mppOptions[n]->size/sizeof(SANE_Word)]); for( size_t i = 0; i < mppOptions[n]->size/sizeof(SANE_Word); i++ ) { if( mppOptions[n]->type == SANE_TYPE_FIXED ) diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 57e80bbc829d..9078823b2b94 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -28,7 +28,7 @@ #include <math.h> #include <sal/macros.h> #include <rtl/strbuf.hxx> -#include <boost/scoped_array.hpp> +#include <memory> #include "strings.hrc" #define PREVIEW_WIDTH 113 @@ -641,8 +641,8 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton ) case SANE_TYPE_INT: { int nElements = mrSane.GetOptionElements( mnCurrentOption ); - boost::scoped_array<double> x(new double[ nElements ]); - boost::scoped_array<double> y(new double[ nElements ]); + std::unique_ptr<double[]> x(new double[ nElements ]); + std::unique_ptr<double[]> y(new double[ nElements ]); for( int i = 0; i < nElements; i++ ) x[ i ] = (double)i; mrSane.GetOptionValue( mnCurrentOption, y.get() ); |