X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fzonebar.cpp;fp=source%2Fdesigner%2Fzonebar.cpp;h=88119c72166f4cb23e93afc9d2595a15fdd3bbd7;hb=629ded2c61ef25ec34cc52b03fe69d02e72db50f;hp=d4e049294fdc2b8dd600da4f24b188667c434275;hpb=f8a7788cee0261babfc4c804a58515aad6dfbc3d;p=r2c2.git

diff --git a/source/designer/zonebar.cpp b/source/designer/zonebar.cpp
index d4e0492..88119c7 100644
--- 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)