summaryrefslogtreecommitdiffstats
path: root/l10ntools/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-01-10 11:29:36 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-01-11 07:36:26 +0100
commit96d9bd226215194632b6b0b7b0153f41ade1fc47 (patch)
treec45412f68d86cd23e4405882af6b3a4aa8ac1bf2 /l10ntools/inc
parentconvert (a>b?a:b) to std::max(a,b) (diff)
downloadcore-96d9bd226215194632b6b0b7b0153f41ade1fc47.tar.gz
core-96d9bd226215194632b6b0b7b0153f41ade1fc47.zip
loplugin:useuniqueptr in l10ntools
update plugin to find all places where we are unconditionally deleting stuff in a destructor Change-Id: Ia0fedc2420c7717ed2bdd8d3bb00262d2a63e0bc Reviewed-on: https://gerrit.libreoffice.org/47724 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'l10ntools/inc')
-rw-r--r--l10ntools/inc/cfgmerge.hxx2
-rw-r--r--l10ntools/inc/lngmerge.hxx4
-rw-r--r--l10ntools/inc/xrmmerge.hxx2
3 files changed, 3 insertions, 5 deletions
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index d2ec28475d39..d9ed5b6c356f 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -155,7 +155,7 @@ public:
class CfgMerge : public CfgParser
{
private:
- MergeDataFile *pMergeDataFile;
+ std::unique_ptr<MergeDataFile> pMergeDataFile;
std::vector<OString> aLanguages;
std::unique_ptr<ResData> pResData;
diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index 24d5b6ed211f..35c7868b01a3 100644
--- a/l10ntools/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
@@ -28,8 +28,6 @@
#include "common.hxx"
#include "export.hxx"
-typedef std::vector< OString* > LngLineList;
-
#define LNG_OK 0x0000
#define LNG_COULD_NOT_OPEN 0x0001
@@ -43,7 +41,7 @@ typedef std::vector< OString* > LngLineList;
class LngParser
{
private:
- LngLineList *pLines;
+ std::vector<OString> mvLines;
OString sSource;
std::vector<OString> aLanguages;
diff --git a/l10ntools/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx
index 0000265cac35..7d55bcd89ac7 100644
--- a/l10ntools/inc/xrmmerge.hxx
+++ b/l10ntools/inc/xrmmerge.hxx
@@ -104,7 +104,7 @@ public:
class XRMResMerge : public XRMResParser
{
private:
- MergeDataFile *pMergeDataFile;
+ std::unique_ptr<MergeDataFile> pMergeDataFile;
OString sFilename;
std::unique_ptr<ResData> pResData;
std::ofstream pOutputStream;