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 <typelib/typedescription.hxx>
#include <map> #include <map>
#include <boost/noncopyable.hpp> #include <memory>
#include <boost/shared_ptr.hpp> #include <utility>
#include <boost/noncopyable.hpp>
namespace comphelper namespace comphelper
{ {
@@ -93,8 +94,8 @@ namespace comphelper
{ {
Type m_aKeyType; Type m_aKeyType;
Type m_aValueType; Type m_aValueType;
::std::auto_ptr< KeyedValues > m_pValues; ::std::unique_ptr< KeyedValues > m_pValues;
::boost::shared_ptr< IKeyPredicateLess > m_pKeyCompare; ::std::shared_ptr< IKeyPredicateLess > m_pKeyCompare;
bool m_bMutable; bool m_bMutable;
MapListeners m_aModListeners; MapListeners m_aModListeners;
@@ -333,7 +334,7 @@ namespace comphelper
private: private:
// since we share our mutex with the main map, we need to keep it alive as long as we live // since we share our mutex with the main map, we need to keep it alive as long as we live
Reference< XInterface > m_xKeepMapAlive; Reference< XInterface > m_xKeepMapAlive;
::std::auto_ptr< MapData > m_pMapDataCopy; ::std::unique_ptr< MapData > m_pMapDataCopy;
MapEnumerator m_aEnumerator; MapEnumerator m_aEnumerator;
}; };
@@ -388,14 +389,14 @@ namespace comphelper
throw IllegalTypeException("Unsupported value type.", *this ); throw IllegalTypeException("Unsupported value type.", *this );
// create the comparator for the KeyType, and throw if the type is not supported // 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() ) if ( !pComparator.get() )
throw IllegalTypeException("Unsupported key type.", *this ); throw IllegalTypeException("Unsupported key type.", *this );
// init members // init members
m_aData.m_aKeyType = aKeyType; m_aData.m_aKeyType = aKeyType;
m_aData.m_aValueType = aValueType; 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_pValues.reset( new KeyedValues( *m_aData.m_pKeyCompare ) );
m_aData.m_bMutable = bMutable; 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::unique_ptr< IKeyPredicateLess > pComparator;
::std::auto_ptr< IKeyPredicateLess > pComparator;
SAL_WNODEPRECATED_DECLARATIONS_POP
switch ( i_type.getTypeClass() ) switch ( i_type.getTypeClass() )
{ {
case TypeClass_CHAR: 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() AutoOGuardArray::~AutoOGuardArray()
{ {
//!! release auto_ptr's and thus the mutexes locks //!! release scoped_ptr's and thus the mutexes locks
delete [] mpGuardArray; delete [] mpGuardArray;
} }
@@ -216,9 +216,9 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< OUString >&
const OUString * pString = aPropertyNames.getConstArray(); const OUString * pString = aPropertyNames.getConstArray();
PropertyDataHash::const_iterator aEnd = mpInfo->maMap.end(), aIter; 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!). //!! 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 //!! helper class 'AutoOGuardArray' in order to have
//!! the acquired locks properly released. //!! the acquired locks properly released.
AutoOGuardArray aOGuardArray( nCount ); AutoOGuardArray aOGuardArray( nCount );
@@ -281,9 +281,9 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< O
const OUString * pString = aPropertyNames.getConstArray(); const OUString * pString = aPropertyNames.getConstArray();
PropertyDataHash::const_iterator aEnd = mpInfo->maMap.end(), aIter; 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!). //!! 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 //!! helper class 'AutoOGuardArray' in order to have
//!! the acquired locks properly released. //!! the acquired locks properly released.
AutoOGuardArray aOGuardArray( nCount ); AutoOGuardArray aOGuardArray( nCount );

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

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

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

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

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

@@ -78,10 +78,8 @@ namespace pcr
return; return;
// remove all old property change listeners // remove all old property change listeners
SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > removeListener = m_aPropertyListeners.createIterator();
::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > removeListener = m_aPropertyListeners.createIterator(); ::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > readdListener = m_aPropertyListeners.createIterator(); // will copy the container as needed
::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > readdListener = m_aPropertyListeners.createIterator(); // will copy the container as needed
SAL_WNODEPRECATED_DECLARATIONS_POP
while ( removeListener->hasMoreElements() ) while ( removeListener->hasMoreElements() )
removePropertyChangeListener( static_cast< XPropertyChangeListener* >( removeListener->next() ) ); 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)!" ); 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 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. 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( getStandardLessPredicate(
::com::sun::star::uno::Type const & i_type, ::com::sun::star::uno::Type const & i_type,
::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > const & i_collator ::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 /** creates an iterator for looping through all registered listeners
*/ */
SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > createIterator()
::std::auto_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; return pIterator;
} }
SAL_WNODEPRECATED_DECLARATIONS_POP
protected: protected:
OListenerContainer( ::osl::Mutex& _rMutex ); OListenerContainer( ::osl::Mutex& _rMutex );

2
include/comphelper/namedvaluecollection.hxx
View File

@@ -45,7 +45,7 @@ namespace comphelper
class COMPHELPER_DLLPUBLIC NamedValueCollection class COMPHELPER_DLLPUBLIC NamedValueCollection
{ {
private: private:
::std::auto_ptr< NamedValueCollection_Impl > m_pImpl; ::std::unique_ptr< NamedValueCollection_Impl > m_pImpl;
public: public:
NamedValueCollection(); NamedValueCollection();

2
include/comphelper/officeresourcebundle.hxx
View File

@@ -41,7 +41,7 @@ namespace comphelper
class COMPHELPER_DLLPUBLIC OfficeResourceBundle class COMPHELPER_DLLPUBLIC OfficeResourceBundle
{ {
private: private:
::std::auto_ptr< ResourceBundle_Impl > m_pImpl; ::std::unique_ptr< ResourceBundle_Impl > m_pImpl;
public: public:
/** constructs a resource bundle with the resource bundle given as 8-bit ASCII name /** 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 class COMPHELPER_DLLPUBLIC PropertyBag : protected OPropertyContainerHelper
{ {
private: private:
::std::auto_ptr< PropertyBag_Impl > m_pImpl; ::std::unique_ptr< PropertyBag_Impl > m_pImpl;
public: public:
PropertyBag(); PropertyBag();

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

@@ -559,7 +559,7 @@ private:
} }
// get predicate object // 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!" ); ENSURE_OR_RETURN_FALSE( pPredicate.get(), "SortableGridDataModel::impl_reIndex_nothrow: no sortable data found!" );
// then sort // then sort