Kaydet (Commit) 64144c28 authored tarafından Caolán McNamara's avatar Caolán McNamara

boost->std

Change-Id: I787ff19fd41d5ecee56efa1aa7ee539f46650703
Reviewed-on: https://gerrit.libreoffice.org/18703Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst dd38f640
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
#include <boost/mem_fn.hpp> #include <boost/mem_fn.hpp>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/spirit/include/classic_core.hpp> #include <boost/spirit/include/classic_core.hpp>
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>
......
...@@ -28,9 +28,8 @@ ...@@ -28,9 +28,8 @@
#include <com/sun/star/presentation/XSlideShow.hpp> #include <com/sun/star/presentation/XSlideShow.hpp>
#include <boost/scoped_ptr.hpp>
#include <functional> #include <functional>
#include <memory>
#include <vector> #include <vector>
namespace slideshow { namespace internal { namespace slideshow { namespace internal {
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#include "slideshowcontext.hxx" #include "slideshowcontext.hxx"
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace com::sun::star; using namespace com::sun::star;
...@@ -116,7 +116,7 @@ bool importShapeGraphic( ...@@ -116,7 +116,7 @@ bool importShapeGraphic(
// no special string found, graphic must be // no special string found, graphic must be
// external. Load via GraphicIm porter // external. Load via GraphicIm porter
INetURLObject aTmp( aURL ); INetURLObject aTmp( aURL );
boost::scoped_ptr<SvStream> pGraphicStream( std::unique_ptr<SvStream> pGraphicStream(
utl::UcbStreamHelper::CreateStream( utl::UcbStreamHelper::CreateStream(
aTmp.GetMainURL( INetURLObject::NO_DECODE ), aTmp.GetMainURL( INetURLObject::NO_DECODE ),
StreamMode::READ ) ); StreamMode::READ ) );
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
#include <vcl/vclptr.hxx> #include <vcl/vclptr.hxx>
#include "viewlayer.hxx" #include "viewlayer.hxx"
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#if defined(BOOST_SP_ENABLE_DEBUG_HOOKS) #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
#include <boost/assert.hpp> #include <boost/assert.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/detail/lightweight_mutex.hpp> #include <boost/detail/lightweight_mutex.hpp>
#include <canvas/debug.hxx> #include <canvas/debug.hxx>
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "vieweventhandler.hxx" #include "vieweventhandler.hxx"
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp> #include <memory>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp> #include <boost/weak_ptr.hpp>
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
...@@ -727,7 +727,7 @@ public: ...@@ -727,7 +727,7 @@ public:
bool notifyHyperlinkClicked( OUString const& hyperLink ); bool notifyHyperlinkClicked( OUString const& hyperLink );
private: private:
boost::scoped_ptr<EventMultiplexerImpl> mpImpl; std::unique_ptr<EventMultiplexerImpl> mpImpl;
}; };
} // namespace internal } // namespace internal
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "viewupdate.hxx" #include "viewupdate.hxx"
#include "unoviewcontainer.hxx" #include "unoviewcontainer.hxx"
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp> #include <memory>
/* Definition of ScreenUpdater class */ /* Definition of ScreenUpdater class */
...@@ -128,7 +128,7 @@ namespace slideshow ...@@ -128,7 +128,7 @@ namespace slideshow
private: private:
struct ImplScreenUpdater; struct ImplScreenUpdater;
boost::scoped_ptr<ImplScreenUpdater> mpImpl; std::unique_ptr<ImplScreenUpdater> mpImpl;
}; };
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment