diff --git a/PBCommitList.m b/PBCommitList.m index e2f6f23da..17c01c941 100644 --- a/PBCommitList.m +++ b/PBCommitList.m @@ -21,13 +21,13 @@ - (NSDragOperation)draggingSourceOperationMaskForLocal:(BOOL) local - (void)keyDown:(NSEvent *)event { NSString* character = [event charactersIgnoringModifiers]; - + // Pass on command-shift up/down to the responder. We want the splitview to capture this. if ([event modifierFlags] & NSShiftKeyMask && [event modifierFlags] & NSCommandKeyMask && ([event keyCode] == 0x7E || [event keyCode] == 0x7D)) { [self.nextResponder keyDown:event]; return; } - + if ([character isEqualToString:@" "]) { if (controller.selectedCommitDetailsIndex == 0) { if ([event modifierFlags] & NSShiftKeyMask) diff --git a/PBGitConfig.h b/PBGitConfig.h index 7ceedee14..24b119738 100644 --- a/PBGitConfig.h +++ b/PBGitConfig.h @@ -14,6 +14,6 @@ NSString *repositoryPath; } @property (copy) NSString *repositoryPath; -- init; -- initWithRepositoryPath:(NSString *)path; +- (id) init; +- (id) initWithRepositoryPath:(NSString *)path; @end diff --git a/PBGitConfig.m b/PBGitConfig.m index ef1d88ed7..41ead58a5 100644 --- a/PBGitConfig.m +++ b/PBGitConfig.m @@ -12,13 +12,13 @@ @implementation PBGitConfig @synthesize repositoryPath; -- init +- (id) init { repositoryPath = nil; return self; } -- initWithRepositoryPath:(NSString *)path +- (id) initWithRepositoryPath:(NSString *)path { repositoryPath = path; return self; diff --git a/PBGitRepository.m b/PBGitRepository.m index b296ceab7..046e4e5af 100644 --- a/PBGitRepository.m +++ b/PBGitRepository.m @@ -250,8 +250,6 @@ - (void) addRef: (PBGitRef *) ref fromParameters: (NSArray *) components - (void) reloadRefs { _headRef = nil; - BOOL ret = NO; - refs = [NSMutableDictionary dictionary]; NSMutableArray *oldBranches = [branches mutableCopy]; diff --git a/PBGitSidebarController.m b/PBGitSidebarController.m index 4da2d8cd7..ad2e87283 100644 --- a/PBGitSidebarController.m +++ b/PBGitSidebarController.m @@ -42,7 +42,7 @@ - (id)initWithRepository:(PBGitRepository *)theRepository superController:(PBGit - (void)awakeFromNib { [super awakeFromNib]; - window.contentView = self.view; + window.contentView = [self view]; [self populateList]; historyViewController = [[PBGitHistoryController alloc] initWithRepository:repository superController:superController]; diff --git a/PBRefController.m b/PBRefController.m index 7ff03adb7..62ae71408 100644 --- a/PBRefController.m +++ b/PBRefController.m @@ -9,7 +9,6 @@ #import "PBRefController.h" #import "PBGitRevisionCell.h" #import "PBRefMenuItem.h" -#import "KBPopUpToolbarItem.h" #import "PBCreateBranchSheet.h" #import "PBCreateTagSheet.h" #import "PBGitDefaults.h" diff --git a/PBViewController.h b/PBViewController.h index 95bf239b3..599219643 100644 --- a/PBViewController.h +++ b/PBViewController.h @@ -28,5 +28,4 @@ - (NSResponder *)firstResponder; - (IBAction) refresh:(id)sender; -- (IBAction) refresh:(id)sender; @end diff --git a/PBViewController.m b/PBViewController.m index a540e64a9..a8b71bccf 100644 --- a/PBViewController.m +++ b/PBViewController.m @@ -43,10 +43,6 @@ - (void) updateView { } -- (IBAction) refresh: sender -{ -} - - (NSResponder *)firstResponder; { return nil;