From a955ae6e36ab2f2309a441a9ae800aac70699199 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Thu, 21 Apr 2011 13:37:01 +0200
Subject: [PATCH] Don't check pointer before to delete it

---
 src/ColorSchemeEditor.cpp | 3 +--
 src/KeyBindingEditor.cpp  | 3 +--
 src/Session.cpp           | 6 ++----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/ColorSchemeEditor.cpp b/src/ColorSchemeEditor.cpp
index 32912543..2a13117c 100644
--- a/src/ColorSchemeEditor.cpp
+++ b/src/ColorSchemeEditor.cpp
@@ -151,8 +151,7 @@ void ColorSchemeEditor::setTransparencyPercentLabel(int percent)
 }
 void ColorSchemeEditor::setup(const ColorScheme* scheme)
 {
-    if ( _colors )
-        delete _colors;
+    delete _colors;
 
     _colors = new ColorScheme(*scheme);
 
diff --git a/src/KeyBindingEditor.cpp b/src/KeyBindingEditor.cpp
index b6701420..65f4401f 100644
--- a/src/KeyBindingEditor.cpp
+++ b/src/KeyBindingEditor.cpp
@@ -174,8 +174,7 @@ QString KeyBindingEditor::description() const
 
 void KeyBindingEditor::setup(const KeyboardTranslator* translator)
 {
-    if ( _translator )
-        delete _translator;
+    delete _translator;
 
     _translator = new KeyboardTranslator(*translator);
 
diff --git a/src/Session.cpp b/src/Session.cpp
index d05cbfef..151c538a 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -755,10 +755,8 @@ void Session::sendMouseEvent(int buttons, int column, int line, int eventType)
 
 Session::~Session()
 {
-  if (_foregroundProcessInfo)
-      delete _foregroundProcessInfo;
-  if (_sessionProcessInfo)
-      delete _sessionProcessInfo;
+  delete _foregroundProcessInfo;
+  delete _sessionProcessInfo;
   delete _emulation;
   delete _shellProcess;
   delete _zmodemProc;