Fix many gcc 4.2 compiler warnings

This commit is contained in:
Benjamin Kramer
2009-05-01 00:46:15 +02:00
committed by Pieter de Bie
parent c6fbcccc02
commit 6dcefe5bec
8 changed files with 19 additions and 18 deletions
+3 -2
View File
@@ -9,6 +9,7 @@
#import "PBGitCommitController.h"
#import "NSFileHandleExt.h"
#import "PBChangedFile.h"
#import "PBWebChangesController.h"
@implementation PBGitCommitController
@@ -33,7 +34,7 @@
}
- (void) removeView
{
[webController closeView];
[(PBWebChangesController *)webController closeView];
[super finalize];
}
@@ -315,7 +316,7 @@
if (ret)
return [self commitFailedBecause:@"Could not update HEAD"];
[webController setStateMessage:[NSString stringWithFormat:@"Successfully created commit %@", commit]];
[(PBWebChangesController *)webController setStateMessage:[NSString stringWithFormat:@"Successfully created commit %@", commit]];
repository.hasChanged = YES;
self.busy--;
+3 -3
View File
@@ -301,7 +301,7 @@
# pragma mark TableView icon delegate
- (void)tableView:(NSTableView*)tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn*)tableColumn row:(int)rowIndex
- (void)tableView:(NSTableView*)tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn*)tableColumn row:(NSInteger)rowIndex
{
id controller = [tableView tag] == 0 ? unstagedFilesController : stagedFilesController;
[[tableColumn dataCell] setImage:[[[controller arrangedObjects] objectAtIndex:rowIndex] icon]];
@@ -353,7 +353,7 @@ writeRowsWithIndexes:(NSIndexSet *)rowIndexes
- (NSDragOperation)tableView:(NSTableView*)tableView
validateDrop:(id <NSDraggingInfo>)info
proposedRow:(int)row
proposedRow:(NSInteger)row
proposedDropOperation:(NSTableViewDropOperation)operation
{
if ([info draggingSource] == tableView)
@@ -365,7 +365,7 @@ writeRowsWithIndexes:(NSIndexSet *)rowIndexes
- (BOOL)tableView:(NSTableView *)aTableView
acceptDrop:(id <NSDraggingInfo>)info
row:(int)row
row:(NSInteger)row
dropOperation:(NSTableViewDropOperation)operation
{
NSPasteboard* pboard = [info draggingPasteboard];
+1 -1
View File
@@ -26,7 +26,7 @@
return cell;
}
- (void)selectWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject start:(int)selStart length:(int)selLength
- (void)selectWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject start:(NSInteger)selStart length:(NSInteger)selLength
{
NSRect textFrame, imageFrame;
NSDivideRect (aRect, &imageFrame, &textFrame, 3 + [image size].width, NSMinXEdge);
+2 -2
View File
@@ -62,11 +62,11 @@
- (BOOL) outlineView: (NSOutlineView *)ov
isItemExpandable: (id)item { return NO; }
- (int) outlineView: (NSOutlineView *)ov
- (NSInteger) outlineView: (NSOutlineView *)ov
numberOfChildrenOfItem:(id)item { return 0; }
- (id) outlineView: (NSOutlineView *)ov
child:(int)index
child:(NSInteger)index
ofItem:(id)item { return nil; }
- (id) outlineView: (NSOutlineView *)ov
+5 -5
View File
@@ -21,12 +21,12 @@
[self selectCurrentBranch];
}
- (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(id)context
- (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
{
if ([context isEqualToString: @"branchChange"]) {
if ([(NSString *)context isEqualToString: @"branchChange"]) {
[self updateBranchMenu];
}
else if ([context isEqualToString:@"currentBranchChange"]) {
else if ([(NSString *)context isEqualToString:@"currentBranchChange"]) {
[self selectCurrentBranch];
}
else {
@@ -102,7 +102,7 @@
- (NSDragOperation)tableView:(NSTableView*)tv
validateDrop:(id <NSDraggingInfo>)info
proposedRow:(int)row
proposedRow:(NSInteger)row
proposedDropOperation:(NSTableViewDropOperation)operation
{
if (operation == NSTableViewDropAbove)
@@ -117,7 +117,7 @@
- (BOOL)tableView:(NSTableView *)aTableView
acceptDrop:(id <NSDraggingInfo>)info
row:(int)row
row:(NSInteger)row
dropOperation:(NSTableViewDropOperation)operation
{
if (operation != NSTableViewDropOn)
+1 -1
View File
@@ -60,7 +60,7 @@
if ([op runModal] == NSFileHandlingPanelOKButton)
{
NSString *path = [op filename];
NSInteger terminationStatus;
int terminationStatus;
NSString *result = [PBEasyPipe outputForCommand:[PBGitBinary path] withArgs:[NSArray arrayWithObjects:@"init", @"-q", nil] inDir:path inputString:nil retValue:&terminationStatus];
if (terminationStatus == 0)
+2 -2
View File
@@ -23,9 +23,9 @@
[self showDiff:diffController.diff];
}
- (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(NSString *)context
- (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
{
if ([context isEqualToString: @"ChangedDiff"])
if ([(NSString *)context isEqualToString: @"ChangedDiff"])
[self showDiff:diffController.diff];
}
+2 -2
View File
@@ -26,9 +26,9 @@
[self changeContentTo: historyController.webCommit];
}
- (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(NSString *)context
- (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
{
if ([context isEqualToString: @"ChangedCommit"])
if ([(NSString *)context isEqualToString: @"ChangedCommit"])
[self changeContentTo: historyController.webCommit];
else
[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];