From 8562d733c5e928ce5741037da3e80eb12b7660b7 Mon Sep 17 00:00:00 2001 From: Sebastian Reitenbach Date: Sun, 10 Feb 2013 18:30:25 +0000 Subject: [PATCH] * Framework/PCProjectInspector.m * Modules/Editors/ProjectCenter/SyntaxDefinition.m * Modules/Editors/ProjectCenter/SyntaxHighlighter.m * Modules/Editors/ProjectCenter/TextPattern.m * Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m some more (unsigned) int -> NS(U)Integer transitions and some shutup of clang compiler warnings OK Fred git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@36107 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 9 +++++++++ Framework/PCProjectInspector.m | 10 +++++----- Modules/Editors/ProjectCenter/SyntaxDefinition.m | 8 ++++---- Modules/Editors/ProjectCenter/SyntaxHighlighter.m | 2 -- Modules/Editors/ProjectCenter/TextPattern.m | 4 +++- Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m | 6 +++--- 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ca4c83..3e94648 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2013-02-10: Sebastian Reitenbach + * Framework/PCProjectInspector.m + * Modules/Editors/ProjectCenter/SyntaxDefinition.m + * Modules/Editors/ProjectCenter/SyntaxHighlighter.m + * Modules/Editors/ProjectCenter/TextPattern.m + * Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m + some more (unsigned) int -> NS(U)Integer transitions + and some shutup of clang compiler warnings + 2013-02-09 Sebastian Reitenbach * Framework/PCFileCreator.m * Framework/PCMakefileFactory.m diff --git a/Framework/PCProjectInspector.m b/Framework/PCProjectInspector.m index 64c891a..bb2a958 100644 --- a/Framework/PCProjectInspector.m +++ b/Framework/PCProjectInspector.m @@ -1044,7 +1044,7 @@ // ==== NSTableViews // ============================================================================ -- (int)numberOfRowsInTableView:(NSTableView *)aTableView +- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView { if (searchOrderList != nil && aTableView == searchOrderList) { @@ -1064,7 +1064,7 @@ - (id) tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn - row:(int)rowIndex + row:(NSInteger)rowIndex { if (searchOrderList != nil && aTableView == searchOrderList) { @@ -1085,11 +1085,11 @@ - (void) tableView:(NSTableView *)aTableView setObjectValue:anObject forTableColumn:(NSTableColumn *)aTableColumn - row:(int)rowIndex + row:(NSInteger)rowIndex { if (authorsList != nil && aTableView == authorsList) { - if([authorsItems count] <= 0) + if([authorsItems count] == 0) { return; } @@ -1104,7 +1104,7 @@ - (void) tableView: (NSTableView*)aTableView willDisplayCell: (id)aCell forTableColumn: (NSTableColumn*)aTableColumn - row: (int)rowIndex + row: (NSInteger)rowIndex { [(NSTextFieldCell *)aCell setScrollable:YES]; } diff --git a/Modules/Editors/ProjectCenter/SyntaxDefinition.m b/Modules/Editors/ProjectCenter/SyntaxDefinition.m index 0a175e3..dbfef36 100644 --- a/Modules/Editors/ProjectCenter/SyntaxDefinition.m +++ b/Modules/Editors/ProjectCenter/SyntaxDefinition.m @@ -249,7 +249,7 @@ static NSMutableDictionary * syntaxDefinitions = nil; { if ([self init]) { - unsigned int i, n; + NSUInteger i, n; NSMutableArray * contextGraphicsTmp = [NSMutableArray array], * keywordGraphicsTmp = [NSMutableArray array]; @@ -258,7 +258,7 @@ static NSMutableDictionary * syntaxDefinitions = nil; // compile the syntax definition for (i = 0, n = [contexts count]; i < n; i++) { - unsigned int j, keywordCount, skipCount; + NSUInteger j, keywordCount, skipCount; NSDictionary * context = [contexts objectAtIndex: i]; NSArray * ctxtKeywords, * skips; NSMutableArray * contextKeywordsGraphicsTmp; @@ -268,8 +268,8 @@ static NSMutableDictionary * syntaxDefinitions = nil; [context objectForKey: @"Ending"] == nil) && i > 0) { - NSLog(_(@"Syntax compilation error: context %i missing " - @"beginning or ending symbol.")); + NSLog(@"Syntax compilation error: context %" PRIuPTR " missing " + @"beginning or ending symbol.", i); [self release]; return nil; diff --git a/Modules/Editors/ProjectCenter/SyntaxHighlighter.m b/Modules/Editors/ProjectCenter/SyntaxHighlighter.m index fa894fd..96ca52f 100644 --- a/Modules/Editors/ProjectCenter/SyntaxHighlighter.m +++ b/Modules/Editors/ProjectCenter/SyntaxHighlighter.m @@ -297,7 +297,6 @@ LocateString(NSString * str, for (;i < r.length; i++) { unichar c = string[i]; - unsigned int j; if (c < numSkipChars && skipChars[c]) { @@ -797,7 +796,6 @@ LocateString(NSString * str, // need to fixup contexts? if (NSMaxRange(r) > lastProcessedContextIndex) { - unsigned int prevContext; NSRange fixupRange; fixupRange = NSMakeRange(lastProcessedContextIndex, diff --git a/Modules/Editors/ProjectCenter/TextPattern.m b/Modules/Editors/ProjectCenter/TextPattern.m index 0aee869..47740c9 100644 --- a/Modules/Editors/ProjectCenter/TextPattern.m +++ b/Modules/Editors/ProjectCenter/TextPattern.m @@ -257,6 +257,8 @@ ParseTextPatternItem (NSString *string, unsigned int *index) return newItem; } +#if 0 +// not used static void DescribeTextPatternItem(TextPatternItem *item) { @@ -292,7 +294,7 @@ DescribeTextPatternItem(TextPatternItem *item) break; } } - +#endif TextPattern * CompileTextPattern (NSString *string) diff --git a/Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m b/Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m index bd72ec1..99097a5 100644 --- a/Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m +++ b/Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m @@ -161,7 +161,7 @@ colorWithCalibratedWhite:[[colorComponents objectAtIndex:1] floatValue] alpha:1.0]; } - else if ([colorSpaceName isEqualToString:@"RGB"]) // Treat as RGBColorSpace + else // Treat as RGBColorSpace { color = [NSColor colorWithCalibratedRed:[[colorComponents objectAtIndex:1] floatValue] @@ -255,7 +255,7 @@ key = EditorLines; val = [editorLinesField stringValue]; } - else if (sender == editorColumnsField) + else // editorColumnsField { key = EditorColumns; val = [editorColumnsField stringValue]; @@ -286,7 +286,7 @@ currentColor = currentBackgroundColor; key = EditorBackgroundColor; } - else if (sender == selectionColorWell) + else // selectionColorWell { NSLog(@"selectionColorWell"); color = [selectionColorWell color];