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

loplugin:useuniqueptr in FmEntryData

Change-Id: I6356807ad2b4e0e22908d59713de54842e1a0e00
Reviewed-on: https://gerrit.libreoffice.org/49878Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 794066fa
...@@ -176,7 +176,7 @@ void FmEntryDataList::clear() ...@@ -176,7 +176,7 @@ void FmEntryDataList::clear()
FmEntryData::FmEntryData( FmEntryData* pParentData, const Reference< XInterface >& _rxIFace ) FmEntryData::FmEntryData( FmEntryData* pParentData, const Reference< XInterface >& _rxIFace )
:pParent( pParentData ) :pParent( pParentData )
{ {
pChildList = new FmEntryDataList(); pChildList.reset( new FmEntryDataList() );
newObject( _rxIFace ); newObject( _rxIFace );
} }
...@@ -184,8 +184,7 @@ FmEntryData::FmEntryData( FmEntryData* pParentData, const Reference< XInterface ...@@ -184,8 +184,7 @@ FmEntryData::FmEntryData( FmEntryData* pParentData, const Reference< XInterface
FmEntryData::~FmEntryData() FmEntryData::~FmEntryData()
{ {
GetChildList()->clear(); pChildList->clear();
delete pChildList;
} }
...@@ -200,7 +199,7 @@ void FmEntryData::newObject( const css::uno::Reference< css::uno::XInterface >& ...@@ -200,7 +199,7 @@ void FmEntryData::newObject( const css::uno::Reference< css::uno::XInterface >&
FmEntryData::FmEntryData( const FmEntryData& rEntryData ) FmEntryData::FmEntryData( const FmEntryData& rEntryData )
{ {
pChildList = new FmEntryDataList(); pChildList.reset( new FmEntryDataList() );
aText = rEntryData.GetText(); aText = rEntryData.GetText();
m_aNormalImage = rEntryData.GetNormalImage(); m_aNormalImage = rEntryData.GetNormalImage();
pParent = rEntryData.GetParent(); pParent = rEntryData.GetParent();
......
...@@ -144,7 +144,8 @@ protected: ...@@ -144,7 +144,8 @@ protected:
Image m_aNormalImage; Image m_aNormalImage;
OUString aText; OUString aText;
FmEntryDataList* pChildList; std::unique_ptr<FmEntryDataList>
pChildList;
FmEntryData* pParent; FmEntryData* pParent;
protected: protected:
...@@ -163,7 +164,7 @@ public: ...@@ -163,7 +164,7 @@ public:
const OUString& GetText() const { return aText; } const OUString& GetText() const { return aText; }
FmEntryData* GetParent() const { return pParent; } FmEntryData* GetParent() const { return pParent; }
FmEntryDataList* GetChildList() const { return pChildList; } FmEntryDataList* GetChildList() const { return pChildList.get(); }
virtual bool IsEqualWithoutChildren( FmEntryData* pEntryData ); virtual bool IsEqualWithoutChildren( FmEntryData* pEntryData );
virtual FmEntryData* Clone() = 0; virtual FmEntryData* Clone() = 0;
......
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