Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

removed 'and' from method names as per ObjC naming convention

  • Loading branch information...
commit 3f45af983f5095a68814d41a22a6ae04d50fa86d 1 parent 22597aa
James Addyman authored November 11, 2012
2  Demo/Classes/ScrollableTabBarViewController.m
@@ -43,7 +43,7 @@ - (void)viewDidLoad
43 43
 	
44 44
 	for (int i = 0; i < 25; i++)
45 45
 	{
46  
-		JSTabItem *item = [[JSTabItem alloc] initWithTitle:[NSString stringWithFormat:@"Item %d", i] andColor:nil andTextColor:nil];
  46
+		JSTabItem *item = [[JSTabItem alloc] initWithTitle:[NSString stringWithFormat:@"Item %d", i] color:nil textColor:nil];
47 47
 		[items addObject:item];
48 48
 		[item release];
49 49
 	}
2  JSScrollableTabBar.m
@@ -130,7 +130,7 @@ - (void)layoutTabs
130 130
 	
131 131
 	for (JSTabItem *item in _tabItems)
132 132
 	{
133  
-		JSTabButton *tabButton = [JSTabButton tabButtonWithTitle:[item title] andColor:[item color] andTextColor:[item textColor]];
  133
+		JSTabButton *tabButton = [JSTabButton tabButtonWithTitle:[item title] color:[item color] textColor:[item textColor]];
134 134
 		[tabButton setTag:[_tabItems indexOfObject:item]];
135 135
 		[tabButton addTarget:self
136 136
 					  action:@selector(tabSelected:)
2  JSTabButton.h
@@ -20,6 +20,6 @@
20 20
 @property (nonatomic, retain) UIImage *normalBg;
21 21
 @property (nonatomic, retain) UIImage *highlightedBg;
22 22
 
23  
-+ (JSTabButton *)tabButtonWithTitle:(NSString *)string andColor:(UIColor*)color andTextColor:(UIColor*)textColor;
  23
++ (JSTabButton *)tabButtonWithTitle:(NSString *)string color:(UIColor*)color textColor:(UIColor*)textColor;
24 24
 
25 25
 @end
2  JSTabButton.m
@@ -14,7 +14,7 @@ @implementation JSTabButton
14 14
 @synthesize normalBg = _normalBg;
15 15
 @synthesize highlightedBg = _highlightedBg;
16 16
 
17  
-+ (JSTabButton *)tabButtonWithTitle:(NSString *)string andColor:(UIColor*)color andTextColor:(UIColor*)textColor
  17
++ (JSTabButton *)tabButtonWithTitle:(NSString *)string color:(UIColor*)color textColor:(UIColor*)textColor
18 18
 {	
19 19
 	NSString *imageBundlePath = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:@"images.bundle"];
20 20
 	NSBundle *imageBundle = [NSBundle bundleWithPath:imageBundlePath];
2  JSTabItem.h
@@ -22,6 +22,6 @@
22 22
 @property (nonatomic, copy) UIColor *textColor;
23 23
 
24 24
 
25  
-- (id)initWithTitle:(NSString *)title andColor:(UIColor*)color andTextColor:(UIColor*)textColor;
  25
+- (id)initWithTitle:(NSString *)title color:(UIColor*)color textColor:(UIColor*)textColor;
26 26
 
27 27
 @end
2  JSTabItem.m
@@ -15,7 +15,7 @@ @implementation JSTabItem
15 15
 @synthesize color = _color;
16 16
 @synthesize textColor = _textColor;
17 17
 
18  
-- (id)initWithTitle:(NSString *)title andColor:(UIColor*)color andTextColor:(UIColor *)textColor;
  18
+- (id)initWithTitle:(NSString *)title color:(UIColor*)color textColor:(UIColor *)textColor;
19 19
 {
20 20
 	if ((self = [super init]))
21 21
 	{

0 notes on commit 3f45af9

Please sign in to comment.
Something went wrong with that request. Please try again.