diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-09-18 09:29:33 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-18 09:52:37 +0000 |
commit | f36a36b5750d0e3ae88a89013a84dd6f4e4dfdc6 (patch) | |
tree | 99dfae1d8b3f93c9d81191cf87d1abf1ab53f075 | |
parent | boost->std (diff) | |
download | core-f36a36b5750d0e3ae88a89013a84dd6f4e4dfdc6.tar.gz core-f36a36b5750d0e3ae88a89013a84dd6f4e4dfdc6.zip |
boost->std
Change-Id: Idac11d3a634ba0a899db605449c894d4c3a61ead
Reviewed-on: https://gerrit.libreoffice.org/18680
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | fpicker/source/office/asyncfilepicker.cxx | 4 | ||||
-rw-r--r-- | fpicker/source/win32/filepicker/asyncrequests.hxx | 8 | ||||
-rw-r--r-- | fpicker/source/win32/filepicker/filepickerstate.cxx | 7 | ||||
-rw-r--r-- | vcl/inc/pch/precompiled_vcl.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/win/salbmp.h | 4 | ||||
-rw-r--r-- | vcl/osx/DataFlavorMapping.hxx | 3 |
6 files changed, 12 insertions, 15 deletions
diff --git a/fpicker/source/office/asyncfilepicker.cxx b/fpicker/source/office/asyncfilepicker.cxx index 6150b44f6a8a..e99665b36128 100644 --- a/fpicker/source/office/asyncfilepicker.cxx +++ b/fpicker/source/office/asyncfilepicker.cxx @@ -23,7 +23,7 @@ #include "svtools/fileview.hxx" #include <tools/debug.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> namespace svt @@ -76,7 +76,7 @@ namespace svt if ( nMaxTimeout <= nMinTimeout ) nMaxTimeout = nMinTimeout + 30000; - boost::scoped_ptr< FileViewAsyncAction > pActionDescriptor; + std::unique_ptr< FileViewAsyncAction > pActionDescriptor; if ( nMinTimeout ) { pActionDescriptor.reset( new FileViewAsyncAction ); diff --git a/fpicker/source/win32/filepicker/asyncrequests.hxx b/fpicker/source/win32/filepicker/asyncrequests.hxx index 413ff965ea6d..f786bab538eb 100644 --- a/fpicker/source/win32/filepicker/asyncrequests.hxx +++ b/fpicker/source/win32/filepicker/asyncrequests.hxx @@ -26,7 +26,7 @@ #include <osl/thread.hxx> #include <osl/time.h> #include <queue> -#include <boost/shared_ptr.hpp> +#include <memory> namespace fpicker{ namespace win32{ @@ -113,8 +113,8 @@ class Request ::comphelper::SequenceAsHashMap m_lArguments; }; -typedef ::boost::shared_ptr< Request > RequestRef; -typedef ::std::queue< RequestRef > RequestQueue; +typedef std::shared_ptr< Request > RequestRef; +typedef std::queue< RequestRef > RequestQueue; class RequestHandler @@ -125,7 +125,7 @@ class RequestHandler virtual void after() = 0; }; -typedef ::boost::shared_ptr< RequestHandler > RequestHandlerRef; +typedef std::shared_ptr< RequestHandler > RequestHandlerRef; /** @todo document me diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx index 8251ed9fb271..e1e80dcf8ef9 100644 --- a/fpicker/source/win32/filepicker/filepickerstate.cxx +++ b/fpicker/source/win32/filepicker/filepickerstate.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <boost/scoped_ptr.hpp> - #include "filepickerstate.hxx" #include <osl/diagnose.h> #include "controlaccess.hxx" @@ -32,6 +30,7 @@ #include <com/sun/star/uno/XInterface.hpp> #include <osl/file.hxx> #include "FileOpenDlg.hxx" +#include <memory> #include "../misc/WinImplHelper.hxx" @@ -104,7 +103,7 @@ Any SAL_CALL CNonExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int if (m_FirstControlCommand) { // pass the request along the command-chain - boost::scoped_ptr< CControlCommandResult > result( m_FirstControlCommand->handleRequest( &value_request ) ); + std::unique_ptr< CControlCommandResult > result( m_FirstControlCommand->handleRequest( &value_request ) ); OSL_ENSURE( result.get(), "invalid getValue request" ); @@ -168,7 +167,7 @@ OUString SAL_CALL CNonExecuteFilePickerState::getLabel( sal_Int16 aControlId ) CControlCommandRequest label_request( aControlId ); // pass the request along the command-chain - boost::scoped_ptr< CControlCommandResult > result( m_FirstControlCommand->handleRequest( &label_request ) ); + std::unique_ptr< CControlCommandResult > result( m_FirstControlCommand->handleRequest( &label_request ) ); OSL_ENSURE( result->hasResult( ), "invalid getValue request" ); diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index ac10eefbc74e..4d147ed1615e 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -137,7 +137,6 @@ #include <boost/optional.hpp> #include <boost/ptr_container/ptr_vector.hpp> #include <memory> -#include <boost/shared_ptr.hpp> #include <cassert> #include <cmath> #include <com/sun/star/accessibility/AccessibleEventObject.hpp> diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h index 879e44130852..05df37c43b82 100644 --- a/vcl/inc/win/salbmp.h +++ b/vcl/inc/win/salbmp.h @@ -23,7 +23,7 @@ #include <tools/gen.hxx> #include <win/wincomp.hxx> #include <salbmp.hxx> -#include <boost/shared_ptr.hpp> +#include <memory> // - SalBitmap - @@ -32,7 +32,7 @@ class BitmapColor; class BitmapPalette; class SalGraphics; namespace Gdiplus { class Bitmap; } -typedef boost::shared_ptr< Gdiplus::Bitmap > GdiPlusBmpPtr; +typedef std::shared_ptr< Gdiplus::Bitmap > GdiPlusBmpPtr; class WinSalBitmap : public SalBitmap { diff --git a/vcl/osx/DataFlavorMapping.hxx b/vcl/osx/DataFlavorMapping.hxx index b05d12220a00..9632313c8a0b 100644 --- a/vcl/osx/DataFlavorMapping.hxx +++ b/vcl/osx/DataFlavorMapping.hxx @@ -31,7 +31,6 @@ #include <memory> #include <unordered_map> -#include <boost/shared_ptr.hpp> /* An interface to get the clipboard data in either system or OOo format. @@ -123,7 +122,7 @@ private: mutable OfficeOnlyTypes maOfficeOnlyTypes; }; -typedef boost::shared_ptr<DataFlavorMapper> DataFlavorMapperPtr_t; +typedef std::shared_ptr<DataFlavorMapper> DataFlavorMapperPtr_t; #endif // INCLUDED_VCL_OSX_DATAFLAVORMAPPING_HXX |