From a1ceacc17e3f30d5e9c06b3218ad8ec26ca2f1b9 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sun, 15 Feb 2015 20:41:33 +0000
Subject: boost::foo_ptr->std::foo_ptr

Change-Id: I9219619b538b6530a89f5932ac51eb3b62eb396a
---
 include/toolkit/awt/animatedimagespeer.hxx  | 5 ++---
 include/toolkit/controls/animatedimages.hxx | 9 ++-------
 include/toolkit/controls/unocontrols.hxx    | 6 +++---
 3 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'include/toolkit')

diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx
index 4c9e63a797b0..15dcac26e7eb 100644
--- a/include/toolkit/awt/animatedimagespeer.hxx
+++ b/include/toolkit/awt/animatedimagespeer.hxx
@@ -27,9 +27,8 @@
 
 #include <cppuhelper/implbase3.hxx>
 
-#include <boost/scoped_ptr.hpp>
 #include <boost/noncopyable.hpp>
-
+#include <memory>
 
 namespace toolkit
 {
@@ -87,7 +86,7 @@ namespace toolkit
         void    impl_updateImages_nolck( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_animatedImages );
 
     private:
-        ::boost::scoped_ptr< AnimatedImagesPeer_Data >   m_pData;
+        std::unique_ptr< AnimatedImagesPeer_Data >   m_xData;
     };
 
 
diff --git a/include/toolkit/controls/animatedimages.hxx b/include/toolkit/controls/animatedimages.hxx
index 813f1919abd7..1a31b2aaa80c 100644
--- a/include/toolkit/controls/animatedimages.hxx
+++ b/include/toolkit/controls/animatedimages.hxx
@@ -22,15 +22,11 @@
 
 #include <toolkit/controls/unocontrolbase.hxx>
 #include <toolkit/controls/unocontrolmodel.hxx>
-
 #include <com/sun/star/awt/XAnimatedImages.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-
 #include <cppuhelper/implbase1.hxx>
-
-#include <boost/scoped_ptr.hpp>
-
+#include <memory>
 
 namespace toolkit
 {
@@ -83,8 +79,7 @@ namespace toolkit
         void SAL_CALL                   setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE;
 
     private:
-        ::boost::scoped_ptr< AnimatedImagesControlModel_Data >
-                m_pData;
+        std::unique_ptr< AnimatedImagesControlModel_Data > m_xData;
     };
 
 
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index 079f70671565..e87800bef0b4 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -55,9 +55,9 @@
 #include <comphelper/uno3.hxx>
 
 #include <list>
+#include <memory>
 #include <vector>
 
-#include <boost/scoped_ptr.hpp>
 #include <boost/optional.hpp>
 
 #define UNO_NAME_GRAPHOBJ_URLPREFIX                             "vnd.sun.star.GraphicObject:"
@@ -825,8 +825,8 @@ private:
     void    impl_setStringItemList_nolck( const ::std::vector< OUString >& i_rStringItems );
 
 protected:
-    ::boost::scoped_ptr< UnoControlListBoxModel_Data >  m_pData;
-    ::cppu::OInterfaceContainerHelper                   m_aItemListListeners;
+    std::unique_ptr<UnoControlListBoxModel_Data>  m_xData;
+    ::cppu::OInterfaceContainerHelper             m_aItemListListeners;
 };
 
 
-- 
cgit