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
(cherry picked from commit 4729774b244db7a175077ed0c70aa48be62bc60e)

8 files changed, 10 insertions, 21 deletions

diff --git a/vcl/opengl/x11/salvd.cxx b/vcl/opengl/x11/salvd.cxx
index 0b42c115ec2b..99abcddfdaab 100644
--- a/vcl/opengl/x11/salvd.cxx
+++ b/vcl/opengl/x11/salvd.cxx
@@ -61,8 +61,7 @@ X11OpenGLSalVirtualDevice::X11OpenGLSalVirtualDevice( SalGraphics* pGraphics,
 
 X11OpenGLSalVirtualDevice::~X11OpenGLSalVirtualDevice()
 {
-    if( mpGraphics )
-        delete mpGraphics;
+    delete mpGraphics;
 }
 
 SalGraphics* X11OpenGLSalVirtualDevice::AcquireGraphics()
diff --git a/vcl/source/fontsubset/gsub.cxx b/vcl/source/fontsubset/gsub.cxx
index a716ad719626..cd76e54303a6 100644
--- a/vcl/source/fontsubset/gsub.cxx
+++ b/vcl/source/fontsubset/gsub.cxx
@@ -319,8 +319,7 @@ bool ReadGSUB( struct _TrueTypeFont* pTTFile,
 void ReleaseGSUB(struct _TrueTypeFont* pTTFile)
 {
     GlyphSubstitution* pGlyphSubstitution = static_cast<GlyphSubstitution*>(pTTFile->pGSubstitution);
-    if( pGlyphSubstitution )
-        delete pGlyphSubstitution;
+    delete pGlyphSubstitution;
 }
 
 int UseGSUB( struct _TrueTypeFont* pTTFile, int nGlyph )
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index ede05f28e6ba..6e8c524b02db 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1647,8 +1647,7 @@ void ToolBox::dispose()
     mpFloatWin = NULL;
 
     // delete private data
-    if (mpData)
-        delete mpData;
+    delete mpData;
     mpData = NULL;
 
     // remove the lists when there are no more toolbox references to
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 1f9ac125f884..585cdb7a2dce 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -77,8 +77,7 @@ ImplToolBoxPrivateData::ImplToolBoxPrivateData() :
 
 ImplToolBoxPrivateData::~ImplToolBoxPrivateData()
 {
-    if( m_pLayoutData )
-        delete m_pLayoutData;
+    delete m_pLayoutData;
     delete mpMenu;
 }
 
diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx
index b0caab71ae5d..f4bce82a0509 100644
--- a/vcl/unx/generic/gdi/salvd.cxx
+++ b/vcl/unx/generic/gdi/salvd.cxx
@@ -162,8 +162,7 @@ X11SalVirtualDevice::X11SalVirtualDevice(SalGraphics* pGraphics, long &nDX, long
 
 X11SalVirtualDevice::~X11SalVirtualDevice()
 {
-    if( pGraphics_ )
-        delete pGraphics_;
+    delete pGraphics_;
     pGraphics_ = NULL;
 
     if( GetDrawable() && !bExternPixmap_ )
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 753fc0e6ae0e..f5c0b37d6165 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -390,10 +390,8 @@ public:
 
 void NWPixmapCacheData::SetPixmap( GdkX11Pixmap* pPixmap, GdkX11Pixmap* pMask )
 {
-    if( m_pixmap )
-        delete m_pixmap;
-    if( m_mask )
-        delete m_mask;
+    delete m_pixmap;
+    delete m_mask;
 
     m_pixmap = pPixmap;
     m_mask = pMask;
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index b2349f231a1f..3ed0bf1067cb 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -891,8 +891,7 @@ GtkSalFrame::~GtkSalFrame()
     }
 #endif
 
-    if( m_pIMHandler )
-        delete m_pIMHandler;
+    delete m_pIMHandler;
 
     if( m_pFixedContainer )
         gtk_widget_destroy( GTK_WIDGET( m_pFixedContainer ) );
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 39e5bfd3d7b3..87fe4cb1c55b 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -80,8 +80,7 @@ KDESalGraphics::KDESalGraphics() :
 
 KDESalGraphics::~KDESalGraphics()
 {
-    if (m_image)
-        delete m_image;
+    delete m_image;
 }
 
 bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart part )
@@ -242,9 +241,7 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
     //if no image, or resized, make a new image
     if (!m_image || m_image->size() != widgetRect.size())
     {
-        if (m_image)
-            delete m_image;
-
+        delete m_image;
         m_image = new QImage( widgetRect.width(),
                               widgetRect.height(),
                               QImage::Format_ARGB32 );