From c9207be494f88ebcbe7c56d881cbb0b368529516 Mon Sep 17 00:00:00 2001 From: Sven Weidauer Date: Sun, 14 Jul 2013 10:47:28 +0200 Subject: [PATCH 1/3] Update MGScopeBar submodule --- MGScopeBar | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MGScopeBar b/MGScopeBar index 3d17710f5..7e88d44a0 160000 --- a/MGScopeBar +++ b/MGScopeBar @@ -1 +1 @@ -Subproject commit 3d17710f516aae83e918cdadbe16a40d1dcd7f22 +Subproject commit 7e88d44a0aa21af6ff0335bb51c3b4cb998d32a0 From f6180b566166928050c27412bf82e9732c6a82f6 Mon Sep 17 00:00:00 2001 From: Sven Weidauer Date: Sun, 14 Jul 2013 10:51:21 +0200 Subject: [PATCH 2/3] Change int to NSInteger in MBScopeBarDelegate implementation --- Classes/Views/GLFileView.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Classes/Views/GLFileView.m b/Classes/Views/GLFileView.m index 62101b1a2..1e626086e 100644 --- a/Classes/Views/GLFileView.m +++ b/Classes/Views/GLFileView.m @@ -110,25 +110,25 @@ - (void) selectCommit:(NSString*)c #pragma mark MGScopeBarDelegate methods -- (int)numberOfGroupsInScopeBar:(MGScopeBar *)theScopeBar +- (NSInteger)numberOfGroupsInScopeBar:(MGScopeBar *)theScopeBar { return [self.groups count]; } -- (NSArray *)scopeBar:(MGScopeBar *)theScopeBar itemIdentifiersForGroup:(int)groupNumber +- (NSArray *)scopeBar:(MGScopeBar *)theScopeBar itemIdentifiersForGroup:(NSInteger)groupNumber { return [[self.groups objectAtIndex:groupNumber] valueForKeyPath:[NSString stringWithFormat:@"%@.%@", GROUP_ITEMS, ITEM_IDENTIFIER]]; } -- (NSString *)scopeBar:(MGScopeBar *)theScopeBar labelForGroup:(int)groupNumber +- (NSString *)scopeBar:(MGScopeBar *)theScopeBar labelForGroup:(NSInteger)groupNumber { return [[self.groups objectAtIndex:groupNumber] objectForKey:GROUP_LABEL]; // might be nil, which is fine (nil means no label). } -- (NSString *)scopeBar:(MGScopeBar *)theScopeBar titleOfItem:(NSString *)identifier inGroup:(int)groupNumber +- (NSString *)scopeBar:(MGScopeBar *)theScopeBar titleOfItem:(NSString *)identifier inGroup:(NSInteger)groupNumber { NSArray *items = [[self.groups objectAtIndex:groupNumber] objectForKey:GROUP_ITEMS]; if (items) { @@ -143,12 +143,12 @@ - (NSString *)scopeBar:(MGScopeBar *)theScopeBar titleOfItem:(NSString *)identif } -- (MGScopeBarGroupSelectionMode)scopeBar:(MGScopeBar *)theScopeBar selectionModeForGroup:(int)groupNumber +- (MGScopeBarGroupSelectionMode)scopeBar:(MGScopeBar *)theScopeBar selectionModeForGroup:(NSInteger)groupNumber { return [[[self.groups objectAtIndex:groupNumber] objectForKey:GROUP_SELECTION_MODE] intValue]; } -- (void)scopeBar:(MGScopeBar *)theScopeBar selectedStateChanged:(BOOL)selected forItem:(NSString *)identifier inGroup:(int)groupNumber +- (void)scopeBar:(MGScopeBar *)theScopeBar selectedStateChanged:(BOOL)selected forItem:(NSString *)identifier inGroup:(NSInteger)groupNumber { startFile=identifier; NSString *path = [NSString stringWithFormat:@"html/views/%@", identifier]; From 508ba6b0c6931896238d2dce4c2bb505f8f9b9e3 Mon Sep 17 00:00:00 2001 From: Sven Weidauer Date: Sun, 14 Jul 2013 10:52:34 +0200 Subject: [PATCH 3/3] Another MGScopeBar update. Overlooked one int warning before. --- MGScopeBar | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MGScopeBar b/MGScopeBar index 7e88d44a0..101e697e2 160000 --- a/MGScopeBar +++ b/MGScopeBar @@ -1 +1 @@ -Subproject commit 7e88d44a0aa21af6ff0335bb51c3b4cb998d32a0 +Subproject commit 101e697e285eb09795e417d43312adfa396ef76e