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 /include/comphelper/configuration.hxx | |
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 'include/comphelper/configuration.hxx')
-rw-r--r-- | include/comphelper/configuration.hxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/comphelper/configuration.hxx b/include/comphelper/configuration.hxx index 9be907c2ef69..74ed03226722 100644 --- a/include/comphelper/configuration.hxx +++ b/include/comphelper/configuration.hxx @@ -14,12 +14,12 @@ #include <boost/noncopyable.hpp> #include <boost/optional.hpp> -#include <boost/shared_ptr.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> #include <comphelper/comphelperdllapi.h> #include <comphelper/processfactory.hxx> #include <sal/types.h> +#include <memory> namespace com { namespace sun { namespace star { namespace configuration { class XReadWriteAccess; } @@ -45,7 +45,7 @@ namespace detail { class ConfigurationWrapper; } /// directly. class COMPHELPER_DLLPUBLIC ConfigurationChanges: private boost::noncopyable { public: - static boost::shared_ptr< ConfigurationChanges > create( + static std::shared_ptr<ConfigurationChanges> create( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context = comphelper::getProcessComponentContext()); @@ -94,7 +94,7 @@ public: com::sun::star::uno::Any getPropertyValue(OUString const & path) const; void setPropertyValue( - boost::shared_ptr< ConfigurationChanges > const & batch, + std::shared_ptr< ConfigurationChanges > const & batch, OUString const & path, com::sun::star::uno::Any const & value) const; @@ -102,7 +102,7 @@ public: OUString const & path) const; void setLocalizedPropertyValue( - boost::shared_ptr< ConfigurationChanges > const & batch, + std::shared_ptr< ConfigurationChanges > const & batch, OUString const & path, com::sun::star::uno::Any const & value) const; @@ -113,7 +113,7 @@ public: com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameReplace > getGroupReadWrite( - boost::shared_ptr< ConfigurationChanges > const & batch, + std::shared_ptr< ConfigurationChanges > const & batch, OUString const & path) const; com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > @@ -121,10 +121,10 @@ public: com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > getSetReadWrite( - boost::shared_ptr< ConfigurationChanges > const & batch, + std::shared_ptr< ConfigurationChanges > const & batch, OUString const & path) const; - boost::shared_ptr< ConfigurationChanges > createChanges() const; + std::shared_ptr< ConfigurationChanges > createChanges() const; private: com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > @@ -199,7 +199,7 @@ template< typename T, typename U > struct ConfigurationProperty: /// For nillable properties, U is of type boost::optional<U'>. static void set( U const & value, - boost::shared_ptr< ConfigurationChanges > const & batch, + std::shared_ptr< ConfigurationChanges > const & batch, com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context = comphelper::getProcessComponentContext()) { @@ -245,7 +245,7 @@ template< typename T, typename U > struct ConfigurationLocalizedProperty: /// For nillable properties, U is of type boost::optional<U'>. static void set( U const & value, - boost::shared_ptr< ConfigurationChanges > const & batch, + std::shared_ptr< ConfigurationChanges > const & batch, com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context = comphelper::getProcessComponentContext()) { @@ -278,7 +278,7 @@ template< typename T > struct ConfigurationGroup: private boost::noncopyable { /// modifications via the given changes batch. static com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameReplace > - get(boost::shared_ptr< ConfigurationChanges > const & batch, + get(std::shared_ptr< ConfigurationChanges > const & batch, com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context = comphelper::getProcessComponentContext()) { @@ -311,7 +311,7 @@ template< typename T > struct ConfigurationSet: private boost::noncopyable { /// modifications via the given changes batch. static com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > - get(boost::shared_ptr< ConfigurationChanges > const & batch, + get(std::shared_ptr< ConfigurationChanges > const & batch, com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context = comphelper::getProcessComponentContext()) { |