Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

  • Loading branch information...
commit 3f45af983f5095a68814d41a22a6ae04d50fa86d 1 parent 22597aa
@jasarien authored
View
2  Demo/Classes/ScrollableTabBarViewController.m
@@ -43,7 +43,7 @@ - (void)viewDidLoad
for (int i = 0; i < 25; i++)
{
- JSTabItem *item = [[JSTabItem alloc] initWithTitle:[NSString stringWithFormat:@"Item %d", i] andColor:nil andTextColor:nil];
+ JSTabItem *item = [[JSTabItem alloc] initWithTitle:[NSString stringWithFormat:@"Item %d", i] color:nil textColor:nil];
[items addObject:item];
[item release];
}
View
2  JSScrollableTabBar.m
@@ -130,7 +130,7 @@ - (void)layoutTabs
for (JSTabItem *item in _tabItems)
{
- JSTabButton *tabButton = [JSTabButton tabButtonWithTitle:[item title] andColor:[item color] andTextColor:[item textColor]];
+ JSTabButton *tabButton = [JSTabButton tabButtonWithTitle:[item title] color:[item color] textColor:[item textColor]];
[tabButton setTag:[_tabItems indexOfObject:item]];
[tabButton addTarget:self
action:@selector(tabSelected:)
View
2  JSTabButton.h
@@ -20,6 +20,6 @@
@property (nonatomic, retain) UIImage *normalBg;
@property (nonatomic, retain) UIImage *highlightedBg;
-+ (JSTabButton *)tabButtonWithTitle:(NSString *)string andColor:(UIColor*)color andTextColor:(UIColor*)textColor;
++ (JSTabButton *)tabButtonWithTitle:(NSString *)string color:(UIColor*)color textColor:(UIColor*)textColor;
@end
View
2  JSTabButton.m
@@ -14,7 +14,7 @@ @implementation JSTabButton
@synthesize normalBg = _normalBg;
@synthesize highlightedBg = _highlightedBg;
-+ (JSTabButton *)tabButtonWithTitle:(NSString *)string andColor:(UIColor*)color andTextColor:(UIColor*)textColor
++ (JSTabButton *)tabButtonWithTitle:(NSString *)string color:(UIColor*)color textColor:(UIColor*)textColor
{
NSString *imageBundlePath = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:@"images.bundle"];
NSBundle *imageBundle = [NSBundle bundleWithPath:imageBundlePath];
View
2  JSTabItem.h
@@ -22,6 +22,6 @@
@property (nonatomic, copy) UIColor *textColor;
-- (id)initWithTitle:(NSString *)title andColor:(UIColor*)color andTextColor:(UIColor*)textColor;
+- (id)initWithTitle:(NSString *)title color:(UIColor*)color textColor:(UIColor*)textColor;
@end
View
2  JSTabItem.m
@@ -15,7 +15,7 @@ @implementation JSTabItem
@synthesize color = _color;
@synthesize textColor = _textColor;
-- (id)initWithTitle:(NSString *)title andColor:(UIColor*)color andTextColor:(UIColor *)textColor;
+- (id)initWithTitle:(NSString *)title color:(UIColor*)color textColor:(UIColor *)textColor;
{
if ((self = [super init]))
{
Please sign in to comment.
Something went wrong with that request. Please try again.