diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-06 09:46:57 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-06 16:45:13 +0000 |
| commit | c7258cfccdf9f4c5235da1b135801f957a5b0ec1 (patch) | |
| tree | d5af5085ad1327afe2d41045ea452e017fea1fb6 /comphelper | |
| parent | 027c383584bff4ea2aa7aa2b9e294e614087f28f (diff) | |
shared_ptr<T>(new T(args)) -> make_shared<T>(args)
and boost:make_shared->std::make_shared
Change-Id: Ic1e187c52c856a7b27817967b2caa8920f23a98d
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/misc/configuration.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/comphelper/source/misc/configuration.cxx b/comphelper/source/misc/configuration.cxx index 29970ffcd1fd..7468c5592c62 100644 --- a/comphelper/source/misc/configuration.cxx +++ b/comphelper/source/misc/configuration.cxx @@ -10,8 +10,8 @@ #include <sal/config.h> #include <cassert> +#include <memory> -#include <boost/shared_ptr.hpp> #include <com/sun/star/configuration/ReadOnlyAccess.hpp> #include <com/sun/star/configuration/ReadWriteAccess.hpp> #include <com/sun/star/configuration/XReadWriteAccess.hpp> @@ -66,14 +66,13 @@ OUString extendLocalizedPath(OUString const & path, OUString const & locale) { } -boost::shared_ptr< comphelper::ConfigurationChanges > +std::shared_ptr< comphelper::ConfigurationChanges > comphelper::ConfigurationChanges::create( css::uno::Reference< css::uno::XComponentContext > const & context) { return TheConfigurationWrapper::get(context).createChanges(); } - comphelper::ConfigurationChanges::~ConfigurationChanges() {} void comphelper::ConfigurationChanges::commit() const { @@ -129,7 +128,7 @@ css::uno::Any comphelper::detail::ConfigurationWrapper::getPropertyValue( } void comphelper::detail::ConfigurationWrapper::setPropertyValue( - boost::shared_ptr< ConfigurationChanges > const & batch, + std::shared_ptr< ConfigurationChanges > const & batch, OUString const & path, com::sun::star::uno::Any const & value) const { assert(batch.get() != 0); @@ -145,7 +144,7 @@ comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue( } void comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue( - boost::shared_ptr< ConfigurationChanges > const & batch, + std::shared_ptr< ConfigurationChanges > const & batch, OUString const & path, com::sun::star::uno::Any const & value) const { assert(batch.get() != 0); @@ -165,7 +164,7 @@ comphelper::detail::ConfigurationWrapper::getGroupReadOnly( css::uno::Reference< css::container::XHierarchicalNameReplace > comphelper::detail::ConfigurationWrapper::getGroupReadWrite( - boost::shared_ptr< ConfigurationChanges > const & batch, + std::shared_ptr< ConfigurationChanges > const & batch, OUString const & path) const { assert(batch.get() != 0); @@ -185,16 +184,16 @@ comphelper::detail::ConfigurationWrapper::getSetReadOnly( css::uno::Reference< css::container::XNameContainer > comphelper::detail::ConfigurationWrapper::getSetReadWrite( - boost::shared_ptr< ConfigurationChanges > const & batch, + std::shared_ptr< ConfigurationChanges > const & batch, OUString const & path) const { assert(batch.get() != 0); return batch->getSet(path); } -boost::shared_ptr< comphelper::ConfigurationChanges > +std::shared_ptr< comphelper::ConfigurationChanges > comphelper::detail::ConfigurationWrapper::createChanges() const { - return boost::shared_ptr< ConfigurationChanges >( + return std::shared_ptr< ConfigurationChanges >( new ConfigurationChanges(context_)); } |