diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-01-09 16:23:36 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-09 17:38:02 +0000 |
| commit | 82f02d7248f5959409a9a90f936649d602905067 (patch) | |
| tree | 4d0770429e8f3fb22fabcd6ffafcd2b37368bcc5 /include/avmedia | |
| parent | loplugin:cstylecast: warn about certain redundant reinterpret_casts (diff) | |
| download | core-82f02d7248f5959409a9a90f936649d602905067.tar.gz core-82f02d7248f5959409a9a90f936649d602905067.zip | |
boost::scoped_ptr->std::unique_ptr
Change-Id: I844532d08123ed0c91ccec73cc806277fd821089
Diffstat (limited to 'include/avmedia')
| -rw-r--r-- | include/avmedia/mediaitem.hxx | 5 | ||||
| -rw-r--r-- | include/avmedia/mediawindow.hxx | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx index e3300b31d4c6..84cb4246ca8f 100644 --- a/include/avmedia/mediaitem.hxx +++ b/include/avmedia/mediaitem.hxx @@ -20,14 +20,13 @@ #ifndef INCLUDED_AVMEDIA_MEDIAITEM_HXX #define INCLUDED_AVMEDIA_MEDIAITEM_HXX -#include <boost/scoped_ptr.hpp> - #include <tools/rtti.hxx> #include <svl/poolitem.hxx> #include <com/sun/star/media/ZoomLevel.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <avmedia/avmediadllapi.h> +#include <memory> #define AVMEDIA_SETMASK_NONE ((sal_uInt32)(0x00000000)) #define AVMEDIA_SETMASK_STATE ((sal_uInt32)(0x00000001)) @@ -120,7 +119,7 @@ public: private: struct Impl; - ::boost::scoped_ptr<Impl> m_pImpl; + std::unique_ptr<Impl> m_pImpl; }; typedef ::avmedia::MediaItem avmedia_MediaItem; diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx index 1ab2c0552fa6..71cf1fafa147 100644 --- a/include/avmedia/mediawindow.hxx +++ b/include/avmedia/mediawindow.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_AVMEDIA_MEDIAWINDOW_HXX #define INCLUDED_AVMEDIA_MEDIAWINDOW_HXX +#include <memory> #include <vector> -#include <boost/scoped_ptr.hpp> #include <tools/gen.hxx> #include <com/sun/star/media/ZoomLevel.hpp> #include <com/sun/star/media/XPlayer.hpp> @@ -117,7 +117,7 @@ namespace avmedia AVMEDIA_DLLPRIVATE MediaWindow& operator =( const MediaWindow& ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxIFace; - boost::scoped_ptr<priv::MediaWindowImpl> mpImpl; + std::unique_ptr<priv::MediaWindowImpl> mpImpl; }; } |