diff options
author | Carl Hetherington <carl@carlh.net> | 2008-12-18 19:31:00 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2008-12-18 19:31:00 +0000 |
commit | 4e1f451520975868659f4c00d00883f5f1cd5805 (patch) | |
tree | 7a8a51d65d70932e8151bbbeafc8eae49e60cd65 /gtk2_ardour | |
parent | be655cc5af1b059de77bb4215c13f14013fc73da (diff) |
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
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 25 | ||||
-rw-r--r-- | gtk2_ardour/audio_region_view.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/canvas-flag.cc | 22 | ||||
-rw-r--r-- | gtk2_ardour/canvas-note-event.cc | 3 | ||||
-rw-r--r-- | gtk2_ardour/editor.cc | 10 | ||||
-rw-r--r-- | gtk2_ardour/editor_markers.cc | 9 | ||||
-rw-r--r-- | gtk2_ardour/editor_mixer.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/editor_ops.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/editor_tempodisplay.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/editor_timefx.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/imageframe_time_axis.cc | 21 | ||||
-rw-r--r-- | gtk2_ardour/imageframe_view.cc | 7 | ||||
-rw-r--r-- | gtk2_ardour/level_meter.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/marker.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/marker_time_axis_view.cc | 16 | ||||
-rw-r--r-- | gtk2_ardour/mixer_strip.cc | 12 | ||||
-rw-r--r-- | gtk2_ardour/panner_ui.cc | 44 | ||||
-rw-r--r-- | gtk2_ardour/plugin_eq_gui.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/port_matrix.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/region_view.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/rhythm_ferret.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/route_time_axis.cc | 31 | ||||
-rw-r--r-- | gtk2_ardour/route_ui.cc | 12 | ||||
-rw-r--r-- | gtk2_ardour/sfdb_ui.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/time_axis_view.cc | 24 |
25 files changed, 88 insertions, 206 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 3376d1c8da..c1cab8d551 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -396,26 +396,11 @@ ARDOUR_UI::~ARDOUR_UI () { save_ardour_state (); - if (keyboard) { - delete keyboard; - } - - if (editor) { - delete editor; - } - - if (mixer) { - delete mixer; - } - - if (add_route_dialog) { - delete add_route_dialog; - } - - - if (new_session_dialog) { - delete new_session_dialog; - } + delete keyboard; + delete editor; + delete mixer; + delete add_route_dialog; + delete new_session_dialog; } void diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index e3dd980eee..35407603fe 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -251,9 +251,7 @@ AudioRegionView::~AudioRegionView () /* all waveviews etc will be destroyed when the group is destroyed */ - if (gain_line) { - delete gain_line; - } + delete gain_line; } boost::shared_ptr<ARDOUR::AudioRegion> 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 diff --git a/gtk2_ardour/canvas-note-event.cc b/gtk2_ardour/canvas-note-event.cc index 2ea18315f5..8574006369 100644 --- a/gtk2_ardour/canvas-note-event.cc +++ b/gtk2_ardour/canvas-note-event.cc @@ -50,8 +50,7 @@ CanvasNoteEvent::~CanvasNoteEvent() delete _text; } - if (_channel_selector_widget) - delete _channel_selector_widget; + delete _channel_selector_widget; } void diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 6f7a5eb132..634f1fd2be 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -885,10 +885,8 @@ Editor::~Editor() } #endif - if (track_canvas) { - delete track_canvas; - track_canvas = 0; - } + delete track_canvas; + track_canvas = 0; } void @@ -5141,9 +5139,7 @@ Editor::first_idle () // first idle adds route children (automation tracks), so we need to redisplay here redisplay_route_list(); - if (dialog) { - delete dialog; - } + delete dialog; _have_idled = true; } diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 352eb26040..0504c08095 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -247,13 +247,8 @@ void Editor::ensure_cd_marker_updated (LocationMarkers * lam, Location * locatio Editor::LocationMarkers::~LocationMarkers () { - if (start) { - delete start; - } - - if (end) { - delete end; - } + delete start; + delete end; } Editor::LocationMarkers * diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc index bf8aca105e..7f6031ed92 100644 --- a/gtk2_ardour/editor_mixer.cc +++ b/gtk2_ardour/editor_mixer.cc @@ -400,10 +400,8 @@ Editor::session_going_away () hide_measures (); clear_marker_display (); - if (current_bbt_points) { - delete current_bbt_points; - current_bbt_points = 0; - } + delete current_bbt_points; + current_bbt_points = 0; /* mixer strip will be deleted all by itself when its route is deleted. diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index a5dfb6b08e..3634d468a1 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -6280,9 +6280,7 @@ Editor::save_visual_state (uint32_t n) visual_states.push_back (0); } - if (visual_states[n] != 0) { - delete visual_states[n]; - } + delete visual_states[n]; visual_states[n] = current_visual_state (true); gdk_beep (); diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index ec3cf30b45..9bef055b57 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -160,10 +160,8 @@ Editor::compute_current_bbt_points (nframes_t leftmost, nframes_t rightmost) } next_beat.ticks = 0; - if (current_bbt_points) { - delete current_bbt_points; - current_bbt_points = 0; - } + delete current_bbt_points; + current_bbt_points = 0; current_bbt_points = session->tempo_map().get_points (session->tempo_map().frame_time (previous_beat), session->tempo_map().frame_time (next_beat) + 1); } diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc index 3dda9e87e9..8192085e96 100644 --- a/gtk2_ardour/editor_timefx.cc +++ b/gtk2_ardour/editor_timefx.cc @@ -227,9 +227,7 @@ Editor::pitch_shift (RegionSelection& regions, float fraction) int Editor::time_fx (RegionSelection& regions, float val, bool pitching) { - if (current_timefx != 0) { - delete current_timefx; - } + delete current_timefx; current_timefx = new TimeFXDialog (*this, pitching); diff --git a/gtk2_ardour/imageframe_time_axis.cc b/gtk2_ardour/imageframe_time_axis.cc index f3630e7152..735855421f 100644 --- a/gtk2_ardour/imageframe_time_axis.cc +++ b/gtk2_ardour/imageframe_time_axis.cc @@ -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 ; } //---------------------------------------------------------------------------------------// diff --git a/gtk2_ardour/imageframe_view.cc b/gtk2_ardour/imageframe_view.cc index f35381301e..27e75e2733 100644 --- a/gtk2_ardour/imageframe_view.cc +++ b/gtk2_ardour/imageframe_view.cc @@ -152,11 +152,8 @@ ImageFrameView::~ImageFrameView() } } - if(imageframe) - { -delete imageframe; - imageframe = 0 ; - } + delete imageframe; + imageframe = 0 ; } diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index cd7308cfa2..f7b44d1b08 100644 --- a/gtk2_ardour/level_meter.cc +++ b/gtk2_ardour/level_meter.cc @@ -78,9 +78,7 @@ LevelMeter::on_theme_changed() LevelMeter::~LevelMeter () { for (vector<MeterInfo>::iterator i = meters.begin(); i != meters.end(); i++) { - if ((*i).meter) { - delete (*i).meter; - } + delete (*i).meter; } } diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 9e77d0c9e7..e3330c41fb 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -283,10 +283,8 @@ Marker::~Marker () delete mark; delete points; - if (line) { - delete line; - line = 0; - } + delete line; + line = 0; } void Marker::reparent(ArdourCanvas::Group & parent) diff --git a/gtk2_ardour/marker_time_axis_view.cc b/gtk2_ardour/marker_time_axis_view.cc index d10ec4dae9..e9a15fb5a5 100644 --- a/gtk2_ardour/marker_time_axis_view.cc +++ b/gtk2_ardour/marker_time_axis_view.cc @@ -91,17 +91,11 @@ MarkerTimeAxisView::~MarkerTimeAxisView() iter = next ; } - if(canvas_rect) - { - delete canvas_rect; - canvas_rect = 0 ; - } - - if(canvas_group) - { - delete canvas_group; - canvas_group = 0 ; - } + delete canvas_rect; + canvas_rect = 0 ; + + delete canvas_group; + canvas_group = 0 ; } diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 68b53da86c..6c006d7e24 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -323,15 +323,11 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt) RouteUI::set_route (rt); - if (input_selector) { - delete input_selector; - input_selector = 0; - } + delete input_selector; + input_selector = 0; - if (output_selector) { - delete output_selector; - output_selector = 0; - } + delete output_selector; + output_selector = 0; panners.set_io (rt); gpm.set_io (rt); diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index ed1e84f29b..728dfcbcfe 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -134,15 +134,11 @@ PannerUI::set_io (boost::shared_ptr<IO> io) { connections.clear (); - if (pan_astyle_menu) { - delete pan_astyle_menu; - pan_astyle_menu = 0; - } - - if (pan_astate_menu) { - delete pan_astate_menu; - pan_astate_menu = 0; - } + delete pan_astyle_menu; + pan_astyle_menu = 0; + + delete pan_astate_menu; + pan_astate_menu = 0; _io = io; @@ -150,10 +146,8 @@ PannerUI::set_io (boost::shared_ptr<IO> io) connections.push_back (_io->panner().LinkStateChanged.connect (mem_fun(*this, &PannerUI::update_pan_linkage))); connections.push_back (_io->panner().StateChanged.connect (mem_fun(*this, &PannerUI::update_pan_state))); - if (panner) { - delete panner; - panner = 0; - } + delete panner; + panner = 0; setup_pan (); @@ -305,25 +299,11 @@ PannerUI::~PannerUI () delete (*i); } - if (panner) { - delete panner; - } - - if (big_window) { - delete big_window; - } - - if (pan_menu) { - delete pan_menu; - } - - if (pan_astyle_menu) { - delete pan_astyle_menu; - } - - if (pan_astate_menu) { - delete pan_astate_menu; - } + delete panner; + delete big_window; + delete pan_menu; + delete pan_astyle_menu; + delete pan_astate_menu; } diff --git a/gtk2_ardour/plugin_eq_gui.cc b/gtk2_ardour/plugin_eq_gui.cc index 307503fc8b..34b7788819 100644 --- a/gtk2_ardour/plugin_eq_gui.cc +++ b/gtk2_ardour/plugin_eq_gui.cc @@ -231,9 +231,9 @@ PluginEqGui::set_buffer_size(uint32_t size, uint32_t signal_size) throw; } - if (tmp1) delete tmp1; - if (tmp2) delete tmp1; - if (tmp3) delete tmp1; + delete tmp1; + delete tmp2; + delete tmp3; _buffer_size = size; _signal_buffer_size = signal_size; diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc index c2bb01691b..5b259e79cf 100644 --- a/gtk2_ardour/port_matrix.cc +++ b/gtk2_ardour/port_matrix.cc @@ -169,10 +169,8 @@ PortMatrix::clear () _side_vbox.children().clear (); - if (_side_vbox_pad) { - delete _side_vbox_pad; - _side_vbox_pad = 0; - } + delete _side_vbox_pad; + _side_vbox_pad = 0; for (std::vector<PortGroupUI*>::iterator i = _port_group_ui.begin(); i != _port_group_ui.end(); ++i) { _visibility_checkbutton_box.remove ((*i)->get_visibility_checkbutton()); diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index ec6d0dcefc..419ee9b606 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -179,9 +179,7 @@ RegionView::~RegionView () delete *g; } - if (editor) { - delete editor; - } + delete editor; } gint diff --git a/gtk2_ardour/rhythm_ferret.cc b/gtk2_ardour/rhythm_ferret.cc index 4a4f3d4ec4..6c0ee05fd9 100644 --- a/gtk2_ardour/rhythm_ferret.cc +++ b/gtk2_ardour/rhythm_ferret.cc @@ -181,9 +181,7 @@ RhythmFerret::RhythmFerret (PublicEditor& e) RhythmFerret::~RhythmFerret() { - if (logo) { - delete logo; - } + delete logo; } void diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 431017aff9..09683f314c 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -256,20 +256,14 @@ RouteTimeAxisView::~RouteTimeAxisView () delete *i; } - if (playlist_menu) { - delete playlist_menu; - playlist_menu = 0; - } + delete playlist_menu; + playlist_menu = 0; - if (playlist_action_menu) { - delete playlist_action_menu; - playlist_action_menu = 0; - } + delete playlist_action_menu; + playlist_action_menu = 0; - if (_view) { - delete _view; - _view = 0; - } + delete _view; + _view = 0; for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { delete i->second; @@ -395,10 +389,8 @@ void RouteTimeAxisView::playlist_click () { // always build a new action menu - - if (playlist_action_menu != 0) { - delete playlist_action_menu; - } + + delete playlist_action_menu; playlist_action_menu = new Menu; playlist_action_menu->set_name ("ArdourContextMenu"); @@ -473,8 +465,7 @@ RouteTimeAxisView::build_automation_action_menu () automation_items.push_back (SeparatorElem()); - if (i->second->menu_item) - delete i->second->menu_item; + delete i->second->menu_item; automation_items.push_back(CheckMenuElem (_route->describe_parameter(i->second->param), bind (mem_fun(*this, &RouteTimeAxisView::toggle_automation_track), i->second->param))); @@ -1477,9 +1468,7 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu) menu->set_name ("ArdourContextMenu"); playlist_items.clear(); - if (playlist_menu) { - delete playlist_menu; - } + delete playlist_menu; playlist_menu = new Menu; playlist_menu->set_name ("ArdourContextMenu"); diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index c53e205b49..cefe2ac517 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -120,15 +120,11 @@ RouteUI::reset () { connections.clear (); - if (solo_menu) { - delete solo_menu; - solo_menu = 0; - } + delete solo_menu; + solo_menu = 0; - if (mute_menu) { - delete mute_menu; - mute_menu = 0; - } + delete mute_menu; + mute_menu = 0; if (xml_node) { /* do not delete the node - its owned by the route */ diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index 799e74898b..a3b3a52925 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -592,9 +592,7 @@ SoundFileBrowser::set_session (Session* s) void SoundFileBrowser::add_gain_meter () { - if (gm) { - delete gm; - } + delete gm; gm = new GainMeter (*session); gm->set_io (session->the_auditioner()); diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 7da878b9f3..97758765b6 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -205,25 +205,17 @@ delete (*i); } - if (selection_group) { - delete selection_group; - selection_group = 0; - } + delete selection_group; + selection_group = 0; - if (canvas_background) { - delete canvas_background; - canvas_background = 0; - } + delete canvas_background; + canvas_background = 0; - if (canvas_display) { - delete canvas_display; - canvas_display = 0; - } + delete canvas_display; + canvas_display = 0; - if (display_menu) { - delete display_menu; - display_menu = 0; - } + delete display_menu; + display_menu = 0; } guint32 |