diff --git a/ChangeLog b/ChangeLog index 3e94648..74ddd5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,17 @@ * Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m some more (unsigned) int -> NS(U)Integer transitions and some shutup of clang compiler warnings + * Framework/PCProjectBrowser.m + * Framework/PCSaveModified.m + * Framework/PCProjectLoadedFiles.m + * Framework/PCProjectBuilder.m + * Headers/ProjectCenter/PCProjectBrowser.h + * Headers/ProjectCenter/PCSaveModified.h + * Headers/ProjectCenter/PCProjectLoadedFiles.h + * Modules/Projects/Application/PCAppProject+Inspector.h + * Modules/Projects/Application/PCAppProject+Inspector.m + some more (unsigned) int -> NS(U)Integer transitions + not catched from clang, but found by libobjc2 in debug mode 2013-02-09 Sebastian Reitenbach * Framework/PCFileCreator.m diff --git a/Framework/PCProjectBrowser.m b/Framework/PCProjectBrowser.m index 5133713..8dc8b4d 100644 --- a/Framework/PCProjectBrowser.m +++ b/Framework/PCProjectBrowser.m @@ -527,13 +527,13 @@ NSString *PCBrowserDidSetPathNotification = @"PCBrowserDidSetPathNotification"; @implementation PCProjectBrowser (ProjectBrowserDelegate) - (void) browser:(NSBrowser *)sender - createRowsForColumn:(int)column + createRowsForColumn:(NSInteger)column inMatrix:(NSMatrix *)matrix { - NSString *pathToCol; - NSArray *files; - int i = 0; - int count = 0; + NSString *pathToCol; + NSArray *files; + NSUInteger i = 0; + NSUInteger count = 0; if (sender != browser || !matrix || ![matrix isKindOfClass:[NSMatrix class]]) { diff --git a/Framework/PCProjectBuilder.m b/Framework/PCProjectBuilder.m index c1be619..df8b7d8 100644 --- a/Framework/PCProjectBuilder.m +++ b/Framework/PCProjectBuilder.m @@ -1269,7 +1269,7 @@ } // --- Error output table delegate methods -- (int)numberOfRowsInTableView:(NSTableView *)aTableView +- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView { if (errorArray != nil && aTableView == errorOutput) { @@ -1281,7 +1281,7 @@ - (id) tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn - row:(int)rowIndex + row:(NSInteger)rowIndex { NSDictionary *errorItem; @@ -1297,7 +1297,7 @@ - (void)errorItemClick:(id)sender { - int rowIndex = [errorOutput selectedRow]; + NSInteger rowIndex = [errorOutput selectedRow]; NSDictionary *error = [errorArray objectAtIndex:rowIndex]; NSPoint position; PCProjectEditor *projectEditor = [project projectEditor]; diff --git a/Framework/PCProjectLoadedFiles.m b/Framework/PCProjectLoadedFiles.m index fe76512..dbabf18 100644 --- a/Framework/PCProjectLoadedFiles.m +++ b/Framework/PCProjectLoadedFiles.m @@ -341,7 +341,7 @@ @implementation PCProjectLoadedFiles (LoadedFilesTableDelegate) -- (int)numberOfRowsInTableView: (NSTableView *)aTableView +- (NSInteger)numberOfRowsInTableView: (NSTableView *)aTableView { if (aTableView != filesList) { @@ -353,7 +353,7 @@ - (id) tableView: (NSTableView *)aTableView objectValueForTableColumn: (NSTableColumn *)aTableColumn - row: (int)rowIndex + row: (NSInteger)rowIndex { if (aTableView != filesList) { @@ -376,7 +376,7 @@ - (void) tableView:(NSTableView *)aTableView setObjectValue:anObject forTableColumn:(NSTableColumn *)aTableColumn - row:(int)rowIndex + row:(NSInteger)rowIndex { /* NSString *path = nil; NSParameterAssert (rowIndex >= 0 && rowIndex < [editedFiles count]); diff --git a/Framework/PCSaveModified.m b/Framework/PCSaveModified.m index 423dcfb..db8ab54 100644 --- a/Framework/PCSaveModified.m +++ b/Framework/PCSaveModified.m @@ -137,7 +137,7 @@ BOOL PCRunSaveModifiedFilesPanel(PCEditorManager *manager, // ============================================================================ // ==== TableView delegate // ============================================================================ -- (int)numberOfRowsInTableView:(NSTableView *)aTableView +- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView { if (aTableView != filesList) { @@ -149,7 +149,7 @@ BOOL PCRunSaveModifiedFilesPanel(PCEditorManager *manager, - (id) tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn - row:(int)rowIndex + row:(NSInteger)rowIndex { if (aTableView != filesList) { diff --git a/Headers/ProjectCenter/PCProjectBrowser.h b/Headers/ProjectCenter/PCProjectBrowser.h index 832fa64..a9d9848 100644 --- a/Headers/ProjectCenter/PCProjectBrowser.h +++ b/Headers/ProjectCenter/PCProjectBrowser.h @@ -84,7 +84,7 @@ extern NSString *PCBrowserDidSetPathNotification; @interface PCProjectBrowser (ProjectBrowserDelegate) -- (void)browser:(NSBrowser *)sender createRowsForColumn:(int)column +- (void)browser:(NSBrowser *)sender createRowsForColumn:(NSInteger)column inMatrix:(NSMatrix *)matrix; @end diff --git a/Headers/ProjectCenter/PCProjectLoadedFiles.h b/Headers/ProjectCenter/PCProjectLoadedFiles.h index 1d0e53f..30fecac 100644 --- a/Headers/ProjectCenter/PCProjectLoadedFiles.h +++ b/Headers/ProjectCenter/PCProjectLoadedFiles.h @@ -65,16 +65,16 @@ typedef enum _PHSortType @interface PCProjectLoadedFiles (HistoryTableDelegate) -- (int)numberOfRowsInTableView:(NSTableView *)aTableView; +- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView; - (id) tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn - row:(int)rowIndex; + row:(NSInteger)rowIndex; - (void)tableView:(NSTableView *)aTableView setObjectValue:anObject forTableColumn:(NSTableColumn *)aTableColumn - row:(int)rowIndex; + row:(NSInteger)rowIndex; @end diff --git a/Headers/ProjectCenter/PCSaveModified.h b/Headers/ProjectCenter/PCSaveModified.h index 837275f..2e3db29 100644 --- a/Headers/ProjectCenter/PCSaveModified.h +++ b/Headers/ProjectCenter/PCSaveModified.h @@ -55,11 +55,11 @@ BOOL PCRunSaveModifiedFilesPanel(PCEditorManager *manager, - (BOOL)saveSelectedFiles; // TableView delegate -- (int)numberOfRowsInTableView:(NSTableView *)aTableView; +- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView; - (id) tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn - row:(int)rowIndex; + row:(NSInteger)rowIndex; @end diff --git a/Modules/Projects/Application/PCAppProject+Inspector.h b/Modules/Projects/Application/PCAppProject+Inspector.h index 889ecf4..c9f1ff5 100644 --- a/Modules/Projects/Application/PCAppProject+Inspector.h +++ b/Modules/Projects/Application/PCAppProject+Inspector.h @@ -50,16 +50,16 @@ - (void)setDocBasedApp:(id)sender; -- (int)numberOfRowsInTableView:(NSTableView *)aTableView; +- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView; - (id) tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn - row:(int)rowIndex; + row:(NSInteger)rowIndex; - (void) tableView:(NSTableView *)aTableView setObjectValue:anObject forTableColumn:(NSTableColumn *)aTableColumn - row:(int)rowIndex; + row:(NSInteger)rowIndex; -- (void)fillFieldsForRow:(int)rowIndex; +- (void)fillFieldsForRow:(NSInteger)rowIndex; // ---------------------------------------------------------------------------- // --- Notifications diff --git a/Modules/Projects/Application/PCAppProject+Inspector.m b/Modules/Projects/Application/PCAppProject+Inspector.m index d751ca8..afff73f 100644 --- a/Modules/Projects/Application/PCAppProject+Inspector.m +++ b/Modules/Projects/Application/PCAppProject+Inspector.m @@ -336,9 +336,9 @@ cleanup(NSMutableDictionary *m, NSString *k) - (void)addDocType: (id)sender { - int row; + NSInteger row; NSMutableDictionary *entry = [NSMutableDictionary dictionaryWithCapacity: 6]; - int selectedRow = [docTypesList selectedRow]; + NSInteger selectedRow = [docTypesList selectedRow]; setOrRemove(entry, [docTypeField stringValue], @"NSName"); setOrRemove(entry, [docNameField stringValue], @"NSHumanReadableName"); @@ -448,14 +448,14 @@ cleanup(NSMutableDictionary *m, NSString *k) // --- Document Types browser // ---------------------------------------------------------------------------- -- (int)numberOfRowsInTableView: (NSTableView *)aTableView +- (NSInteger)numberOfRowsInTableView: (NSTableView *)aTableView { return [docTypesItems count]; } - (id) tableView: (NSTableView *)aTableView objectValueForTableColumn: (NSTableColumn *)aTableColumn - row: (int)rowIndex + row: (NSInteger)rowIndex { NSDictionary *object = nil; @@ -480,11 +480,11 @@ cleanup(NSMutableDictionary *m, NSString *k) - (void)tableView: (NSTableView *)aTableView setObjectValue: anObject forTableColumn: (NSTableColumn *)aTableColumn - row: (int)rowIndex + row: (NSInteger)rowIndex { NSMutableDictionary *type = nil; - if (docTypesItems == nil || [docTypesItems count] <= 0) + if (docTypesItems == nil || [docTypesItems count] == 0) { return; } @@ -504,18 +504,18 @@ cleanup(NSMutableDictionary *m, NSString *k) notify: YES]; } -- (BOOL)tableView: (NSTableView *)aTableView shouldSelectRow: (int)rowIndex +- (BOOL)tableView: (NSTableView *)aTableView shouldSelectRow: (NSInteger)rowIndex { [self fillFieldsForRow: rowIndex]; return YES; } -- (void)fillFieldsForRow: (int)rowIndex +- (void)fillFieldsForRow: (NSInteger)rowIndex { NSMutableDictionary *type = nil; - int itemCount = [docTypesItems count]; + NSUInteger itemCount = [docTypesItems count]; - if (itemCount <= 0 || rowIndex > itemCount || rowIndex < 0) + if (itemCount == 0 || rowIndex > itemCount || rowIndex < 0) { [docTypeField setStringValue: @""]; [docNameField setStringValue: @""];