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

loplugin:useuniqueptr in SalGtkFilePicker

Change-Id: I3cbe4121c1cb323ad00e110bcdb1f61334e656bc
Reviewed-on: https://gerrit.libreoffice.org/49131Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 23e9b129
......@@ -82,7 +82,6 @@ void SalGtkFilePicker::InitialMapping()
SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext >& xContext ) :
SalGtkPicker( xContext ),
SalGtkFilePicker_Base( m_rbHelperMtx ),
m_pFilterVector( nullptr ),
m_pParentWidget ( nullptr ),
m_pVBox ( nullptr ),
mnHID_FolderChange( 0 ),
......@@ -525,7 +524,7 @@ void SalGtkFilePicker::ensureFilterVector( const OUString& _rInitialCurrentFilte
{
if( !m_pFilterVector )
{
m_pFilterVector = new FilterVector;
m_pFilterVector.reset( new std::vector<FilterEntry> );
// set the first filter to the current filter
if ( m_aCurrentFilter.isEmpty() )
......@@ -810,7 +809,7 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles()
if (m_pFilterVector)
{
FilterVector::iterator aVectorIter = ::std::find_if(
auto aVectorIter = ::std::find_if(
m_pFilterVector->begin(), m_pFilterVector->end(), FilterTitleMatch(sFilterName) );
OUString aFilter;
......@@ -1969,7 +1968,7 @@ SalGtkFilePicker::~SalGtkFilePicker()
gtk_widget_destroy( m_pHBoxs[i] );
}
delete m_pFilterVector;
m_pFilterVector.reset();
gtk_widget_destroy( m_pVBox );
}
......
......@@ -38,8 +38,6 @@
struct FilterEntry;
struct ElementEntry_Impl;
typedef ::std::vector < FilterEntry > FilterVector;
// class declaration
typedef cppu::WeakComponentImplHelper<
......@@ -150,7 +148,7 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
css::uno::Reference< css::ui::dialogs::XFilePickerListener >
m_xListener;
OUString msPlayLabel;
FilterVector *m_pFilterVector;
std::unique_ptr<std::vector<FilterEntry>> m_pFilterVector;
GtkWidget *m_pParentWidget;
GtkWidget *m_pVBox;
GtkWidget *m_pFilterExpander;
......
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