From 82f02d7248f5959409a9a90f936649d602905067 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 9 Jan 2015 16:23:36 +0000
Subject: boost::scoped_ptr->std::unique_ptr

Change-Id: I844532d08123ed0c91ccec73cc806277fd821089
---
 avmedia/source/viewer/mediawindow.cxx      | 14 +++++++-------
 avmedia/source/viewer/mediawindow_impl.hxx |  2 +-
 avmedia/source/vlc/vlcmanager.hxx          |  6 +++---
 include/avmedia/mediaitem.hxx              |  5 ++---
 include/avmedia/mediawindow.hxx            |  4 ++--
 include/basebmp/bitmapdevice.hxx           |  4 ++--
 6 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 22326a60fdff..7912bf5ddef5 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -20,7 +20,6 @@
 #include <stdio.h>
 
 #include <avmedia/mediawindow.hxx>
-#include <boost/scoped_ptr.hpp>
 #include "mediawindow_impl.hxx"
 #include "mediamisc.hxx"
 #include "mediawindow.hrc"
@@ -34,6 +33,7 @@
 #include "com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp"
 #include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
 #include "com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp"
+#include <memory>
 
 #define AVMEDIA_FRAMEGRABBER_DEFAULTFRAME_MEDIATIME 3.0
 
@@ -404,7 +404,7 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL
 {
     uno::Reference< media::XPlayer >    xPlayer( createPlayer( rURL, rReferer, &sMimeType ) );
     uno::Reference< graphic::XGraphic > xRet;
-    boost::scoped_ptr< Graphic > apGraphic;
+    std::unique_ptr< Graphic > xGraphic;
 
     if( xPlayer.is() )
     {
@@ -428,19 +428,19 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL
             if( !aPrefSize.Width && !aPrefSize.Height )
             {
                 const BitmapEx aBmpEx( getAudioLogo() );
-                apGraphic.reset( new Graphic( aBmpEx ) );
+                xGraphic.reset( new Graphic( aBmpEx ) );
             }
         }
     }
 
-    if( !xRet.is() && !apGraphic.get() )
+    if( !xRet.is() && !xGraphic.get() )
     {
         const BitmapEx aBmpEx( getEmptyLogo() );
-        apGraphic.reset( new Graphic( aBmpEx ) );
+        xGraphic.reset( new Graphic( aBmpEx ) );
     }
 
-    if( apGraphic.get() )
-        xRet = apGraphic->GetXGraphic();
+    if( xGraphic.get() )
+        xRet = xGraphic->GetXGraphic();
 
     return xRet;
 }
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index ce2c24bb9ab9..c5c65fa41aa0 100644
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -173,7 +173,7 @@ namespace avmedia
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >   mxEventsIf;
             MediaEventListenersImpl*                                                mpEvents;
             bool                                                                    mbEventTransparent;
-            boost::scoped_ptr<MediaChildWindow>                                     mpChildWindow;
+            std::unique_ptr<MediaChildWindow>                                       mpChildWindow;
             MediaWindowControl*                                                     mpMediaWindowControl;
             BitmapEx*                                                               mpEmptyBmpEx;
             BitmapEx*                                                               mpAudioBmpEx;
diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx
index 36eebceb9e2c..f9b1a1c81816 100644
--- a/avmedia/source/vlc/vlcmanager.hxx
+++ b/avmedia/source/vlc/vlcmanager.hxx
@@ -19,10 +19,10 @@
 
 #ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCMANAGER_HXX
 #define INCLUDED_AVMEDIA_SOURCE_VLC_VLCMANAGER_HXX
-#include <boost/scoped_ptr.hpp>
 #include <com/sun/star/media/XManager.hpp>
 #include "vlccommon.hxx"
 #include "wrapper/Wrapper.hxx"
+#include <memory>
 
 namespace avmedia {
 namespace vlc {
@@ -30,7 +30,7 @@ namespace vlc {
 class Manager : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XManager,
                                                     ::com::sun::star::lang::XServiceInfo >
 {
-    boost::scoped_ptr<wrapper::Instance> mInstance;
+    std::unique_ptr<wrapper::Instance> mInstance;
     wrapper::EventHandler mEventHandler;
 public:
     Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
@@ -55,4 +55,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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;
     };
 }
 
diff --git a/include/basebmp/bitmapdevice.hxx b/include/basebmp/bitmapdevice.hxx
index 600eabe548ff..48c6d474c809 100644
--- a/include/basebmp/bitmapdevice.hxx
+++ b/include/basebmp/bitmapdevice.hxx
@@ -25,11 +25,11 @@
 #include <basebmp/scanlineformats.hxx>
 #include <basebmp/basebmpdllapi.h>
 
-#include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/shared_array.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/noncopyable.hpp>
+#include <memory>
 #include <vector>
 
 namespace basegfx
@@ -656,7 +656,7 @@ private:
 
     BitmapDeviceSharedPtr getGenericRenderer() const;
 
-    boost::scoped_ptr< ImplBitmapDevice > mpImpl;
+    std::unique_ptr< ImplBitmapDevice > mpImpl;
 };
 
 /** Function to create a BitmapDevice for given scanline format
-- 
cgit