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 /svgio | |
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 'svgio')
-rw-r--r-- | svgio/source/svgreader/svgcirclenode.cxx | 2 | ||||
-rw-r--r-- | svgio/source/svgreader/svgclippathnode.cxx | 2 | ||||
-rw-r--r-- | svgio/source/svgreader/svgellipsenode.cxx | 2 | ||||
-rw-r--r-- | svgio/source/svgreader/svggnode.cxx | 2 | ||||
-rw-r--r-- | svgio/source/svgreader/svggradientnode.cxx | 2 | ||||
-rw-r--r-- | svgio/source/svgreader/svgimagenode.cxx | 2 | ||||
-rw-r--r-- | svgio/source/svgreader/svglinenode.cxx | 2 | ||||
-rw-r--r-- | svgio/source/svgreader/svgmarkernode.cxx | 2 | ||||
-rw-r--r-- | svgio/source/svgreader/svgmasknode.cxx | 2 | ||||
-rw-r--r-- | svgio/source/svgreader/svgpathnode.cxx | 4 | ||||
-rw-r--r-- | svgio/source/svgreader/svgpatternnode.cxx | 8 | ||||
-rw-r--r-- | svgio/source/svgreader/svgpolynode.cxx | 4 | ||||
-rw-r--r-- | svgio/source/svgreader/svgrectnode.cxx | 2 | ||||
-rw-r--r-- | svgio/source/svgreader/svgsvgnode.cxx | 2 | ||||
-rw-r--r-- | svgio/source/svgreader/svgsymbolnode.cxx | 2 | ||||
-rw-r--r-- | svgio/source/svgreader/svgtextnode.cxx | 2 | ||||
-rw-r--r-- | svgio/source/svgreader/svgusenode.cxx | 2 |
17 files changed, 22 insertions, 22 deletions
diff --git a/svgio/source/svgreader/svgcirclenode.cxx b/svgio/source/svgreader/svgcirclenode.cxx index 17031af2bf20..0f0c63a6a411 100644 --- a/svgio/source/svgreader/svgcirclenode.cxx +++ b/svgio/source/svgreader/svgcirclenode.cxx @@ -39,7 +39,7 @@ namespace svgio SvgCircleNode::~SvgCircleNode() { - if(mpaTransform) delete mpaTransform; + delete mpaTransform; } const SvgStyleAttributes* SvgCircleNode::getSvgStyleAttributes() const diff --git a/svgio/source/svgreader/svgclippathnode.cxx b/svgio/source/svgreader/svgclippathnode.cxx index 7d4ac8977e3f..7100535b913c 100644 --- a/svgio/source/svgreader/svgclippathnode.cxx +++ b/svgio/source/svgreader/svgclippathnode.cxx @@ -42,7 +42,7 @@ namespace svgio SvgClipPathNode::~SvgClipPathNode() { - if(mpaTransform) delete mpaTransform; + delete mpaTransform; } const SvgStyleAttributes* SvgClipPathNode::getSvgStyleAttributes() const diff --git a/svgio/source/svgreader/svgellipsenode.cxx b/svgio/source/svgreader/svgellipsenode.cxx index e23dfaa62c01..93caf79d11c4 100644 --- a/svgio/source/svgreader/svgellipsenode.cxx +++ b/svgio/source/svgreader/svgellipsenode.cxx @@ -40,7 +40,7 @@ namespace svgio SvgEllipseNode::~SvgEllipseNode() { - if(mpaTransform) delete mpaTransform; + delete mpaTransform; } const SvgStyleAttributes* SvgEllipseNode::getSvgStyleAttributes() const diff --git a/svgio/source/svgreader/svggnode.cxx b/svgio/source/svgreader/svggnode.cxx index 306de2e15a29..0b7f49b26888 100644 --- a/svgio/source/svgreader/svggnode.cxx +++ b/svgio/source/svgreader/svggnode.cxx @@ -38,7 +38,7 @@ namespace svgio SvgGNode::~SvgGNode() { - if(mpaTransform) delete mpaTransform; + delete mpaTransform; } const SvgStyleAttributes* SvgGNode::getSvgStyleAttributes() const diff --git a/svgio/source/svgreader/svggradientnode.cxx b/svgio/source/svgreader/svggradientnode.cxx index 3bc72e5ef92a..c9ab440d3db9 100644 --- a/svgio/source/svgreader/svggradientnode.cxx +++ b/svgio/source/svgreader/svggradientnode.cxx @@ -59,7 +59,7 @@ namespace svgio SvgGradientNode::~SvgGradientNode() { - if(mpaGradientTransform) delete mpaGradientTransform; + delete mpaGradientTransform; // do NOT delete mpXLink, it's only referenced, not owned } diff --git a/svgio/source/svgreader/svgimagenode.cxx b/svgio/source/svgreader/svgimagenode.cxx index 5423e3beafe3..55f62dcfa588 100644 --- a/svgio/source/svgreader/svgimagenode.cxx +++ b/svgio/source/svgreader/svgimagenode.cxx @@ -57,7 +57,7 @@ namespace svgio SvgImageNode::~SvgImageNode() { - if(mpaTransform) delete mpaTransform; + delete mpaTransform; } const SvgStyleAttributes* SvgImageNode::getSvgStyleAttributes() const diff --git a/svgio/source/svgreader/svglinenode.cxx b/svgio/source/svgreader/svglinenode.cxx index dd71ee184f29..d9371a30ae73 100644 --- a/svgio/source/svgreader/svglinenode.cxx +++ b/svgio/source/svgreader/svglinenode.cxx @@ -40,7 +40,7 @@ namespace svgio SvgLineNode::~SvgLineNode() { - if(mpaTransform) delete mpaTransform; + delete mpaTransform; } const SvgStyleAttributes* SvgLineNode::getSvgStyleAttributes() const diff --git a/svgio/source/svgreader/svgmarkernode.cxx b/svgio/source/svgreader/svgmarkernode.cxx index e9a3085d072c..cabe6d0e6e0e 100644 --- a/svgio/source/svgreader/svgmarkernode.cxx +++ b/svgio/source/svgreader/svgmarkernode.cxx @@ -43,7 +43,7 @@ namespace svgio SvgMarkerNode::~SvgMarkerNode() { - if(mpViewBox) delete mpViewBox; + delete mpViewBox; } const SvgStyleAttributes* SvgMarkerNode::getSvgStyleAttributes() const diff --git a/svgio/source/svgreader/svgmasknode.cxx b/svgio/source/svgreader/svgmasknode.cxx index 9e467091a07f..6aed68a960c6 100644 --- a/svgio/source/svgreader/svgmasknode.cxx +++ b/svgio/source/svgreader/svgmasknode.cxx @@ -48,7 +48,7 @@ namespace svgio SvgMaskNode::~SvgMaskNode() { - if(mpaTransform) delete mpaTransform; + delete mpaTransform; } const SvgStyleAttributes* SvgMaskNode::getSvgStyleAttributes() const diff --git a/svgio/source/svgreader/svgpathnode.cxx b/svgio/source/svgreader/svgpathnode.cxx index 7b14b727d5cf..4e7b72ecfad6 100644 --- a/svgio/source/svgreader/svgpathnode.cxx +++ b/svgio/source/svgreader/svgpathnode.cxx @@ -37,8 +37,8 @@ namespace svgio SvgPathNode::~SvgPathNode() { - if(mpPolyPolygon) delete mpPolyPolygon; - if(mpaTransform) delete mpaTransform; + delete mpPolyPolygon; + delete mpaTransform; } const SvgStyleAttributes* SvgPathNode::getSvgStyleAttributes() const diff --git a/svgio/source/svgreader/svgpatternnode.cxx b/svgio/source/svgreader/svgpatternnode.cxx index 48e0bf03d0d6..7df26f609204 100644 --- a/svgio/source/svgreader/svgpatternnode.cxx +++ b/svgio/source/svgreader/svgpatternnode.cxx @@ -54,10 +54,10 @@ namespace svgio SvgPatternNode::~SvgPatternNode() { - if(mpViewBox) delete mpViewBox; - if(mpaPatternTransform) delete mpaPatternTransform; - if(mpPatternUnits) delete mpPatternUnits; - if(mpPatternContentUnits) delete mpPatternContentUnits; + delete mpViewBox; + delete mpaPatternTransform; + delete mpPatternUnits; + delete mpPatternContentUnits; } const SvgStyleAttributes* SvgPatternNode::getSvgStyleAttributes() const diff --git a/svgio/source/svgreader/svgpolynode.cxx b/svgio/source/svgreader/svgpolynode.cxx index 5edd74696dee..dfea1ea3976f 100644 --- a/svgio/source/svgreader/svgpolynode.cxx +++ b/svgio/source/svgreader/svgpolynode.cxx @@ -40,8 +40,8 @@ namespace svgio SvgPolyNode::~SvgPolyNode() { - if(mpaTransform) delete mpaTransform; - if(mpPolygon) delete mpPolygon; + delete mpaTransform; + delete mpPolygon; } const SvgStyleAttributes* SvgPolyNode::getSvgStyleAttributes() const diff --git a/svgio/source/svgreader/svgrectnode.cxx b/svgio/source/svgreader/svgrectnode.cxx index fa3f1ddff90c..2edf2838fc20 100644 --- a/svgio/source/svgreader/svgrectnode.cxx +++ b/svgio/source/svgreader/svgrectnode.cxx @@ -42,7 +42,7 @@ namespace svgio SvgRectNode::~SvgRectNode() { - if(mpaTransform) delete mpaTransform; + delete mpaTransform; } const SvgStyleAttributes* SvgRectNode::getSvgStyleAttributes() const diff --git a/svgio/source/svgreader/svgsvgnode.cxx b/svgio/source/svgreader/svgsvgnode.cxx index dcc0bf9ee823..f33961b396d6 100644 --- a/svgio/source/svgreader/svgsvgnode.cxx +++ b/svgio/source/svgreader/svgsvgnode.cxx @@ -106,7 +106,7 @@ namespace svgio SvgSvgNode::~SvgSvgNode() { - if(mpViewBox) delete mpViewBox; + delete mpViewBox; } const SvgStyleAttributes* SvgSvgNode::getSvgStyleAttributes() const diff --git a/svgio/source/svgreader/svgsymbolnode.cxx b/svgio/source/svgreader/svgsymbolnode.cxx index 78cbb4c75d2e..86ef1df59abd 100644 --- a/svgio/source/svgreader/svgsymbolnode.cxx +++ b/svgio/source/svgreader/svgsymbolnode.cxx @@ -37,7 +37,7 @@ namespace svgio SvgSymbolNode::~SvgSymbolNode() { - if(mpViewBox) delete mpViewBox; + delete mpViewBox; } const SvgStyleAttributes* SvgSymbolNode::getSvgStyleAttributes() const diff --git a/svgio/source/svgreader/svgtextnode.cxx b/svgio/source/svgreader/svgtextnode.cxx index e70f80ae6aee..0ad425cd4b10 100644 --- a/svgio/source/svgreader/svgtextnode.cxx +++ b/svgio/source/svgreader/svgtextnode.cxx @@ -42,7 +42,7 @@ namespace svgio SvgTextNode::~SvgTextNode() { - if(mpaTransform) delete mpaTransform; + delete mpaTransform; } const SvgStyleAttributes* SvgTextNode::getSvgStyleAttributes() const diff --git a/svgio/source/svgreader/svgusenode.cxx b/svgio/source/svgreader/svgusenode.cxx index 42d5c3111d25..04b0893efe7c 100644 --- a/svgio/source/svgreader/svgusenode.cxx +++ b/svgio/source/svgreader/svgusenode.cxx @@ -41,7 +41,7 @@ namespace svgio SvgUseNode::~SvgUseNode() { - if(mpaTransform) delete mpaTransform; + delete mpaTransform; } const SvgStyleAttributes* SvgUseNode::getSvgStyleAttributes() const |