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

loplugin:useuniqueptr in ImplAccelManager

Change-Id: Ie7968fc709255b07a7045d50aa7641aa4fa70098
Reviewed-on: https://gerrit.libreoffice.org/47728Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst b27fee9e
......@@ -21,24 +21,21 @@
#define INCLUDED_VCL_INC_ACCMGR_HXX
#include <vector>
#include <memory>
#include <vcl/keycod.hxx>
class Accelerator;
typedef ::std::vector< Accelerator* > ImplAccelList;
class ImplAccelManager
{
private:
ImplAccelList* mpAccelList;
ImplAccelList* mpSequenceList;
std::unique_ptr<std::vector< Accelerator* >> mpAccelList;
std::unique_ptr<std::vector< Accelerator* >> mpSequenceList;
public:
ImplAccelManager()
{
mpAccelList = nullptr;
mpSequenceList = nullptr;
}
~ImplAccelManager();
......
......@@ -24,14 +24,12 @@
ImplAccelManager::~ImplAccelManager()
{
delete mpAccelList;
delete mpSequenceList;
}
bool ImplAccelManager::InsertAccel( Accelerator* pAccel )
{
if ( !mpAccelList ) {
mpAccelList = new ImplAccelList;
mpAccelList.reset( new std::vector< Accelerator* > );
} else {
for (Accelerator* i : *mpAccelList) {
if ( i == pAccel ) {
......@@ -68,7 +66,7 @@ void ImplAccelManager::RemoveAccel( Accelerator const * pAccel )
}
// throw it away
for ( ImplAccelList::iterator it = mpAccelList->begin();
for ( auto it = mpAccelList->begin();
it != mpAccelList->end();
++it
) {
......@@ -91,8 +89,7 @@ void ImplAccelManager::EndSequence()
}
// delete sequence-list
delete mpSequenceList;
mpSequenceList = nullptr;
mpSequenceList.reset();
}
bool ImplAccelManager::IsAccelKey( const vcl::KeyCode& rKeyCode )
......@@ -193,7 +190,7 @@ bool ImplAccelManager::IsAccelKey( const vcl::KeyCode& rKeyCode )
{
// create sequence list
mpSequenceList = new ImplAccelList;
mpSequenceList.reset( new std::vector< Accelerator* > );
mpSequenceList->insert( mpSequenceList->begin(), pAccel );
mpSequenceList->insert( mpSequenceList->begin(), pNextAccel );
......
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