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

loplugin:useuniqueptr in XMLEventImportHelper

Change-Id: I2369ac92fa2f30b98b5910563dd6d0a6f8ca6a0c
Reviewed-on: https://gerrit.libreoffice.org/48479Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst eb8c8484
......@@ -25,6 +25,7 @@
#include <map>
#include <vector>
#include <memory>
namespace com { namespace sun { namespace star {
......@@ -57,10 +58,10 @@ class XMLEventImportHelper
FactoryMap aFactoryMap;
/// map from XML to API names
NameMap* pEventNameMap;
std::unique_ptr<NameMap> pEventNameMap;
/// stack of previous aEventNameMap
std::vector< NameMap* > aEventNameMapVector;
std::vector< std::unique_ptr<NameMap> > aEventNameMapVector;
public:
XMLEventImportHelper();
......
......@@ -50,7 +50,7 @@ XMLEventImportHelper::~XMLEventImportHelper()
aFactoryMap.clear();
// delete name map
delete pEventNameMap;
pEventNameMap.reset();
}
void XMLEventImportHelper::RegisterFactory(
......@@ -91,8 +91,8 @@ void XMLEventImportHelper::AddTranslationTable(
void XMLEventImportHelper::PushTranslationTable()
{
// save old map and install new one
aEventNameMapVector.push_back(pEventNameMap);
pEventNameMap = new NameMap;
aEventNameMapVector.push_back(std::move(pEventNameMap));
pEventNameMap.reset( new NameMap );
}
void XMLEventImportHelper::PopTranslationTable()
......@@ -102,8 +102,7 @@ void XMLEventImportHelper::PopTranslationTable()
if ( !aEventNameMapVector.empty() )
{
// delete current and install old map
delete pEventNameMap;
pEventNameMap = aEventNameMapVector.back();
pEventNameMap = std::move(aEventNameMapVector.back());
aEventNameMapVector.pop_back();
}
}
......
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