Fix shadowed member variable warnings

diff --git a/source/designer/routebar.cpp b/source/designer/routebar.cpp
index da9a5cf94537479079f3b48b3c782fa03aa0ce5f..77493647a529e2f302482677ac59755d8c2942b7 100644 (file)
--- a/source/designer/routebar.cpp
+++ b/source/designer/routebar.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of R²C²
-Copyright © 2010 Mikkosoft Productions, Mikko Rasa
+Copyright © 2010-2011 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -56,9 +56,9 @@ void Routebar::route_selected(unsigned index, const string &)
 {
        if(index==drp_routes->get_n_items()-1)
        {
-               Layout &layout = designer.get_layout();
-               const set<Route *> &routes = layout.get_routes();
-               Route *route = new Route(layout);
+               Layout &rlayout = designer.get_layout();
+               const set<Route *> &routes = rlayout.get_routes();
+               Route *route = new Route(rlayout);
                route->set_name(format("Route %d", routes.size()));
                designer.edit_route(route);
 

diff --git a/source/designer/zonebar.cpp b/source/designer/zonebar.cpp
index d4e049294fdc2b8dd600da4f24b188667c434275..88119c72166f4cb23e93afc9d2595a15fdd3bbd7 100644 (file)
--- a/source/designer/zonebar.cpp
+++ b/source/designer/zonebar.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of R²C²
-Copyright © 2010 Mikkosoft Productions, Mikko Rasa
+Copyright © 2010-2011 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -46,11 +46,11 @@ Zonebar::Zonebar(Designer &d):
        btn->set_tooltip("Add selected tracks to zone");
        btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::add_selection_to_zone));
 
-       Layout &layout = designer.get_layout();
-       layout.signal_zone_added.connect(sigc::mem_fun(this, &Zonebar::zone_added));
-       layout.signal_zone_removed.connect(sigc::hide(sigc::mem_fun(this, &Zonebar::update_groups)));
+       Layout &rlayout = designer.get_layout();
+       rlayout.signal_zone_added.connect(sigc::mem_fun(this, &Zonebar::zone_added));
+       rlayout.signal_zone_removed.connect(sigc::hide(sigc::mem_fun(this, &Zonebar::update_groups)));
 
-       const Layout::ZoneSet &zones = layout.get_zones();
+       const Layout::ZoneSet &zones = rlayout.get_zones();
        for(Layout::ZoneSet::const_iterator i=zones.begin(); i!=zones.end(); ++i)
                (*i)->signal_name_changed.connect(sigc::mem_fun(this, &Zonebar::zone_renamed));
 
@@ -72,8 +72,7 @@ void Zonebar::group_selected(unsigned index, const string &group)
 {
        if(index==drp_groups->get_n_items()-1)
        {
-               Layout &layout = designer.get_layout();
-               Zone *zone = new Zone(layout);
+               Zone *zone = new Zone(designer.get_layout());
                zone->set_name("New zone", "track", 1);
                designer.edit_zone(zone);
                update_groups();
@@ -101,8 +100,7 @@ void Zonebar::number_selected(unsigned index, const string &)
                Zone *cur = designer.get_current_zone();
                string qualifier = (cur ? cur->get_qualifier() : "track");
 
-               Layout &layout = designer.get_layout();
-               Zone *zone = new Zone(layout);
+               Zone *zone = new Zone(designer.get_layout());
                zone->set_name(group, qualifier, zones.size()+1);
                designer.edit_zone(zone);
                if(cur)