diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-06-13 22:15:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-06-15 14:46:41 +0200 |
| commit | 4729774b244db7a175077ed0c70aa48be62bc60e (patch) | |
| tree | 9f0f2e329d269835d4c20a8183a2772b734608f3 /l10ntools | |
| parent | 9db80b1499e09cde000160434728f7b231c30db8 (diff) | |
remove unnecessary check for null when calling delete
Idea originally from caolan.
Found using the following command:
find . -name *.cxx | xargs /opt/local/bin/grep -zlP '(?m)if\s*\(\s*\w+\s*\)\s*delete\s+\w+\;'
Change-Id: I3338f4e22193a6dfd6219c8c75835224a3392763
Diffstat (limited to 'l10ntools')
| -rw-r--r-- | l10ntools/source/export.cxx | 10 | ||||
| -rw-r--r-- | l10ntools/source/xmlparse.cxx | 6 |
2 files changed, 7 insertions, 9 deletions
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index 25b2cdbf31b6..ee4fc4376b93 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -258,8 +258,7 @@ void Export::Init() Export::~Export() { - if( pParseQueue ) - delete pParseQueue; + delete pParseQueue; if ( bMergeMode ) { aOutput.mSimple->close(); @@ -1315,9 +1314,10 @@ ParserQueue::ParserQueue( Export& aExportObj ) } -ParserQueue::~ParserQueue(){ - if( aQueueNext ) delete aQueueNext; - if( aQueueCur ) delete aQueueCur; +ParserQueue::~ParserQueue() +{ + delete aQueueNext; + delete aQueueCur; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx index d5abd211a9df..f47880dbb2a9 100644 --- a/l10ntools/source/xmlparse.cxx +++ b/l10ntools/source/xmlparse.cxx @@ -333,8 +333,7 @@ XMLFile::XMLFile( const OString &rFileName ) // the file name, empty if created void XMLFile::Extract( XMLFile *pCur ) { - if( m_pXMLStrings ) - delete m_pXMLStrings; // Elements ? + delete m_pXMLStrings; // Elements ? m_pXMLStrings = new XMLHashMap(); if ( !pCur ) @@ -420,8 +419,7 @@ XMLFile& XMLFile::operator=(const XMLFile& rObj) m_aNodes_localize = rObj.m_aNodes_localize; m_vOrder = rObj.m_vOrder; - if( m_pXMLStrings ) - delete m_pXMLStrings; + delete m_pXMLStrings; if( rObj.m_pXMLStrings ) { |