From 157b4b6b72e4b55dfc7d0c83594794362938c789 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 27 Oct 2015 09:27:28 -0400 Subject: [PATCH] fix variable naming/scope issues --- gtk2_ardour/route_time_axis.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 411a14b2be..8243a78ca1 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -663,8 +663,8 @@ RouteTimeAxisView::build_display_menu () int styles = 0; boost::shared_ptr first_track; - for (TrackSelection::const_iterator i = s.begin(); i != s.end(); ++i) { - RouteTimeAxisView* r = dynamic_cast (*i); + for (TrackSelection::const_iterator t = s.begin(); t != s.end(); ++t) { + RouteTimeAxisView* r = dynamic_cast (*t); if (!r || !r->is_track ()) { continue; } @@ -709,8 +709,6 @@ RouteTimeAxisView::build_display_menu () break; } - RadioMenuItem* i; - if (!inconsistent && first_track) { alignment_items.push_back (RadioMenuElem (align_group, _("Automatic (based on I/O connections)"))); @@ -759,8 +757,8 @@ RouteTimeAxisView::build_display_menu () int tape = 0; int non_layered = 0; - for (TrackSelection::const_iterator i = s.begin(); i != s.end(); ++i) { - RouteTimeAxisView* r = dynamic_cast (*i); + for (TrackSelection::const_iterator t = s.begin(); t != s.end(); ++t) { + RouteTimeAxisView* r = dynamic_cast (*t); if (!r || !r->is_track ()) { continue; } -- 2.30.2