Kaydet (Commit) 85d7a76a authored tarafından Noel Grandin's avatar Noel Grandin

use unique_ptr for pImpl in ucb/

Change-Id: I9a626a11d665b081a7b05db52955598dbd90721e
üst dfb3be7e
...@@ -165,7 +165,6 @@ UcbStore::UcbStore( const Reference< XComponentContext >& xContext ) ...@@ -165,7 +165,6 @@ UcbStore::UcbStore( const Reference< XComponentContext >& xContext )
// virtual // virtual
UcbStore::~UcbStore() UcbStore::~UcbStore()
{ {
delete m_pImpl;
} }
...@@ -268,7 +267,6 @@ PropertySetRegistry::PropertySetRegistry( ...@@ -268,7 +267,6 @@ PropertySetRegistry::PropertySetRegistry(
// virtual // virtual
PropertySetRegistry::~PropertySetRegistry() PropertySetRegistry::~PropertySetRegistry()
{ {
delete m_pImpl;
} }
...@@ -1156,8 +1154,6 @@ PersistentPropertySet::~PersistentPropertySet() ...@@ -1156,8 +1154,6 @@ PersistentPropertySet::~PersistentPropertySet()
{ {
// deregister at creator. // deregister at creator.
m_pImpl->m_pCreator->remove( this ); m_pImpl->m_pCreator->remove( this );
delete m_pImpl;
} }
// XServiceInfo methods. // XServiceInfo methods.
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include <ucbhelper/macros.hxx> #include <ucbhelper/macros.hxx>
#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase.hxx>
#include <memory>
#define STORE_SERVICE_NAME "com.sun.star.ucb.Store" #define STORE_SERVICE_NAME "com.sun.star.ucb.Store"
...@@ -52,7 +53,7 @@ class UcbStore : public cppu::WeakImplHelper < ...@@ -52,7 +53,7 @@ class UcbStore : public cppu::WeakImplHelper <
css::lang::XInitialization > css::lang::XInitialization >
{ {
css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::uno::XComponentContext > m_xContext;
UcbStore_Impl* m_pImpl; std::unique_ptr<UcbStore_Impl> m_pImpl;
public: public:
explicit UcbStore( const css::uno::Reference< css::uno::XComponentContext >& xContext ); explicit UcbStore( const css::uno::Reference< css::uno::XComponentContext >& xContext );
...@@ -101,7 +102,7 @@ class PropertySetRegistry : public cppu::WeakImplHelper < ...@@ -101,7 +102,7 @@ class PropertySetRegistry : public cppu::WeakImplHelper <
friend class PersistentPropertySet; friend class PersistentPropertySet;
css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::uno::XComponentContext > m_xContext;
PropertySetRegistry_Impl* m_pImpl; std::unique_ptr<PropertySetRegistry_Impl> m_pImpl;
private: private:
css::uno::Reference< css::lang::XMultiServiceFactory > css::uno::Reference< css::lang::XMultiServiceFactory >
...@@ -181,7 +182,7 @@ class PersistentPropertySet : public cppu::WeakImplHelper < ...@@ -181,7 +182,7 @@ class PersistentPropertySet : public cppu::WeakImplHelper <
css::beans::XPropertyAccess > css::beans::XPropertyAccess >
{ {
css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::uno::XComponentContext > m_xContext;
PersistentPropertySet_Impl* m_pImpl; std::unique_ptr<PersistentPropertySet_Impl> m_pImpl;
private: private:
void notifyPropertyChangeEvent( void notifyPropertyChangeEvent(
......
...@@ -1069,14 +1069,13 @@ HierarchyEntry::getRootReadAccess() ...@@ -1069,14 +1069,13 @@ HierarchyEntry::getRootReadAccess()
HierarchyEntry::iterator::iterator() HierarchyEntry::iterator::iterator()
: m_pImpl( new iterator_Impl )
{ {
m_pImpl = new iterator_Impl;
} }
HierarchyEntry::iterator::~iterator() HierarchyEntry::iterator::~iterator()
{ {
delete m_pImpl;
} }
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include <memory>
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
namespace container { namespace container {
...@@ -118,7 +119,7 @@ public: ...@@ -118,7 +119,7 @@ public:
{ {
friend class HierarchyEntry; friend class HierarchyEntry;
iterator_Impl* m_pImpl; std::unique_ptr<iterator_Impl> m_pImpl;
public: public:
iterator(); iterator();
......
...@@ -126,7 +126,6 @@ HierarchyResultSetDataSupplier::HierarchyResultSetDataSupplier( ...@@ -126,7 +126,6 @@ HierarchyResultSetDataSupplier::HierarchyResultSetDataSupplier(
// virtual // virtual
HierarchyResultSetDataSupplier::~HierarchyResultSetDataSupplier() HierarchyResultSetDataSupplier::~HierarchyResultSetDataSupplier()
{ {
delete m_pImpl;
} }
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <com/sun/star/ucb/OpenMode.hpp> #include <com/sun/star/ucb/OpenMode.hpp>
#include <ucbhelper/resultset.hxx> #include <ucbhelper/resultset.hxx>
#include <memory>
namespace hierarchy_ucp { namespace hierarchy_ucp {
...@@ -33,7 +34,7 @@ class HierarchyContent; ...@@ -33,7 +34,7 @@ class HierarchyContent;
class HierarchyResultSetDataSupplier : class HierarchyResultSetDataSupplier :
public ::ucbhelper::ResultSetDataSupplier public ::ucbhelper::ResultSetDataSupplier
{ {
DataSupplier_Impl* m_pImpl; std::unique_ptr<DataSupplier_Impl> m_pImpl;
private: private:
bool checkResult( const HierarchyEntryData& rResult ); bool checkResult( const HierarchyEntryData& rResult );
......
...@@ -129,7 +129,6 @@ DataSupplier::DataSupplier( ...@@ -129,7 +129,6 @@ DataSupplier::DataSupplier(
// virtual // virtual
DataSupplier::~DataSupplier() DataSupplier::~DataSupplier()
{ {
delete m_pImpl;
} }
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <ucbhelper/resultset.hxx> #include <ucbhelper/resultset.hxx>
#include <memory>
namespace package_ucp { namespace package_ucp {
...@@ -30,7 +31,7 @@ class Content; ...@@ -30,7 +31,7 @@ class Content;
class DataSupplier : public ::ucbhelper::ResultSetDataSupplier class DataSupplier : public ::ucbhelper::ResultSetDataSupplier
{ {
DataSupplier_Impl* m_pImpl; std::unique_ptr<DataSupplier_Impl> m_pImpl;
public: public:
DataSupplier( const css::uno::Reference< css::uno::XComponentContext >& rxContext, DataSupplier( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
......
...@@ -119,7 +119,6 @@ ResultSetDataSupplier::ResultSetDataSupplier( ...@@ -119,7 +119,6 @@ ResultSetDataSupplier::ResultSetDataSupplier(
// virtual // virtual
ResultSetDataSupplier::~ResultSetDataSupplier() ResultSetDataSupplier::~ResultSetDataSupplier()
{ {
delete m_pImpl;
} }
// virtual // virtual
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <com/sun/star/ucb/OpenMode.hpp> #include <com/sun/star/ucb/OpenMode.hpp>
#include <ucbhelper/resultset.hxx> #include <ucbhelper/resultset.hxx>
#include <memory>
namespace tdoc_ucp { namespace tdoc_ucp {
...@@ -31,7 +32,7 @@ class Content; ...@@ -31,7 +32,7 @@ class Content;
class ResultSetDataSupplier : public ::ucbhelper::ResultSetDataSupplier class ResultSetDataSupplier : public ::ucbhelper::ResultSetDataSupplier
{ {
DataSupplier_Impl* m_pImpl; std::unique_ptr<DataSupplier_Impl> m_pImpl;
private: private:
bool queryNamesOfChildren(); bool queryNamesOfChildren();
......
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