Remove unnecessary 0 checks before delete; see http://www.parashift.com/c++-faq-lite/freestore-mgmt.html#faq-16.8 Apologies for the big commit.

git-svn-id: svn://localhost/ardour2/branches/3.0@4332 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 8 insertions, 14 deletions

diff --git a/gtk2_ardour/canvas-flag.cc b/gtk2_ardour/canvas-flag.cc
index a4eee41227..df23b83d71 100644
--- a/gtk2_ardour/canvas-flag.cc
+++ b/gtk2_ardour/canvas-flag.cc
@@ -9,20 +9,14 @@ using namespace std;
 void 
 CanvasFlag::delete_allocated_objects()
 {
-	if (_text) {
-		delete _text;
-		_text = 0;
-	}
-	
-	if (_line) {
-		delete _line;
-		_line = 0;
-	}
-	
-	if (_rect) {
-		delete _rect;
-		_rect = 0;
-	}
+	delete _text;
+	_text = 0;
+
+	delete _line;
+	_line = 0;
+
+	delete _rect;
+	_rect = 0;
 }
 
 void