From 2737ac00c38513d976fda08104a5014221b0c99c Mon Sep 17 00:00:00 2001
From: rowanbeentje <rowan@beent.je>
Date: Tue, 21 May 2013 22:53:10 +0000
Subject:  - Fix all the Xcode 4.6.2 build warnings, and tweak warning settings
 to enable some more

---
 Frameworks/PSMTabBar/PSMOverflowPopUpButton.h |  2 --
 Frameworks/PSMTabBar/PSMTabBarCell.m          | 12 ++++++------
 Frameworks/PSMTabBar/PSMTabBarControl.m       | 15 ++++++++-------
 3 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'Frameworks/PSMTabBar')

diff --git a/Frameworks/PSMTabBar/PSMOverflowPopUpButton.h b/Frameworks/PSMTabBar/PSMOverflowPopUpButton.h
index b513865e..8c81207f 100644
--- a/Frameworks/PSMTabBar/PSMOverflowPopUpButton.h
+++ b/Frameworks/PSMTabBar/PSMOverflowPopUpButton.h
@@ -26,8 +26,6 @@
 - (void)notificationReceived:(NSNotification *)notification;
 
 // Animations
-- (void)setAnimatingAlternateImage:(BOOL)flag;
-- (BOOL)animatingAlternateImage;
 - (void)animateStep:(NSTimer *)timer;
 
 // archiving
diff --git a/Frameworks/PSMTabBar/PSMTabBarCell.m b/Frameworks/PSMTabBar/PSMTabBarCell.m
index 809d9061..94b22021 100644
--- a/Frameworks/PSMTabBar/PSMTabBarCell.m
+++ b/Frameworks/PSMTabBar/PSMTabBarCell.m
@@ -153,7 +153,7 @@
 
 - (NSAttributedString *)attributedStringValue
 {
-    return [(id <PSMTabStyle>)[_controlView style] attributedStringValueForTabCell:self];
+    return [[(PSMTabBarControl *)_controlView style] attributedStringValueForTabCell:self];
 }
 
 - (NSInteger)tabState
@@ -323,22 +323,22 @@
 
 - (NSRect)indicatorRectForFrame:(NSRect)cellFrame
 {
-    return [(id <PSMTabStyle>)[_controlView style] indicatorRectForTabCell:self];
+    return [[(PSMTabBarControl *)_controlView style] indicatorRectForTabCell:self];
 }
 
 - (NSRect)closeButtonRectForFrame:(NSRect)cellFrame
 {
-    return [(id <PSMTabStyle>)[_controlView style] closeButtonRectForTabCell:self withFrame:cellFrame];
+    return [[(PSMTabBarControl *)_controlView style] closeButtonRectForTabCell:self withFrame:cellFrame];
 }
 
 - (CGFloat)minimumWidthOfCell
 {
-    return [(id <PSMTabStyle>)[_controlView style] minimumWidthOfTabCell:self];
+    return [[(PSMTabBarControl *)_controlView style] minimumWidthOfTabCell:self];
 }
 
 - (CGFloat)desiredWidthOfCell
 {
-    return [(id <PSMTabStyle>)[_controlView style] desiredWidthOfTabCell:self];
+    return [[(PSMTabBarControl *)_controlView style] desiredWidthOfTabCell:self];
 }  
 
 #pragma mark -
@@ -354,7 +354,7 @@
         return;
     }
     
-    [(id <PSMTabStyle>)[_controlView style] drawTabCell:self];	
+    [[(PSMTabBarControl *)_controlView style] drawTabCell:self];	
 }
 
 #pragma mark -
diff --git a/Frameworks/PSMTabBar/PSMTabBarControl.m b/Frameworks/PSMTabBar/PSMTabBarControl.m
index 6a062efe..ffac0255 100644
--- a/Frameworks/PSMTabBar/PSMTabBarControl.m
+++ b/Frameworks/PSMTabBar/PSMTabBarControl.m
@@ -363,22 +363,23 @@
 {
     id <PSMTabStyle> newStyle;
 	
-	if ([name isEqualToString:@"Aqua"]) {
-		//newStyle = [[PSMAquaTabStyle alloc] init];
+/*	if ([name isEqualToString:@"Aqua"]) {
+		newStyle = [[PSMAquaTabStyle alloc] init];
 		
 	} else if ([name isEqualToString:@"Unified"]) {
-		//newStyle = [[PSMUnifiedTabStyle alloc] init];
+		newStyle = [[PSMUnifiedTabStyle alloc] init];
 		
 	} else if ([name isEqualToString:@"Adium"]) {
-		//newStyle = [[PSMAdiumTabStyle alloc] init];
+		newStyle = [[PSMAdiumTabStyle alloc] init];
 	
 	} else if ([name isEqualToString:@"Card"]) {
-		//newStyle = [[PSMCardTabStyle alloc] init]; 
+		newStyle = [[PSMCardTabStyle alloc] init];
 	
 	} else if ([name isEqualToString:@"Metal"]) {
-		//newStyle = [[PSMMetalTabStyle alloc] init];
+		newStyle = [[PSMMetalTabStyle alloc] init];
 
-	} else if ([name isEqualToString:@"SequelPro"]) {
+	} else */
+    if ([name isEqualToString:@"SequelPro"]) {
 		newStyle = [[PSMSequelProTabStyle alloc] init];
 
 	} else {
-- 
cgit v1.2.3