[PATCH 3/6] Don't bother null checking before calling delete.

Signed-off-by: Ray Lehtiniemi <rayl@mail.com>
svn path=/trunk/kdenlive/; revision=3278

diff --git a/src/clipitem.cpp b/src/clipitem.cpp
index e555f9f7e5054d24cd852cdb9106122d943b65a3..cd5983131ca769626e4378da48b0ecea783d1b51 100644 (file)
--- a/src/clipitem.cpp
+++ b/src/clipitem.cpp
@@ -131,9 +131,9 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, b
 
 ClipItem::~ClipItem()
 {
-    if (startThumbTimer) delete startThumbTimer;
-    if (endThumbTimer) delete endThumbTimer;
-    if (m_timeLine) delete m_timeLine;
+    delete startThumbTimer;
+    delete endThumbTimer;
+    delete m_timeLine;
 }
 
 ClipItem *ClipItem::clone(ItemInfo info) const

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index de411aaa4b80a68c860180c2f720cc76cec8cc12..bd6f955e8ea5ef0aa7ec00cdd51b0cda684c4121 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -326,15 +326,15 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
                 m_dragItem->updateKeyFramePos(keyFramePos, pos);
             }
 
-            if (m_animation) delete m_animation;
+            delete m_animation;
             m_animation = NULL;
-            if (m_visualTip) delete m_visualTip;
+            delete m_visualTip;
             m_visualTip = NULL;
             return;
         } else if (m_operationMode == MOVEGUIDE) {
-            if (m_animation) delete m_animation;
+            delete m_animation;
             m_animation = NULL;
-            if (m_visualTip) delete m_visualTip;
+            delete m_visualTip;
             m_visualTip = NULL;
             QGraphicsView::mouseMoveEvent(event);
             return;
@@ -385,7 +385,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
             return;
         } else {
             if (m_visualTip) {
-                if (m_animation) delete m_animation;
+                delete m_animation;
                 m_animation = NULL;
                 m_animationTimer->stop();
                 delete m_visualTip;
@@ -546,7 +546,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
             slotCheckPositionScrolling();
         } else m_moveOpMode = NONE;
         if (m_visualTip) {
-            if (m_animation) delete m_animation;
+            delete m_animation;
             m_animationTimer->stop();
             m_animation = NULL;
             delete m_visualTip;
@@ -3580,14 +3580,10 @@ void CustomTrackView::setScale(double scaleFactor)
     m_scene->setScale(scaleFactor);
     //scale(scaleFactor, 1);
     m_animationTimer->stop();
-    if (m_visualTip) {
-        delete m_visualTip;
-        m_visualTip = NULL;
-    }
-    if (m_animation) {
-        delete m_animation;
-        m_animation = NULL;
-    }
+    delete m_visualTip;
+    m_visualTip = NULL;
+    delete m_animation;
+    m_animation = NULL;
 
     //setSceneRect(0, 0, m_projectDuration + 100 * scaleFactor, sceneRect().height());
     setMatrix(matrix);

diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp
index 882858f1f01465ed67d5d3c991ed41dd3f19a936..1ecb29c7f7f012e1568122d2a1865635364f25a2 100644 (file)
--- a/src/docclipbase.cpp
+++ b/src/docclipbase.cpp
@@ -92,9 +92,7 @@ DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QStrin
 
 DocClipBase::~DocClipBase()
 {
-    if (m_thumbProd) {
-        delete m_thumbProd;
-    }
+    delete m_thumbProd;
     if (m_audioTimer) {
         m_audioTimer->stop();
         delete m_audioTimer;
@@ -103,7 +101,7 @@ DocClipBase::~DocClipBase()
     m_baseTrackProducers.clear();
     qDeleteAll(m_audioTrackProducers);
     m_audioTrackProducers.clear();
-    if (m_videoOnlyProducer) delete m_videoOnlyProducer;
+    delete m_videoOnlyProducer;
     m_videoOnlyProducer = NULL;
 }
 
@@ -413,7 +411,7 @@ void DocClipBase::deleteProducers()
     if (m_thumbProd) m_thumbProd->clearProducer();
     qDeleteAll(m_audioTrackProducers);
     m_audioTrackProducers.clear();
-    if (m_videoOnlyProducer) delete m_videoOnlyProducer;
+    delete m_videoOnlyProducer;
     m_videoOnlyProducer = NULL;
 }
 

diff --git a/src/geometryval.cpp b/src/geometryval.cpp
index 43aaa5ee9761a399d6ac2d4abd10d322fde34375..59d5cb28dc90dda31e2235128320842e704b0c19 100644 (file)
--- a/src/geometryval.cpp
+++ b/src/geometryval.cpp
@@ -404,7 +404,7 @@ void Geometryval::setupParam(const QDomElement& par, int minFrame, int maxFrame)
     Mlt::GeometryItem item;
 
     m_geom->fetch(&item, 0);
-    if (paramRect) delete paramRect;
+    delete paramRect;
     paramRect = new QGraphicsRectItem(QRectF(0, 0, item.w(), item.h()));
     paramRect->setPos(item.x(), item.y());
     paramRect->setZValue(0);

diff --git a/src/headertrack.cpp b/src/headertrack.cpp
index 5e7ebda7e6da70492a1ef12ddc365b0b65dfefb4..506cd197de707e77cae7727ab94d5707164174a9 100644 (file)
--- a/src/headertrack.cpp
+++ b/src/headertrack.cpp
@@ -80,7 +80,7 @@ HeaderTrack::HeaderTrack(int index, TrackInfo info, QWidget *parent) :
 
 HeaderTrack::~HeaderTrack()
 {
-    if (m_contextMenu) delete m_contextMenu;
+    delete m_contextMenu;
 }
 
 void HeaderTrack::switchVideo()

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index a04edb0f420052eeb69647d2acd8caa72c3580cb..504a4e4b67fd64d78151c84349fb0249016bc9ab 100644 (file)
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -149,7 +149,7 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent) :
 
             kDebug() << "// FOUND DVGRAB VERSION: " << dvgrabVersion;
         }
