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

loplugin:useuniqueptr in Edit

Change-Id: Ia73a8d5be15dde1bc04a7acfdbc5712d7a77b59d
Reviewed-on: https://gerrit.libreoffice.org/53342Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 6325d571
...@@ -71,10 +71,10 @@ class VCL_DLLPUBLIC Edit : public Control, public vcl::unohelper::DragAndDropCli ...@@ -71,10 +71,10 @@ class VCL_DLLPUBLIC Edit : public Control, public vcl::unohelper::DragAndDropCli
{ {
private: private:
VclPtr<Edit> mpSubEdit; VclPtr<Edit> mpSubEdit;
Timer* mpUpdateDataTimer; std::unique_ptr<Timer> mpUpdateDataTimer;
TextFilter* mpFilterText; TextFilter* mpFilterText;
DDInfo* mpDDInfo; std::unique_ptr<DDInfo> mpDDInfo;
Impl_IMEInfos* mpIMEInfos; std::unique_ptr<Impl_IMEInfos> mpIMEInfos;
OUStringBuffer maText; OUStringBuffer maText;
OUString maPlaceholderText; OUString maPlaceholderText;
OUString maSaveValue; OUString maSaveValue;
......
...@@ -227,9 +227,7 @@ Edit::~Edit() ...@@ -227,9 +227,7 @@ Edit::~Edit()
void Edit::dispose() void Edit::dispose()
{ {
mpUIBuilder.reset(); mpUIBuilder.reset();
mpDDInfo.reset();
delete mpDDInfo;
mpDDInfo = nullptr;
vcl::Cursor* pCursor = GetCursor(); vcl::Cursor* pCursor = GetCursor();
if ( pCursor ) if ( pCursor )
...@@ -238,11 +236,8 @@ void Edit::dispose() ...@@ -238,11 +236,8 @@ void Edit::dispose()
delete pCursor; delete pCursor;
} }
delete mpIMEInfos; mpIMEInfos.reset();
mpIMEInfos = nullptr; mpUpdateDataTimer.reset();
delete mpUpdateDataTimer;
mpUpdateDataTimer = nullptr;
if ( mxDnDListener.is() ) if ( mxDnDListener.is() )
{ {
...@@ -2039,16 +2034,14 @@ void Edit::Command( const CommandEvent& rCEvt ) ...@@ -2039,16 +2034,14 @@ void Edit::Command( const CommandEvent& rCEvt )
else if ( rCEvt.GetCommand() == CommandEventId::StartExtTextInput ) else if ( rCEvt.GetCommand() == CommandEventId::StartExtTextInput )
{ {
DeleteSelected(); DeleteSelected();
delete mpIMEInfos;
sal_Int32 nPos = static_cast<sal_Int32>(maSelection.Max()); sal_Int32 nPos = static_cast<sal_Int32>(maSelection.Max());
mpIMEInfos = new Impl_IMEInfos( nPos, OUString(maText.getStr() + nPos ) ); mpIMEInfos.reset(new Impl_IMEInfos( nPos, OUString(maText.getStr() + nPos ) ));
mpIMEInfos->bWasCursorOverwrite = !IsInsertMode(); mpIMEInfos->bWasCursorOverwrite = !IsInsertMode();
} }
else if ( rCEvt.GetCommand() == CommandEventId::EndExtTextInput ) else if ( rCEvt.GetCommand() == CommandEventId::EndExtTextInput )
{ {
bool bInsertMode = !mpIMEInfos->bWasCursorOverwrite; bool bInsertMode = !mpIMEInfos->bWasCursorOverwrite;
delete mpIMEInfos; mpIMEInfos.reset();
mpIMEInfos = nullptr;
SetInsertMode(bInsertMode); SetInsertMode(bInsertMode);
ImplModified(); ImplModified();
...@@ -2390,7 +2383,7 @@ void Edit::EnableUpdateData( sal_uLong nTimeout ) ...@@ -2390,7 +2383,7 @@ void Edit::EnableUpdateData( sal_uLong nTimeout )
{ {
if ( !mpUpdateDataTimer ) if ( !mpUpdateDataTimer )
{ {
mpUpdateDataTimer = new Timer("UpdateDataTimer"); mpUpdateDataTimer.reset(new Timer("UpdateDataTimer"));
mpUpdateDataTimer->SetInvokeHandler( LINK( this, Edit, ImplUpdateDataHdl ) ); mpUpdateDataTimer->SetInvokeHandler( LINK( this, Edit, ImplUpdateDataHdl ) );
mpUpdateDataTimer->SetDebugName( "vcl::Edit mpUpdateDataTimer" ); mpUpdateDataTimer->SetDebugName( "vcl::Edit mpUpdateDataTimer" );
} }
...@@ -2401,8 +2394,7 @@ void Edit::EnableUpdateData( sal_uLong nTimeout ) ...@@ -2401,8 +2394,7 @@ void Edit::EnableUpdateData( sal_uLong nTimeout )
void Edit::DisableUpdateData() void Edit::DisableUpdateData()
{ {
delete mpUpdateDataTimer; mpUpdateDataTimer.reset();
mpUpdateDataTimer = nullptr;
} }
void Edit::SetEchoChar( sal_Unicode c ) void Edit::SetEchoChar( sal_Unicode c )
...@@ -2830,7 +2822,7 @@ void Edit::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent ...@@ -2830,7 +2822,7 @@ void Edit::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent
if ( (nCharPos >= aSel.Min()) && (nCharPos < aSel.Max()) ) if ( (nCharPos >= aSel.Min()) && (nCharPos < aSel.Max()) )
{ {
if ( !mpDDInfo ) if ( !mpDDInfo )
mpDDInfo = new DDInfo; mpDDInfo.reset(new DDInfo);
mpDDInfo->bStarterOfDD = true; mpDDInfo->bStarterOfDD = true;
mpDDInfo->aDndStartSel = aSel; mpDDInfo->aDndStartSel = aSel;
...@@ -2872,8 +2864,7 @@ void Edit::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& rDSDE ...@@ -2872,8 +2864,7 @@ void Edit::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& rDSDE
} }
ImplHideDDCursor(); ImplHideDDCursor();
delete mpDDInfo; mpDDInfo.reset();
mpDDInfo = nullptr;
} }
// css::datatransfer::dnd::XDropTargetListener // css::datatransfer::dnd::XDropTargetListener
...@@ -2916,8 +2907,7 @@ void Edit::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE ) ...@@ -2916,8 +2907,7 @@ void Edit::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE )
if ( !mpDDInfo->bStarterOfDD ) if ( !mpDDInfo->bStarterOfDD )
{ {
delete mpDDInfo; mpDDInfo.reset();
mpDDInfo = nullptr;
} }
} }
...@@ -2928,7 +2918,7 @@ void Edit::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& rD ...@@ -2928,7 +2918,7 @@ void Edit::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& rD
{ {
if ( !mpDDInfo ) if ( !mpDDInfo )
{ {
mpDDInfo = new DDInfo; mpDDInfo.reset(new DDInfo);
} }
// search for string data type // search for string data type
const Sequence< css::datatransfer::DataFlavor >& rFlavors( rDTDE.SupportedDataFlavors ); const Sequence< css::datatransfer::DataFlavor >& rFlavors( rDTDE.SupportedDataFlavors );
......
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