From 17f07ee888cd76aab2bf3f75a3055c0159835fb9 Mon Sep 17 00:00:00 2001
From: Aparajita Fishman <aparajita@aparajita.com>
Date: Sun, 20 Jan 2013 07:24:00 +0700
Subject: [PATCH] capp_lint will not flag CPRectEdge, more linking

---
 AppKit/CPAlert.j                            | 2 +-
 AppKit/CPAnimation.j                        | 2 +-
 AppKit/CPDocumentController.j               | 8 ++++----
 AppKit/CPMenuItem/_CPMenuItemStandardView.j | 6 +++---
 AppKit/CPOpenPanel.j                        | 4 ++--
 AppKit/CPWindow/_CPWindowView.j             | 2 +-
 AppKit/_CPPopUpList.j                       | 2 +-
 Tools/capp_lint/capp_lint                   | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/AppKit/CPAlert.j b/AppKit/CPAlert.j
index 372240fd6..b6f8020eb 100644
--- a/AppKit/CPAlert.j
+++ b/AppKit/CPAlert.j
@@ -474,7 +474,7 @@ var bottomHeight = 71;
 
     offsetX = panelSize.width - inset.right;
 
-    switch([_window styleMask])
+    switch ([_window styleMask])
     {
         case _CPModalWindowMask:
             buttonMarginY = [_themeView currentValueForThemeAttribute:@"modal-window-button-margin-y"];
diff --git a/AppKit/CPAnimation.j b/AppKit/CPAnimation.j
index 3192ea152..77ef2b4c4 100644
--- a/AppKit/CPAnimation.j
+++ b/AppKit/CPAnimation.j
@@ -325,7 +325,7 @@ ACTUAL_FRAME_RATE = 0;
 // currently used function to determine time
 // 1:1 conversion to js from webkit source files
 // UnitBezier.h, WebCore_animation_AnimationBase.cpp
-var CubicBezierAtTime = function CubicBezierAtTime(t, p1x, p1y, p2x, p2y, duration)
+var CubicBezierAtTime = function(t, p1x, p1y, p2x, p2y, duration)
 {
     var ax = 0,
         bx = 0,
diff --git a/AppKit/CPDocumentController.j b/AppKit/CPDocumentController.j
index 154135761..41e7537b0 100644
--- a/AppKit/CPDocumentController.j
+++ b/AppKit/CPDocumentController.j
@@ -342,10 +342,10 @@ var CPSharedDocumentController = nil;
 - (void)closeAllDocumentsWithDelegate:(id)aDelegate didCloseAllSelector:(SEL)didCloseSelector contextInfo:(Object)info
 {
     var context = {
-        delegate: aDelegate,
-        selector: didCloseSelector,
-        context: info
-    };
+            delegate: aDelegate,
+            selector: didCloseSelector,
+            context: info
+        };
 
     [self _closeDocumentsStartingWith:nil shouldClose:YES context:context];
 }
diff --git a/AppKit/CPMenuItem/_CPMenuItemStandardView.j b/AppKit/CPMenuItem/_CPMenuItemStandardView.j
index 5b6bec0e3..fc738e2fd 100644
--- a/AppKit/CPMenuItem/_CPMenuItemStandardView.j
+++ b/AppKit/CPMenuItem/_CPMenuItemStandardView.j
@@ -124,7 +124,7 @@
         [_stateView setHidden:NO];
         //[_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];
 
-        switch([_menuItem state])
+        switch ([_menuItem state])
         {
             case CPOnState:
                 [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-on-state-image"]];
@@ -268,7 +268,7 @@
     {
         if (shouldHighlight)
         {
-            switch([_menuItem state])
+            switch ([_menuItem state])
             {
                 case CPOnState:
                     [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-on-state-highlighted-image"]];
@@ -288,7 +288,7 @@
         }
         else
         {
-            switch([_menuItem state])
+            switch ([_menuItem state])
             {
                 case CPOnState:
                     [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-on-state-image"]];
diff --git a/AppKit/CPOpenPanel.j b/AppKit/CPOpenPanel.j
index dc0557c47..75956729b 100644
--- a/AppKit/CPOpenPanel.j
+++ b/AppKit/CPOpenPanel.j
@@ -47,9 +47,9 @@
         var options = { directoryURL: [self directoryURL],
                         canChooseFiles: [self canChooseFiles],
                         canChooseDirectories: [self canChooseDirectories],
-                        allowsMultipleSelection: [self allowsMultipleSelection] };
+                        allowsMultipleSelection: [self allowsMultipleSelection] },
 
-        var result = window.cpOpenPanel(options);
+            result = window.cpOpenPanel(options);
 
         _URLs = result.URLs;
 
diff --git a/AppKit/CPWindow/_CPWindowView.j b/AppKit/CPWindow/_CPWindowView.j
index 769a734f8..08efae084 100644
--- a/AppKit/CPWindow/_CPWindowView.j
+++ b/AppKit/CPWindow/_CPWindowView.j
@@ -788,7 +788,7 @@ var _CPWindowViewCornerResizeRectWidth = 10,
 
     [_sheetShadowView setBackgroundColor:[self valueForThemeAttribute:@"attached-sheet-shadow-color"]];
 
-    if(_resizeIndicator)
+    if (_resizeIndicator)
     {
         var size = [self valueForThemeAttribute:@"size-indicator"],
             boundsSize = [self frame].size;
diff --git a/AppKit/_CPPopUpList.j b/AppKit/_CPPopUpList.j
index 34ea79cc3..4f86c0e40 100644
--- a/AppKit/_CPPopUpList.j
+++ b/AppKit/_CPPopUpList.j
@@ -587,7 +587,7 @@ var ListColumnIdentifier = @"1";
         case CPCarriageReturnCharacter:
             if ([self isVisible])
             {
-                [self closeListAfterItemClick];
+                [self closeListAfterItemClick];
                 return YES;
             }
             break;
diff --git a/Tools/capp_lint/capp_lint b/Tools/capp_lint/capp_lint
index 7cde8ff1e..248adadc1 100755
--- a/Tools/capp_lint/capp_lint
+++ b/Tools/capp_lint/capp_lint
@@ -181,7 +181,7 @@ class LintChecker(object):
     METHOD_RE = ur'[-+]\s*\([a-zA-Z_$]\w*\)\s*[a-zA-Z_$]\w*'
     FUNCTION_RE = re.compile(ur'\s*function\s*(?P<name>[a-zA-Z_$]\w*)?\(.*\)\s*\{?')
     RE_RE = re.compile(ur'(?<!\\)/.*?[^\\]/[gims]*')
-    DEPRECATED_CP_RE = re.compile(ur'\b(CP(?:Point|Rect|Size))')
+    DEPRECATED_CP_RE = re.compile(ur'\b(CP(?:Point|Rect(?!Edge)|Size))')
     EMPTY_STRING_LITERAL_FUNCTION = lambda match: match.group(1) + (len(match.group(2)) * ' ') + match.group(1)
     EMPTY_SELF_STRING_LITERAL_FUNCTION = lambda self, match: match.group(1) + (len(match.group(2)) * ' ') + match.group(1)