-        if (versionCheck) delete versionCheck;
+        delete versionCheck;
         if (dvgrabVersion < 3.3) {
             KdenliveSettings::setFirewiretimestamp(false);
             m_configCapture.kcfg_firewiretimestamp->setEnabled(false);

diff --git a/src/kthumb.cpp b/src/kthumb.cpp
index dbbe01e3a5a95f6b9f0116c1f4477f247b857566..0e8435fdc599643356be9664e631ea7d1cb2873c 100644 (file)
--- a/src/kthumb.cpp
+++ b/src/kthumb.cpp
@@ -106,8 +106,7 @@ void MyThread::run()
         } else {
             f.write(QByteArray(m_arrayWidth, '\x00'));
         }
-        if (mlt_frame)
-            delete mlt_frame;
+        delete mlt_frame;
     }
     //kDebug() << "done";
     f.close();

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 3e7aca68a2848a6bb8522527720db85585bb5e4f..85ae14badc52b96b7fff55a1b7d4b78497b158d3 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -502,7 +502,7 @@ void MainWindow::slotReloadEffects()
 #ifndef NO_JOGSHUTTLE
 void MainWindow::activateShuttleDevice()
 {
-    if (m_jogProcess) delete m_jogProcess;
+    delete m_jogProcess;
     m_jogProcess = NULL;
     if (KdenliveSettings::enableshuttle() == false) return;
     m_jogProcess = new JogShuttle(KdenliveSettings::shuttledevice());

diff --git a/src/markerdialog.cpp b/src/markerdialog.cpp
index e7d1830d0aaec301e0cbf605ef3807f7df7b6088..72806c30c44f8608f8fc1ad761bfbcdcb7ae9374 100644 (file)
--- a/src/markerdialog.cpp
+++ b/src/markerdialog.cpp
@@ -97,8 +97,8 @@ MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, cons
 MarkerDialog::~MarkerDialog()
 {
     delete m_previewTimer;
-    if (m_producer) delete m_producer;
-    if (m_profile) delete m_profile;
+    delete m_producer;
+    delete m_profile;
 }
 
 void MarkerDialog::slotUpdateThumb()

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 28a67f7711a4440f97e97c6f2821e8ec02920dc1..02592961cd25684f0ba2c29711b3d91e19ecc119 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -144,7 +144,7 @@ Monitor::~Monitor()
 {
     delete m_ruler;
     delete m_timePos;
-    if (m_overlay) delete m_overlay;
+    delete m_overlay;
     delete m_monitorRefresh;
 }
 
@@ -738,7 +738,7 @@ void Monitor::slotSwitchMonitorInfo(bool show)
         m_overlay = new Overlay(m_monitorRefresh);
         m_overlay->raise();
         m_overlay->setHidden(true);
-    } else if (m_overlay) {
+    } else {
         delete m_overlay;
         m_overlay = NULL;
     }

diff --git a/src/renderer.cpp b/src/renderer.cpp
index 2c085843fdb516df5107275a4d68d4fea0fdc965..64cbbf72a6d06295b0d625955fe82651bb0d861e 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -96,11 +96,9 @@ void Render::closeMlt()
 {
     delete osdTimer;
     delete refreshTimer;
-    if (m_mltConsumer)
-        delete m_mltConsumer;
-    if (m_mltProducer)
-        delete m_mltProducer;
-    if (m_blackClip) delete m_blackClip;
+    delete m_mltConsumer;
+    delete m_mltProducer;
+    delete m_blackClip;
     //delete m_osdInfo;
 }
 
@@ -111,7 +109,7 @@ void Render::buildConsumer()
     m_activeProfile = KdenliveSettings::current_profile();
     tmp = decodedString(m_activeProfile);
     setenv("MLT_PROFILE", tmp, 1);
-    if (m_blackClip) delete m_blackClip;
+    delete m_blackClip;
     m_blackClip = NULL;
 
     m_mltProfile = new Mlt::Profile(tmp);
@@ -714,9 +712,9 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo
 
     emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer);
     kDebug() << "REquested fuile info for: " << url.path();
-    if (frame) delete frame;
+    delete frame;
     // FIXME: should delete this to avoid a leak...
-    //if (producer) delete producer;
+    //delete producer;
 }
 
 

diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp
index 5a108065da7b2da712a5b835ba7cc7097a506bfd..d22cbbae9c40011718f5657aa405e393d165bd38 100644 (file)
--- a/src/titlewidget.cpp
+++ b/src/titlewidget.cpp
@@ -211,8 +211,8 @@ TitleWidget::~TitleWidget()
 
     delete m_frameBorder;
     delete m_frameImage;
-    if (startViewport) delete startViewport;
-    if (endViewport) delete endViewport;
+    delete startViewport;
+    delete endViewport;
     delete m_scene;
 }