mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I364d6252f470dcc6d71a191f1249e95ca1f284ce
This commit is contained in:
Stephan Bergmann
2014-09-24 17:48:49 +02:00
parent 5de8a127cd
commit c91dec0dad
12 changed files with 27 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
comphelper/source/container/enumerablemap.cxx
View File

@@ -39,9 +39,10 @@
#include <typelib/typedescription.hxx>
#include <map>
#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
#include <memory>
#include <utility>
#include <boost/noncopyable.hpp>
namespace comphelper
{
@@ -93,8 +94,8 @@ namespace comphelper
{
Type m_aKeyType;
Type m_aValueType;
::std::auto_ptr< KeyedValues > m_pValues;
::boost::shared_ptr< IKeyPredicateLess > m_pKeyCompare;
::std::unique_ptr< KeyedValues > m_pValues;
::std::shared_ptr< IKeyPredicateLess > m_pKeyCompare;
bool m_bMutable;
MapListeners m_aModListeners;
@@ -333,7 +334,7 @@ namespace comphelper
private:
// since we share our mutex with the main map, we need to keep it alive as long as we live
Reference< XInterface > m_xKeepMapAlive;
::std::auto_ptr< MapData > m_pMapDataCopy;
::std::unique_ptr< MapData > m_pMapDataCopy;
MapEnumerator m_aEnumerator;
};
@@ -388,14 +389,14 @@ namespace comphelper
throw IllegalTypeException("Unsupported value type.", *this );
// create the comparator for the KeyType, and throw if the type is not supported
::std::auto_ptr< IKeyPredicateLess > pComparator( getStandardLessPredicate( aKeyType, NULL ) );
::std::unique_ptr< IKeyPredicateLess > pComparator( getStandardLessPredicate( aKeyType, NULL ) );
if ( !pComparator.get() )
throw IllegalTypeException("Unsupported key type.", *this );
// init members
m_aData.m_aKeyType = aKeyType;
m_aData.m_aValueType = aValueType;
m_aData.m_pKeyCompare = pComparator;
m_aData.m_pKeyCompare = std::move(pComparator);
m_aData.m_pValues.reset( new KeyedValues( *m_aData.m_pKeyCompare ) );
m_aData.m_bMutable = bMutable;

6
comphelper/source/misc/anycompare.cxx
View File

@@ -176,11 +176,9 @@ namespace comphelper
};
::std::auto_ptr< IKeyPredicateLess > getStandardLessPredicate( Type const & i_type, Reference< XCollator > const & i_collator )
::std::unique_ptr< IKeyPredicateLess > getStandardLessPredicate( Type const & i_type, Reference< XCollator > const & i_collator )
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< IKeyPredicateLess > pComparator;
SAL_WNODEPRECATED_DECLARATIONS_POP
::std::unique_ptr< IKeyPredicateLess > pComparator;
switch ( i_type.getTypeClass() )
{
case TypeClass_CHAR:

10
comphelper/source/property/MasterPropertySet.cxx
View File

@@ -45,7 +45,7 @@ AutoOGuardArray::AutoOGuardArray( sal_Int32 nNumElements ) : mpGuardArray(new bo
AutoOGuardArray::~AutoOGuardArray()
{
//!! release auto_ptr's and thus the mutexes locks
//!! release scoped_ptr's and thus the mutexes locks
delete [] mpGuardArray;
}
@@ -216,9 +216,9 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< OUString >&
const OUString * pString = aPropertyNames.getConstArray();
PropertyDataHash::const_iterator aEnd = mpInfo->maMap.end(), aIter;
//!! have an auto_ptr to an array of OGuards in order to have the
//!! have a scoped_ptr to an array of OGuards in order to have the
//!! allocated memory properly freed (exception safe!).
//!! Since the array itself has auto_ptrs as members we have to use a
//!! Since the array itself has scoped_ptrs as members we have to use a
//!! helper class 'AutoOGuardArray' in order to have
//!! the acquired locks properly released.
AutoOGuardArray aOGuardArray( nCount );
@@ -281,9 +281,9 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< O
const OUString * pString = aPropertyNames.getConstArray();
PropertyDataHash::const_iterator aEnd = mpInfo->maMap.end(), aIter;
//!! have an auto_ptr to an array of OGuards in order to have the
//!! have an scoped_ptr to an array of OGuards in order to have the
//!! allocated memory properly freed (exception safe!).
//!! Since the array itself has auto_ptrs as members we have to use a
//!! Since the array itself has scoped_ptrs as members we have to use a
//!! helper class 'AutoOGuardArray' in order to have
//!! the acquired locks properly released.
AutoOGuardArray aOGuardArray( nCount );

2
comphelper/source/property/opropertybag.hxx
View File

@@ -77,7 +77,7 @@ namespace comphelper
{
private:
/// our IPropertyArrayHelper implementation
::std::auto_ptr< ::cppu::OPropertyArrayHelper >
::std::unique_ptr< ::cppu::OPropertyArrayHelper >
m_pArrayHelper;
::comphelper::PropertyBag
m_aDynamicProperties;

8
extensions/source/propctrlr/eformshelper.cxx
View File

@@ -243,9 +243,7 @@ namespace pcr
{
if ( !_bDoListen )
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > pListenerIterator = m_aPropertyListeners.createIterator();
SAL_WNODEPRECATED_DECLARATIONS_POP
::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > pListenerIterator = m_aPropertyListeners.createIterator();
while ( pListenerIterator->hasMoreElements() )
{
PropertyEventTranslation* pTranslator = dynamic_cast< PropertyEventTranslation* >( pListenerIterator->next() );
@@ -279,9 +277,7 @@ namespace pcr
}
else
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > pListenerIterator = m_aPropertyListeners.createIterator();
SAL_WNODEPRECATED_DECLARATIONS_POP
::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > pListenerIterator = m_aPropertyListeners.createIterator();
while ( pListenerIterator->hasMoreElements() )
{
Reference< XPropertyChangeListener > xListener( pListenerIterator->next(), UNO_QUERY );

6
extensions/source/propctrlr/propertyhandler.cxx
View File

@@ -78,10 +78,8 @@ namespace pcr
return;
// remove all old property change listeners
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > removeListener = m_aPropertyListeners.createIterator();
::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > readdListener = m_aPropertyListeners.createIterator(); // will copy the container as needed
SAL_WNODEPRECATED_DECLARATIONS_POP
::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > removeListener = m_aPropertyListeners.createIterator();
::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > readdListener = m_aPropertyListeners.createIterator(); // will copy the container as needed
while ( removeListener->hasMoreElements() )
removePropertyChangeListener( static_cast< XPropertyChangeListener* >( removeListener->next() ) );
OSL_ENSURE( m_aPropertyListeners.empty(), "PropertyHandler::inspect: derived classes are expected to forward the removePropertyChangeListener call to their base class (me)!" );

2
include/comphelper/anycompare.hxx
View File

@@ -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

6
include/comphelper/listenernotification.hxx
View File

@@ -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 );

2
include/comphelper/namedvaluecollection.hxx
View File

@@ -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();

2
include/comphelper/officeresourcebundle.hxx
View File

@@ -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

2
include/comphelper/propertybag.hxx
View File

@@ -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();

2
toolkit/source/controls/grid/sortablegriddatamodel.cxx
View File

@@ -559,7 +559,7 @@ private:
}
// get predicate object
::std::auto_ptr< ::comphelper::IKeyPredicateLess > const pPredicate( ::comphelper::getStandardLessPredicate( dataType, m_collator ) );
::std::unique_ptr< ::comphelper::IKeyPredicateLess > const pPredicate( ::comphelper::getStandardLessPredicate( dataType, m_collator ) );
ENSURE_OR_RETURN_FALSE( pPredicate.get(), "SortableGridDataModel::impl_reIndex_nothrow: no sortable data found!" );
// then sort