From 2e3af12381dcb2525aa8d847a886d7043efc72ad Mon Sep 17 00:00:00 2001
From: Allan Odgaard <git@abetarda.com>
Date: Wed, 12 Sep 2012 23:32:03 +0200
Subject: [PATCH] =?UTF-8?q?Rename=20property:=20layout=20=E2=86=92=20layer?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is to avoid a clash with the layout method introduced in 10.7 (and used during auto layout).
---
 Frameworks/OakAppKit/src/OakControl.h     | 4 ++--
 Frameworks/OakAppKit/src/OakControl.mm    | 4 ++--
 Frameworks/OakAppKit/src/OakStatusBar.mm  | 4 ++--
 Frameworks/OakAppKit/src/OakTabBarView.mm | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Frameworks/OakAppKit/src/OakControl.h b/Frameworks/OakAppKit/src/OakControl.h
index d597e05e83..6a44e4bf29 100644
--- a/Frameworks/OakAppKit/src/OakControl.h
+++ b/Frameworks/OakAppKit/src/OakControl.h
@@ -86,9 +86,9 @@ struct layer_t
 	NSPoint mouseDownPos;
 }
 - (void)drawLayer:(layer_t const&)aLayer;
-- (std::vector<layer_t> const&)layout;
+- (std::vector<layer_t> const&)layers;
 - (uint32_t)currentState;
-- (void)setLayout:(std::vector<layer_t> const&)aLayout;
+- (void)setLayers:(std::vector<layer_t> const&)aLayout;
 - (void)sendAction:(SEL)action fromLayer:(layer_t const&)aLayer;
 - (NSInteger)tagForLayerContainingPoint:(NSPoint)aPoint;
 @property (nonatomic, readonly) NSInteger tag; // tag of the most recent layer causing an action
diff --git a/Frameworks/OakAppKit/src/OakControl.mm b/Frameworks/OakAppKit/src/OakControl.mm
index 748d4dd98e..842719c50a 100644
--- a/Frameworks/OakAppKit/src/OakControl.mm
+++ b/Frameworks/OakAppKit/src/OakControl.mm
@@ -66,12 +66,12 @@ - (void)setupTrackingRects;
 @implementation OakControl
 @synthesize tag, mouseTrackingDisabled;
 
-- (std::vector<layer_t> const&)layout
+- (std::vector<layer_t> const&)layers
 {
 	return layout;
 }
 
-- (void)setLayout:(std::vector<layer_t> const&)aLayout
+- (void)setLayers:(std::vector<layer_t> const&)aLayout
 {
 	// Remove views that are no longer in the layout
 	iterate(oldLayer, layout)
diff --git a/Frameworks/OakAppKit/src/OakStatusBar.mm b/Frameworks/OakAppKit/src/OakStatusBar.mm
index 2e0bcac2f0..b01c82d47e 100644
--- a/Frameworks/OakAppKit/src/OakStatusBar.mm
+++ b/Frameworks/OakAppKit/src/OakStatusBar.mm
@@ -284,7 +284,7 @@ - (void)updateLayout
 		}
 	}
 
-	[self setLayout:newLayout];
+	[self setLayers:newLayout];
 	[self setNeedsDisplay:YES];
 }
 
@@ -318,7 +318,7 @@ - (void)showMenu:(NSMenu*)menu withSelectedIndex:(NSUInteger)index forCellWithTa
 	NSRect rect = [self bounds];
 
 	// Find the layer with the provided tag
-	iterate(it, [self layout])
+	iterate(it, [self layers])
 	{
 		if(it->tag == cellTag)
 		{
diff --git a/Frameworks/OakAppKit/src/OakTabBarView.mm b/Frameworks/OakAppKit/src/OakTabBarView.mm
index 2f868819e4..3a741aecec 100644
--- a/Frameworks/OakAppKit/src/OakTabBarView.mm
+++ b/Frameworks/OakAppKit/src/OakTabBarView.mm
@@ -405,7 +405,7 @@ - (void)updateLayout
 
 	D(DBF_TabBarView, bug("\n"););
 	if(!isExpanded)
-		return [self setLayout:metrics->layers_for("backgroundCollapsed", rect, -1)];
+		return [self setLayers:metrics->layers_for("backgroundCollapsed", rect, -1)];
 
 	std::vector<layer_t> newLayout, selectedTabLayers;
 	newLayout = metrics->layers_for("background", rect, -1);
@@ -471,7 +471,7 @@ - (void)updateLayout
 		rect.origin.x += rect.size.width + metrics->tabSpacing;
 	}
 	newLayout.insert(newLayout.end(), selectedTabLayers.begin(), selectedTabLayers.end());
-	[self setLayout:newLayout];
+	[self setLayers:newLayout];
 }
 
 - (void)viewFrameChanged:(NSNotification*)aNotification