comphelper: std::auto_ptr -> std::unique_ptr

Change-Id: I364d6252f470dcc6d71a191f1249e95ca1f284ce

5 files changed, 6 insertions, 8 deletions

diff --git a/include/comphelper/anycompare.hxx b/include/comphelper/anycompare.hxx
index 263531ba249e..9216b4854771 100644
--- a/include/comphelper/anycompare.hxx
+++ b/include/comphelper/anycompare.hxx
@@ -204,7 +204,7 @@ namespace comphelper
             a default implementation of IKeyPredicateLess, which is able to compare values of the given type. If no
             such default implementation is known for the given type, then <NULL/> is returned.
     */
-    ::std::auto_ptr< IKeyPredicateLess > COMPHELPER_DLLPUBLIC
+    ::std::unique_ptr< IKeyPredicateLess > COMPHELPER_DLLPUBLIC
         getStandardLessPredicate(
             ::com::sun::star::uno::Type const & i_type,
             ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > const & i_collator
diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx
index 38409eaa54f2..a2b6d35a7e86 100644
--- a/include/comphelper/listenernotification.hxx
+++ b/include/comphelper/listenernotification.hxx
@@ -84,13 +84,11 @@ namespace comphelper
 
         /** creates an iterator for looping through all registered listeners
         */
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > createIterator()
+        ::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > createIterator()
         {
-            ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > pIterator( new ::cppu::OInterfaceIteratorHelper( m_aListeners ) );
+            ::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > pIterator( new ::cppu::OInterfaceIteratorHelper( m_aListeners ) );
             return pIterator;
         }
-        SAL_WNODEPRECATED_DECLARATIONS_POP
 
     protected:
                 OListenerContainer( ::osl::Mutex& _rMutex );
diff --git a/include/comphelper/namedvaluecollection.hxx b/include/comphelper/namedvaluecollection.hxx
index bcd7ab7c31a2..0889654bb350 100644
--- a/include/comphelper/namedvaluecollection.hxx
+++ b/include/comphelper/namedvaluecollection.hxx
@@ -45,7 +45,7 @@ namespace comphelper
     class COMPHELPER_DLLPUBLIC NamedValueCollection
     {
     private:
-        ::std::auto_ptr< NamedValueCollection_Impl >    m_pImpl;
+        ::std::unique_ptr< NamedValueCollection_Impl >    m_pImpl;
 
     public:
         NamedValueCollection();
diff --git a/include/comphelper/officeresourcebundle.hxx b/include/comphelper/officeresourcebundle.hxx
index f893fbb84d72..1a40551f505a 100644
--- a/include/comphelper/officeresourcebundle.hxx
+++ b/include/comphelper/officeresourcebundle.hxx
@@ -41,7 +41,7 @@ namespace comphelper
     class COMPHELPER_DLLPUBLIC OfficeResourceBundle
     {
     private:
-        ::std::auto_ptr< ResourceBundle_Impl >  m_pImpl;
+        ::std::unique_ptr< ResourceBundle_Impl >  m_pImpl;
 
     public:
         /** constructs a resource bundle with the resource bundle given as 8-bit ASCII name
diff --git a/include/comphelper/propertybag.hxx b/include/comphelper/propertybag.hxx
index 573f0efd2ecc..484246a11d17 100644
--- a/include/comphelper/propertybag.hxx
+++ b/include/comphelper/propertybag.hxx
@@ -42,7 +42,7 @@ namespace comphelper
     class COMPHELPER_DLLPUBLIC PropertyBag : protected OPropertyContainerHelper
     {
     private:
-        ::std::auto_ptr< PropertyBag_Impl > m_pImpl;
+        ::std::unique_ptr< PropertyBag_Impl > m_pImpl;
 
     public:
         PropertyBag();