Skip to content

C
core
Kaydet (Commit) ee8e81ad authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

ucb: std::auto_ptr -> std::unique_ptr 

Change-Id: I779b7a172cecd927f7d18fcbbc0f898f18089d0a
üst b0f43c62
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 85 deletions
ucb/source/ucp/tdoc/tdoc_stgelems.hxx
Dosyayı görüntüle @ ee8e81ad
......@@ -301,7 +301,7 @@ private:
StorageElementFactory::StorageMap::iterator m_aContainerIt;
friend class StorageElementFactory;
friend class std::auto_ptr< Storage >;
friend class std::unique_ptr< Storage >;
};
......
ucb/source/ucp/tdoc/tdoc_storage.cxx
Dosyayı görüntüle @ ee8e81ad
......@@ -180,7 +180,7 @@ StorageElementFactory::createStorage( const OUString & rUri,
bool bWritable = ( ( eMode == READ_WRITE_NOCREATE )
|| ( eMode == READ_WRITE_CREATE ) );
std::auto_ptr< Storage > xElement(
std::unique_ptr< Storage > xElement(
new Storage( m_xContext, this, aUriKey, xParentStorage, xStorage ) );
aIt = m_aMap.insert(
......
ucb/source/ucp/webdav-neon/ContentProperties.cxx
Dosyayı görüntüle @ ee8e81ad
......@@ -581,9 +581,7 @@ CachableContentProperties::CachableContentProperties(
void CachableContentProperties::addProperties(
const ContentProperties & rProps )
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
const std::auto_ptr< PropertyValueMap > & props = rProps.getProperties();
SAL_WNODEPRECATED_DECLARATIONS_POP
const std::unique_ptr< PropertyValueMap > & props = rProps.getProperties();
PropertyValueMap::const_iterator it = props->begin();
const PropertyValueMap::const_iterator end = props->end();
......
ucb/source/ucp/webdav-neon/ContentProperties.hxx
Dosyayı görüntüle @ ee8e81ad
......@@ -158,12 +158,12 @@ public:
// Not good to expose implementation details, but this is actually an
// internal class.
const std::auto_ptr< PropertyValueMap > & getProperties() const
const std::unique_ptr< PropertyValueMap > & getProperties() const
{ return m_xProps; }
private:
OUString m_aEscapedTitle;
std::auto_ptr< PropertyValueMap > m_xProps;
std::unique_ptr< PropertyValueMap > m_xProps;
bool m_bTrailingSlash;
static com::sun::star::uno::Any m_aEmptyAny;
......
ucb/source/ucp/webdav-neon/DAVSession.hxx
Dosyayı görüntüle @ ee8e81ad
......@@ -210,12 +210,7 @@ private:
oslInterlockedCount m_nRefCount;
friend class DAVSessionFactory;
#if defined ( _MSC_VER ) && _MSC_VER < 1310
friend struct std::auto_ptr< DAVSession >;
// work around compiler bug...
#else // WNT
friend class std::auto_ptr< DAVSession >;
#endif // WNT
friend struct std::default_delete< DAVSession >;
};
} // namespace webdav_ucp
......
ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx
Dosyayı görüntüle @ ee8e81ad
......@@ -66,7 +66,7 @@ rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession(
{
NeonUri aURI( inUri );
std::auto_ptr< DAVSession > xElement(
std::unique_ptr< DAVSession > xElement(
new NeonSession( this, inUri, rFlags, *m_xProxyDecider.get() ) );
aIt = m_aMap.insert( Map::value_type( inUri, xElement.get() ) ).first;
......
ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
Dosyayı görüntüle @ ee8e81ad
......@@ -73,7 +73,7 @@ private:
Map m_aMap;
osl::Mutex m_aMutex;
std::auto_ptr< ucbhelper::InternetProxyDecider > m_xProxyDecider;
std::unique_ptr< ucbhelper::InternetProxyDecider > m_xProxyDecider;
::uno::Reference< ::uno::XComponentContext > m_xContext;
......
ucb/source/ucp/webdav-neon/webdavcontent.cxx
Dosyayı görüntüle @ ee8e81ad
......@@ -545,9 +545,7 @@ uno::Any SAL_CALL Content::execute(
// {
try
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
SAL_WNODEPRECATED_DECLARATIONS_POP
std::unique_ptr< DAVResourceAccess > xResAccess;
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) );
......@@ -736,9 +734,7 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
{
try
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
SAL_WNODEPRECATED_DECLARATIONS_POP
std::unique_ptr< DAVResourceAccess > xResAccess;
{
osl::MutexGuard aGuard( m_aMutex );
xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) );
......@@ -827,9 +823,7 @@ void Content::addProperty( const ucb::PropertyCommandArgument& aCmdArg,
try
{
// Set property value at server.
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
SAL_WNODEPRECATED_DECLARATIONS_POP
std::unique_ptr< DAVResourceAccess > xResAccess;
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) );
......@@ -919,9 +913,7 @@ void Content::removeProperty( const OUString& Name,
aProppatchValues.push_back( aValue );
// Remove property value from server.
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
SAL_WNODEPRECATED_DECLARATIONS_POP
std::unique_ptr< DAVResourceAccess > xResAccess;
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) );
......@@ -1203,9 +1195,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
else
{
// Append all standard UCB, DAV and HTTP properties.
SAL_WNODEPRECATED_DECLARATIONS_PUSH
const std::auto_ptr< PropertyValueMap > & xProps = rData.getProperties();
SAL_WNODEPRECATED_DECLARATIONS_POP
const std::unique_ptr< PropertyValueMap > & xProps = rData.getProperties();
PropertyValueMap::const_iterator it = xProps->begin();
PropertyValueMap::const_iterator end = xProps->end();
......@@ -1238,11 +1228,9 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
const uno::Reference< ucb::XCommandEnvironment >& xEnv )
throw ( uno::Exception, std::exception )
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ContentProperties > xProps;
std::auto_ptr< ContentProperties > xCachedProps;
std::auto_ptr< DAVResourceAccess > xResAccess;
SAL_WNODEPRECATED_DECLARATIONS_POP
std::unique_ptr< ContentProperties > xProps;
std::unique_ptr< ContentProperties > xCachedProps;
std::unique_ptr< DAVResourceAccess > xResAccess;
OUString aUnescapedTitle;
bool bHasAll = false;
uno::Reference< ucb::XContentIdentifier > xIdentifier;
......@@ -1551,9 +1539,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
uno::Reference< ucb::XContentIdentifier > xIdentifier;
rtl::Reference< ContentProvider > xProvider;
bool bTransient;
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
SAL_WNODEPRECATED_DECLARATIONS_POP
std::unique_ptr< DAVResourceAccess > xResAccess;
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
......@@ -2013,9 +1999,7 @@ uno::Any Content::open(
// PUSH: write data
try
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
SAL_WNODEPRECATED_DECLARATIONS_POP
std::unique_ptr< DAVResourceAccess > xResAccess;
{
osl::MutexGuard aGuard( m_aMutex );
......@@ -2061,9 +2045,7 @@ uno::Any Content::open(
// PULL: wait for client read
try
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
SAL_WNODEPRECATED_DECLARATIONS_POP
std::unique_ptr< DAVResourceAccess > xResAccess;
{
osl::MutexGuard aGuard( m_aMutex );
......@@ -2135,9 +2117,7 @@ void Content::post(
{
try
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
SAL_WNODEPRECATED_DECLARATIONS_POP
std::unique_ptr< DAVResourceAccess > xResAccess;
{
osl::MutexGuard aGuard( m_aMutex );
xResAccess.reset(
......@@ -2171,9 +2151,7 @@ void Content::post(
{
try
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
SAL_WNODEPRECATED_DECLARATIONS_POP
std::unique_ptr< DAVResourceAccess > xResAccess;
{
osl::MutexGuard aGuard( m_aMutex );
xResAccess.reset(
......@@ -2272,9 +2250,7 @@ void Content::insert(
{
bool bTransient, bCollection;
OUString aEscapedTitle;
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
SAL_WNODEPRECATED_DECLARATIONS_POP
std::unique_ptr< DAVResourceAccess > xResAccess;
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
......@@ -2515,9 +2491,7 @@ void Content::transfer(
{
uno::Reference< ucb::XContentIdentifier > xIdentifier;
uno::Reference< ucb::XContentProvider > xProvider;
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
SAL_WNODEPRECATED_DECLARATIONS_POP
std::unique_ptr< DAVResourceAccess > xResAccess;
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
......@@ -2802,9 +2776,7 @@ void Content::lock(
{
try
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
SAL_WNODEPRECATED_DECLARATIONS_POP
std::unique_ptr< DAVResourceAccess > xResAccess;
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) );
......@@ -2845,9 +2817,7 @@ void Content::unlock(
{
try
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
SAL_WNODEPRECATED_DECLARATIONS_POP
std::unique_ptr< DAVResourceAccess > xResAccess;
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) );
......@@ -3153,7 +3123,7 @@ void Content::cancelCommandExecution(
SAL_WNODEPRECATED_DECLARATIONS_PUSH
const OUString
Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess )
Content::getBaseURI( const std::unique_ptr< DAVResourceAccess > & rResAccess )
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
......@@ -3184,7 +3154,7 @@ Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess )
Content::ResourceType Content::getResourceType(
const uno::Reference< ucb::XCommandEnvironment >& xEnv,
const std::auto_ptr< DAVResourceAccess > & rResAccess,
const std::unique_ptr< DAVResourceAccess > & rResAccess,
bool * networkAccessAllowed)
throw ( uno::Exception, std::exception )
{
......@@ -3272,9 +3242,7 @@ Content::ResourceType Content::getResourceType(
const uno::Reference< ucb::XCommandEnvironment >& xEnv )
throw ( uno::Exception, std::exception )
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
SAL_WNODEPRECATED_DECLARATIONS_POP
std::unique_ptr< DAVResourceAccess > xResAccess;
{
osl::MutexGuard aGuard( m_aMutex );
xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) );
......
ucb/source/ucp/webdav-neon/webdavcontent.hxx
Dosyayı görüntüle @ ee8e81ad
......@@ -84,8 +84,8 @@ class Content : public ::ucbhelper::ContentImplHelper,
DAV
};
std::auto_ptr< DAVResourceAccess > m_xResAccess;
std::auto_ptr< CachableContentProperties >
std::unique_ptr< DAVResourceAccess > m_xResAccess;
std::unique_ptr< CachableContentProperties >
m_xCachedProps; // locally cached props
OUString m_aEscapedTitle;
ResourceType m_eResourceType;
......@@ -131,24 +131,20 @@ private:
exchangeIdentity( const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XContentIdentifier >& xNewId );
SAL_WNODEPRECATED_DECLARATIONS_PUSH
const OUString
getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess );
SAL_WNODEPRECATED_DECLARATIONS_POP
getBaseURI( const std::unique_ptr< DAVResourceAccess > & rResAccess );
ResourceType
getResourceType( const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XCommandEnvironment >& xEnv )
throw ( ::com::sun::star::uno::Exception, std::exception );
SAL_WNODEPRECATED_DECLARATIONS_PUSH
ResourceType
getResourceType( const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XCommandEnvironment >& xEnv,
const std::auto_ptr< DAVResourceAccess > & rResAccess,
const std::unique_ptr< DAVResourceAccess > & rResAccess,
bool * networkAccessAllowed = 0)
throw ( ::com::sun::star::uno::Exception, std::exception );
SAL_WNODEPRECATED_DECLARATIONS_POP
// Command "open"
com::sun::star::uno::Any open(
......
ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
Dosyayı görüntüle @ ee8e81ad
......@@ -299,10 +299,8 @@ uno::Sequence< beans::Property > Content::getProperties(
const uno::Reference< ucb::XCommandEnvironment > & xEnv )
{
bool bTransient;
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
std::auto_ptr< ContentProperties > xCachedProps;
SAL_WNODEPRECATED_DECLARATIONS_POP
std::unique_ptr< DAVResourceAccess > xResAccess;
std::unique_ptr< ContentProperties > xCachedProps;
rtl::Reference< ContentProvider > xProvider;
{
......@@ -481,10 +479,8 @@ uno::Sequence< beans::Property > Content::getProperties(
const std::set< OUString >::const_iterator set_end
= aPropSet.end();
SAL_WNODEPRECATED_DECLARATIONS_PUSH
const std::auto_ptr< PropertyValueMap > & xProps
const std::unique_ptr< PropertyValueMap > & xProps
= xCachedProps->getProperties();
SAL_WNODEPRECATED_DECLARATIONS_POP
PropertyValueMap::const_iterator map_it = xProps->begin();
const PropertyValueMap::const_iterator map_end = xProps->end();
......
ucb/source/ucp/webdav/DAVSession.hxx
Dosyayı görüntüle @ ee8e81ad
......@@ -203,7 +203,7 @@ private:
oslInterlockedCount m_nRefCount;
friend class DAVSessionFactory;
friend class std::auto_ptr< DAVSession >;
friend struct std::default_delete< DAVSession >;
};
} // namespace http_dav_ucp
......
ucb/source/ucp/webdav/DAVSessionFactory.cxx
Dosyayı görüntüle @ ee8e81ad
......@@ -54,7 +54,7 @@ rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession(
{
SerfUri aURI( inUri );
std::auto_ptr< DAVSession > xElement(
std::unique_ptr< DAVSession > xElement(
new SerfSession( this, inUri, *m_xProxyDecider.get() ) );
aIt = m_aMap.insert( Map::value_type( inUri, xElement.get() ) ).first;
......
ucb/source/ucp/webdav/DAVSessionFactory.hxx
Dosyayı görüntüle @ ee8e81ad
......@@ -61,7 +61,7 @@ private:
Map m_aMap;
osl::Mutex m_aMutex;
std::auto_ptr< ucbhelper::InternetProxyDecider > m_xProxyDecider;
std::unique_ptr< ucbhelper::InternetProxyDecider > m_xProxyDecider;
void releaseElement( DAVSession * pElement );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment