Chris's work on the region list

[ardour.git] / gtk2_ardour / imageframe_time_axis.cc

diff --git a/gtk2_ardour/imageframe_time_axis.cc b/gtk2_ardour/imageframe_time_axis.cc
index f3630e715262830ff877b0fc2e8a1cee2a0164c0..2f421a113272d7c222ead18e547abae7bdd3e611 100644 (file)
--- a/gtk2_ardour/imageframe_time_axis.cc
+++ b/gtk2_ardour/imageframe_time_axis.cc
@@ -20,15 +20,15 @@
 #include <string>
 #include <algorithm>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
 
 #include <gtkmm/menu.h>
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/gtk_ui.h>
 
-#include <ardour/session.h>
-#include <ardour/utils.h>
+#include "ardour/session.h"
+#include "ardour/utils.h"
 
 #include "public_editor.h"
 #include "imageframe_time_axis.h"
@@ -107,24 +107,15 @@ ImageFrameTimeAxis::~ImageFrameTimeAxis ()
                iter = next ;
        }
        
-       if(image_action_menu)
-       {
-               delete image_action_menu ;
-               image_action_menu = 0 ;
-       }
+       delete image_action_menu ;
+       image_action_menu = 0 ;
        
-       if (selection_group)
-       {
-               delete selection_group;
-               selection_group = 0 ;
-       }
+       delete selection_group;
+       selection_group = 0 ;
        
        // Destroy our Axis View helper
-       if(view)
-       {
-               delete view ;
-               view = 0 ;
-       }
+       delete view ;
+       view = 0 ;
 }
 
 //---------------------------------------------------------------------------------------//