From 391ff7279df5ef902d1e3a96b4edcb32b70ab865 Mon Sep 17 00:00:00 2001 From: Aparajita Fishman Date: Thu, 16 May 2013 15:02:45 -0400 Subject: [PATCH] Fixed: capp_lint errors. --- AppKit/CPBrowser.j | 2 +- AppKit/CPCollectionView.j | 4 ++-- AppKit/CPTableView.j | 4 ++-- AppKit/CoreGraphics/CGContextCanvas.j | 2 +- AppKit/Platform/DOM/CPPlatformWindow+DOM.j | 2 +- AppKit/Themes/Aristo/ThemeDescriptors.j | 2 +- AppKit/_CPPopoverWindow.j | 3 ++- Foundation/CPArray/_CPJavaScriptArray.j | 2 +- Foundation/CPPredicate/_CPPredicate.j | 2 +- Foundation/CPTimeZone.j | 6 +++--- 10 files changed, 15 insertions(+), 14 deletions(-) diff --git a/AppKit/CPBrowser.j b/AppKit/CPBrowser.j index 9557e1aca..094bb6a5b 100644 --- a/AppKit/CPBrowser.j +++ b/AppKit/CPBrowser.j @@ -181,7 +181,7 @@ if (columnIndex > 0) [_tableViews[columnIndex - 1] setNeedsDisplay:YES]; - + [_tableViews[columnIndex] setNeedsDisplay:YES]; [[_tableViews.slice(indexPlusOne) valueForKey:"enclosingScrollView"] diff --git a/AppKit/CPCollectionView.j b/AppKit/CPCollectionView.j index 4bbbeeeba..5a6c7f89c 100644 --- a/AppKit/CPCollectionView.j +++ b/AppKit/CPCollectionView.j @@ -455,12 +455,12 @@ var HORIZONTAL_MARGIN = 2; [self tileIfNeeded:NO]; } -- (void)resizeSubviewsWithOldSize:(CPSize)oldBoundsSize +- (void)resizeSubviewsWithOldSize:(CGSize)oldBoundsSize { // Desactivate subviews autoresizing } -- (void)resizeWithOldSuperviewSize:(CPSize)oldBoundsSize +- (void)resizeWithOldSuperviewSize:(CGSize)oldBoundsSize { if (_lockResizing) return; diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j index ddcf8063f..90fc85d29 100644 --- a/AppKit/CPTableView.j +++ b/AppKit/CPTableView.j @@ -82,7 +82,7 @@ var CPTableViewDelegate_selectionShouldChangeInTableView_ CPTableViewDelegate_tableView_willDisplayView_forTableColumn_row_ = 1 << 17, CPTableViewDelegate_tableViewSelectionDidChange_ = 1 << 18, CPTableViewDelegate_tableViewSelectionIsChanging_ = 1 << 19, - CPTableViewDelegate_tableViewMenuForTableColumn_Row_ = 1 << 20; + CPTableViewDelegate_tableViewMenuForTableColumn_Row_ = 1 << 20, CPTableViewDelegate_tableView_shouldReorderColumn_toColumn_ = 1 << 21; //CPTableViewDraggingDestinationFeedbackStyles @@ -1322,7 +1322,7 @@ NOT YET IMPLEMENTED for (var identifier in _dataViewsForTableColumns) { - var dataViewsInTableColumn = _dataViewsForTableColumns[identifier] + var dataViewsInTableColumn = _dataViewsForTableColumns[identifier]; for (var i = 0; i < selectInfo.length; ++i) { diff --git a/AppKit/CoreGraphics/CGContextCanvas.j b/AppKit/CoreGraphics/CGContextCanvas.j index 892813d3d..77af706c8 100644 --- a/AppKit/CoreGraphics/CGContextCanvas.j +++ b/AppKit/CoreGraphics/CGContextCanvas.j @@ -470,7 +470,7 @@ var scale_rotate = function(a, b, c, d) var rotate_scale = function(a, b, c, d) { - var sign = (a * d < 0.0 || b * c > 0.0) ? -1.0 : 1.0; + var sign = (a * d < 0.0 || b * c > 0.0) ? -1.0 : 1.0, a1 = (ATAN2(sign * b, sign * a) + ATAN2(-c, d)) / 2.0, cos = COS(a1), sin = SIN(a1); diff --git a/AppKit/Platform/DOM/CPPlatformWindow+DOM.j b/AppKit/Platform/DOM/CPPlatformWindow+DOM.j index 3f861b5ec..989da35af 100644 --- a/AppKit/Platform/DOM/CPPlatformWindow+DOM.j +++ b/AppKit/Platform/DOM/CPPlatformWindow+DOM.j @@ -1060,7 +1060,7 @@ var resizeTimer = nil; { // Find the scroll delta var deltaX = _DOMScrollingElement.scrollLeft - 150, - deltaY = (_DOMScrollingElement.scrollTop - 150) || (aDOMEvent.deltaY===undefined?0: aDOMEvent.deltaY); + deltaY = (_DOMScrollingElement.scrollTop - 150) || (aDOMEvent.deltaY === undefined ? 0 : aDOMEvent.deltaY); // If we scroll super with momentum, // there are so many events going off that diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j index d7c47c1eb..04eba2e05 100755 --- a/AppKit/Themes/Aristo/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo/ThemeDescriptors.j @@ -1204,7 +1204,7 @@ var themedButtonValues = nil, [@"bezel-color-calendar", [CPColor whiteColor]], [@"bezel-color-calendar", [CPColor colorWithCalibratedRed:159.0 / 255.0 green:201.0 / 255.0 blue:225.0 / 255.0 alpha:1.0], CPThemeStateSelected], - [@"bezel-color-calendar", [CPColor colorWithCalibratedRed:159.0 / 255.0 green:201.0 / 255.0 blue:225.0 / 255.0 alpha:0.5], CPThemeStateSelected |CPThemeStateDisabled], + [@"bezel-color-calendar", [CPColor colorWithCalibratedRed:159.0 / 255.0 green:201.0 / 255.0 blue:225.0 / 255.0 alpha:0.5], CPThemeStateSelected | CPThemeStateDisabled], [@"bezel-color-clock", clockImageColor], [@"bezel-color-clock", clockImageColorDisabled, CPThemeStateDisabled], diff --git a/AppKit/_CPPopoverWindow.j b/AppKit/_CPPopoverWindow.j index b16b35e67..8e24bdee0 100644 --- a/AppKit/_CPPopoverWindow.j +++ b/AppKit/_CPPopoverWindow.j @@ -410,7 +410,8 @@ var _CPPopoverWindow_shouldClose_ = 1 << 0, var transformOrigin = "50% 100%", frame = [self frame], preferredEdge = [_windowView preferredEdge], - posX, posY; + posX, + posY; switch (preferredEdge) { diff --git a/Foundation/CPArray/_CPJavaScriptArray.j b/Foundation/CPArray/_CPJavaScriptArray.j index dbb917930..b11c78767 100644 --- a/Foundation/CPArray/_CPJavaScriptArray.j +++ b/Foundation/CPArray/_CPJavaScriptArray.j @@ -128,7 +128,7 @@ var concat = Array.prototype.concat, var ranges = indexes._ranges, count = ranges.length, result = [], - i = 0; + i = 0; for (; i < count; i++) { diff --git a/Foundation/CPPredicate/_CPPredicate.j b/Foundation/CPPredicate/_CPPredicate.j index 367b65f48..201bcccd0 100644 --- a/Foundation/CPPredicate/_CPPredicate.j +++ b/Foundation/CPPredicate/_CPPredicate.j @@ -970,7 +970,7 @@ @end -var CPRaiseParseError = function CPRaiseParseError(aScanner, target) +var CPRaiseParseError = function(aScanner, target) { [CPException raise:CPInvalidArgumentException reason:@"unable to parse " + target + " at index " + [aScanner scanLocation]]; }; diff --git a/Foundation/CPTimeZone.j b/Foundation/CPTimeZone.j index 1bd2d5d7a..3d294c25f 100644 --- a/Foundation/CPTimeZone.j +++ b/Foundation/CPTimeZone.j @@ -359,7 +359,7 @@ var abbreviationDictionary, if ([abbreviationDictionary containsKey:aTimeZoneString]) return [self timeZoneWithAbbreviation:aTimeZoneString]; - var dict = [localizedName valueForKey:[_locale objectForKey:CPLocaleLanguageCode]]; + var dict = [localizedName valueForKey:[_locale objectForKey:CPLocaleLanguageCode]], keys = [dict keyEnumerator], key; @@ -379,7 +379,7 @@ var abbreviationDictionary, + (CPArray)_namesForStyle:(NSTimeZoneNameStyle)style locale:(CPLocale)aLocale { var array = [CPArray array], - dict = [localizedName valueForKey:[aLocale objectForKey:CPLocaleLanguageCode]]; + dict = [localizedName valueForKey:[aLocale objectForKey:CPLocaleLanguageCode]], keys = [dict keyEnumerator], key; @@ -627,4 +627,4 @@ var abbreviationDictionary, return [[[localizedName valueForKey:[locale objectForKey:CPLocaleLanguageCode]] valueForKey:_abbreviation] objectAtIndex:style]; } -@end \ No newline at end of file +@end