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