From 866e1f00f7dca34dc390a34be33d186f5202f535 Mon Sep 17 00:00:00 2001 From: Aparajita Fishman Date: Wed, 23 Jan 2013 15:44:05 +0700 Subject: [PATCH] Objj2 compiler fixes - Each file compiles individually with no errors or warnings. - Added missing imports. - Fixed imports to remove circularity. - Removed unnecessary imports. - Added missing headers. - Added missing action_button.png. - Replace CPMakeRect with CGRectMake. --- AppKit/CPCursor.j | 2 +- AppKit/CPEvent.j | 8 +-- AppKit/CPGradient.j | 6 +-- AppKit/CPImage.j | 2 +- AppKit/CPPopUpButton.j | 3 +- .../CPPredicateEditorRowTemplate.j | 2 +- AppKit/CPRuleEditor/CPRuleEditor.j | 4 +- AppKit/CPSearchField.j | 2 +- AppKit/CPSplitView.j | 2 +- AppKit/CPStringDrawing.j | 2 +- AppKit/CPTableView.j | 2 +- AppKit/CPView.j | 4 +- AppKit/CPWindow/_CPAttachedWindowView.j | 4 +- AppKit/Cib/CPCib.j | 3 +- AppKit/Cib/_CPCibObjectData.j | 3 +- AppKit/CoreGraphics/CGColor.j | 1 - AppKit/CoreGraphics/CGPath.j | 2 +- AppKit/Resources/action_button.png | Bin 0 -> 506 bytes AppKit/Themes/Aristo/ThemeDescriptors.j | 41 ++++++++++++++- AppKit/Themes/Aristo2/ThemeDescriptors.j | 47 ++++++++++++++++-- AppKit/Themes/BlendKit/BKShowcaseController.j | 7 +-- AppKit/Themes/BlendKit/BKThemeDescriptor.j | 3 -- AppKit/Themes/CommonJS/blendtask.j | 29 +++++++++-- Foundation/Foundation.j | 2 +- Tools/capp/Generate.j | 21 ++++++++ Tools/nib2cib/Converter.j | 8 ++- Tools/nib2cib/NSButton.j | 1 + Tools/nib2cib/NSCell.j | 1 + Tools/nib2cib/NSComboBox.j | 1 + Tools/nib2cib/NSDictionary.j | 4 ++ Tools/nib2cib/NSFormatter.j | 24 +++++++++ Tools/nib2cib/NSImageView.j | 2 + Tools/nib2cib/NSLevelIndicator.j | 3 ++ Tools/nib2cib/NSMatrix.j | 1 + Tools/nib2cib/NSMenu.j | 2 - Tools/nib2cib/NSMenuItem.j | 1 - Tools/nib2cib/NSMutableString.j | 3 ++ Tools/nib2cib/NSNibConnector.j | 2 + Tools/nib2cib/NSPopUpButton.j | 1 + Tools/nib2cib/NSSearchField.j | 2 + Tools/nib2cib/NSSegmentedControl.j | 3 ++ Tools/nib2cib/NSSlider.j | 3 ++ Tools/nib2cib/NSSortDescriptor.j | 24 ++++++++- Tools/nib2cib/NSStepper.j | 3 ++ Tools/nib2cib/NSTableColumn.j | 7 ++- Tools/nib2cib/NSTableHeaderView.j | 5 ++ Tools/nib2cib/NSTableView.j | 4 +- Tools/nib2cib/NSTextField.j | 4 +- Tools/nib2cib/NSTokenField.j | 2 +- Tools/nib2cib/NSWindowTemplate.j | 1 + Tools/nib2cib/Nib2Cib.j | 9 ++-- Tools/nib2cib/_NSCornerView.j | 1 + 52 files changed, 265 insertions(+), 59 deletions(-) create mode 100644 AppKit/Resources/action_button.png diff --git a/AppKit/CPCursor.j b/AppKit/CPCursor.j index b8147a741..3705d6b30 100755 --- a/AppKit/CPCursor.j +++ b/AppKit/CPCursor.j @@ -161,7 +161,7 @@ var currentCursor = nil, if (doesHaveImage) { var themeResourcePath = [[[CPApp themeBlend] bundle] resourcePath]; - cssString = [CPString stringWithFormat:@"url(%@/cursors/%@.cur), %@", themeResourcePath, cursorName, aString]; + cssString = [CPString stringWithFormat:@"url(%@cursors/%@.cur), %@", themeResourcePath, cursorName, aString]; } else diff --git a/AppKit/CPEvent.j b/AppKit/CPEvent.j index 77d117758..99a231f75 100644 --- a/AppKit/CPEvent.j +++ b/AppKit/CPEvent.j @@ -21,10 +21,10 @@ */ @import -@import @import @import +@import "CGGeometry.j" @import "CPText.j" @class CPTextField @@ -659,7 +659,7 @@ var _CPEventPeriodicEventPeriod = 0, case CPKeyDown: case CPKeyUp: case CPFlagsChanged: - return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ chars=\"%@\" unmodchars=\"%@\" repeat=%d keyCode=%d", _type, CPStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _characters, _charactersIgnoringModifiers, _isARepeat, _keyCode]; + return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ chars=\"%@\" unmodchars=\"%@\" repeat=%d keyCode=%d", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _characters, _charactersIgnoringModifiers, _isARepeat, _keyCode]; case CPLeftMouseDown: case CPLeftMouseUp: case CPRightMouseDown: @@ -669,9 +669,9 @@ var _CPEventPeriodicEventPeriod = 0, case CPRightMouseDragged: case CPMouseEntered: case CPMouseExited: - return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ evNum=%d click=%d buttonNumber=%d pressure=%f", _type, CPStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _eventNumber, _clickCount, [self buttonNumber], _pressure]; + return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ evNum=%d click=%d buttonNumber=%d pressure=%f", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _eventNumber, _clickCount, [self buttonNumber], _pressure]; default: - return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ subtype=%d data1=%d data2=%d", _type, CPStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _subtype, _data1, _data2]; + return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ subtype=%d data1=%d data2=%d", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _subtype, _data1, _data2]; } } diff --git a/AppKit/CPGradient.j b/AppKit/CPGradient.j index 0c9775c0e..02bee9048 100644 --- a/AppKit/CPGradient.j +++ b/AppKit/CPGradient.j @@ -24,9 +24,9 @@ @import @import -@import "CoreGraphics/CGColor.j" -@import "CoreGraphics/CGColorSpace.j" -@import "CoreGraphics/CGGradient.j" +@import "CGColor.j" +@import "CGColorSpace.j" +@import "CGGradient.j" @import "CPGraphicsContext.j" CPGradientDrawsBeforeStartingLocation = kCGGradientDrawsBeforeStartLocation; diff --git a/AppKit/CPImage.j b/AppKit/CPImage.j index 2bbe5c0da..24c67563d 100644 --- a/AppKit/CPImage.j +++ b/AppKit/CPImage.j @@ -21,13 +21,13 @@ */ @import -@import @import @import @import @import @import +@import "CGGeometry.j" @import "CPCompatibility.j" CPImageLoadStatusInitialized = 0; diff --git a/AppKit/CPPopUpButton.j b/AppKit/CPPopUpButton.j index 98f837d4c..342233a0b 100644 --- a/AppKit/CPPopUpButton.j +++ b/AppKit/CPPopUpButton.j @@ -20,8 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -@import - +@import "CGGeometry.j" @import "CPButton.j" @import "CPKeyValueBinding.j" @import "CPMenu.j" diff --git a/AppKit/CPRuleEditor/CPPredicateEditorRowTemplate.j b/AppKit/CPRuleEditor/CPPredicateEditorRowTemplate.j index 631ea3c5d..21e6043f5 100644 --- a/AppKit/CPRuleEditor/CPPredicateEditorRowTemplate.j +++ b/AppKit/CPRuleEditor/CPPredicateEditorRowTemplate.j @@ -594,7 +594,7 @@ CPTransformableAttributeType = 1800; - (CPPopUpButton)_viewFromExpressions:(CPArray)expressions { - var popup = [[CPPopUpButton alloc] initWithFrame:CPMakeRect(0, 0, 100, 18)], + var popup = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0, 0, 100, 18)], count = [expressions count]; for (var i = 0; i < count; i++) diff --git a/AppKit/CPRuleEditor/CPRuleEditor.j b/AppKit/CPRuleEditor/CPRuleEditor.j index e4b86a55e..f8455ba45 100644 --- a/AppKit/CPRuleEditor/CPRuleEditor.j +++ b/AppKit/CPRuleEditor/CPRuleEditor.j @@ -2103,7 +2103,7 @@ TODO: implement [dragview setBackgroundColor:[firstSlice backgroundColor]]; [dragview setAlphaValue:0.7]; - dragPoint = CPMakePoint(0, firstIndex * _sliceHeight); + dragPoint = CGPointMake(0, firstIndex * _sliceHeight); [self dragView:dragview at:dragPoint @@ -2165,7 +2165,7 @@ TODO: implement if (_subviewIndexOfDropLine !== CPNotFound && _subviewIndexOfDropLine < numberOfRows) { var previousBelowSlice = [_slices objectAtIndex:_subviewIndexOfDropLine]; - [previousBelowSlice setFrameOrigin:CPMakePoint(0, [previousBelowSlice rowIndex] * _sliceHeight)]; + [previousBelowSlice setFrameOrigin:CGPointMake(0, [previousBelowSlice rowIndex] * _sliceHeight)]; } if (indexOfDropLine <= _lastRow && indexOfDropLine < numberOfRows) diff --git a/AppKit/CPSearchField.j b/AppKit/CPSearchField.j index 190f7f4e1..bfa44554a 100644 --- a/AppKit/CPSearchField.j +++ b/AppKit/CPSearchField.j @@ -679,7 +679,7 @@ var RECENT_SEARCH_PREFIX = @" "; return; var aFrame = [[self superview] convertRect:[self frame] toView:nil], - location = CPMakePoint(aFrame.origin.x + 10, aFrame.origin.y + aFrame.size.height - 4); + location = CGPointMake(aFrame.origin.x + 10, aFrame.origin.y + aFrame.size.height - 4); var anEvent = [CPEvent mouseEventWithType:CPRightMouseDown location:location modifierFlags:0 timestamp:[[CPApp currentEvent] timestamp] windowNumber:[[self window] windowNumber] context:nil eventNumber:1 clickCount:1 pressure:0]; diff --git a/AppKit/CPSplitView.j b/AppKit/CPSplitView.j index 68d4bbebb..cbd8b0bbe 100644 --- a/AppKit/CPSplitView.j +++ b/AppKit/CPSplitView.j @@ -1097,7 +1097,7 @@ The sum of the views and the sum of the dividers should be equal to the size of for (var i = 0; i < count; i++) { var frame = [_subviews[i] frame]; - [positions addObject:CPStringFromRect(frame)]; + [positions addObject:CGStringFromRect(frame)]; [preCollapseArray addObject:[_preCollapsePositions objectForKey:"" + i]]; } diff --git a/AppKit/CPStringDrawing.j b/AppKit/CPStringDrawing.j index 271e6a48c..6c3ce7ce0 100644 --- a/AppKit/CPStringDrawing.j +++ b/AppKit/CPStringDrawing.j @@ -22,7 +22,7 @@ @import -@import "CoreGraphics/CGGeometry.j" +@import "CGGeometry.j" @import "CPPlatformString.j" diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j index 6f1785949..2fbe2605f 100644 --- a/AppKit/CPTableView.j +++ b/AppKit/CPTableView.j @@ -4179,7 +4179,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad tableColumns:tableColumns event:currentEvent offset:offset]; - view = [[CPImageView alloc] initWithFrame:CPMakeRect(0, 0, [image size].width, [image size].height)]; + view = [[CPImageView alloc] initWithFrame:CGRectMake(0, 0, [image size].width, [image size].height)]; [view setImage:image]; } diff --git a/AppKit/CPView.j b/AppKit/CPView.j index 1e066480f..922e87681 100644 --- a/AppKit/CPView.j +++ b/AppKit/CPView.j @@ -21,13 +21,11 @@ */ @import -@import @import @import @import "CGAffineTransform.j" - - +@import "CGGeometry.j" @import "CPColor.j" @import "CPGraphicsContext.j" @import "CPResponder.j" diff --git a/AppKit/CPWindow/_CPAttachedWindowView.j b/AppKit/CPWindow/_CPAttachedWindowView.j index c92ca0b4d..d2d163e08 100644 --- a/AppKit/CPWindow/_CPAttachedWindowView.j +++ b/AppKit/CPWindow/_CPAttachedWindowView.j @@ -20,8 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -@import "_CPWindowView.j" +@import + @import "CGGradient.j" +@import "_CPWindowView.j" @global CPPopoverAppearanceMinimal diff --git a/AppKit/Cib/CPCib.j b/AppKit/Cib/CPCib.j index e7585757e..a2b5e7afa 100644 --- a/AppKit/Cib/CPCib.j +++ b/AppKit/Cib/CPCib.j @@ -29,11 +29,10 @@ @import "_CPCibCustomResource.j" @import "_CPCibCustomView.j" @import "_CPCibKeyedUnarchiver.j" +@import "_CPCibObjectData.j" @import "_CPCibProxyObject.j" @import "_CPCibWindowTemplate.j" -@class _CPCibObjectData - CPCibOwner = @"CPCibOwner"; CPCibTopLevelObjects = @"CPCibTopLevelObjects"; CPCibReplacementClasses = @"CPCibReplacementClasses"; diff --git a/AppKit/Cib/_CPCibObjectData.j b/AppKit/Cib/_CPCibObjectData.j index 8617afb62..5ac714a0e 100644 --- a/AppKit/Cib/_CPCibObjectData.j +++ b/AppKit/Cib/_CPCibObjectData.j @@ -24,16 +24,15 @@ @import @import -@import "CPCib.j" @import "CPCibConnector.j" @import "CPCibControlConnector.j" @import "CPCibOutletConnector.j" @import "CPCibBindingConnector.j" -@import "CPCibRuntimeAttributesConnector.j" @import "CPCibHelpConnector.j" @import "CPClipView.j" @class CPScrollView +@class CPCibRuntimeAttributesConnector @implementation _CPCibObjectData : CPObject diff --git a/AppKit/CoreGraphics/CGColor.j b/AppKit/CoreGraphics/CGColor.j index 61914080e..371c6861d 100644 --- a/AppKit/CoreGraphics/CGColor.j +++ b/AppKit/CoreGraphics/CGColor.j @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -//import "CGPattern.j" @import "CGColorSpace.j" diff --git a/AppKit/CoreGraphics/CGPath.j b/AppKit/CoreGraphics/CGPath.j index 9db475c66..b84b7a90b 100644 --- a/AppKit/CoreGraphics/CGPath.j +++ b/AppKit/CoreGraphics/CGPath.j @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -@import "CGGeometry.j" @import "CGAffineTransform.j" +@import "CGGeometry.j" kCGPathElementMoveToPoint = 0; diff --git a/AppKit/Resources/action_button.png b/AppKit/Resources/action_button.png new file mode 100644 index 0000000000000000000000000000000000000000..2af0dfc48ffaae68415fea7a5d2e6653786424ec GIT binary patch literal 506 zcmV3ZN0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzoJmAMRCwBA`2YVu12P5zW+>ec#2`jL zl+TT>79U17P!fn67#SH40BKgJp)kzH&d%Noq}P#bFb4<6E|@`3!{G+Au&``K;_o5J z;L_64t!S>qz(C9Y7#SJeCCOkQ_N=X~y$v!zM@Q#lUtiz#w{PDbo;Y#hH4qGE?E-N;l>gt@*!caAA3qL2)x$0R_U&6> zLPEkLAlm|4Iz9$WW`Ci{?H{g`0hGImC9;@+I16j4FflQ?2h$uJ9Q+K~Fj#8g -@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import @import +@import +@import +@import +@import +@import + +@import var themedButtonValues = nil, themedTextFieldValues = nil, diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j index cafe722c3..4da71fdcd 100644 --- a/AppKit/Themes/Aristo2/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j @@ -1,12 +1,51 @@ /* * ThemeDescriptors.j - * null + * AppKit * - * Created by You on December 12, 2012 - * Copyright 2012, Your Company. All rights reserved. + * Created by Antoine Mercadal + * Copyright 2012 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import +@import var themedButtonValues = nil, themedTextFieldValues = nil, diff --git a/AppKit/Themes/BlendKit/BKShowcaseController.j b/AppKit/Themes/BlendKit/BKShowcaseController.j index 662302101..fa0200f87 100644 --- a/AppKit/Themes/BlendKit/BKShowcaseController.j +++ b/AppKit/Themes/BlendKit/BKShowcaseController.j @@ -20,19 +20,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -@import +@import @import @import @import @import -@import @import @import -@import +@import @import "BKThemeDescriptor.j" +@class CPWindow +@global CPApp var LEFT_PANEL_WIDTH = 176.0; diff --git a/AppKit/Themes/BlendKit/BKThemeDescriptor.j b/AppKit/Themes/BlendKit/BKThemeDescriptor.j index c42c28b91..3fc00bca6 100644 --- a/AppKit/Themes/BlendKit/BKThemeDescriptor.j +++ b/AppKit/Themes/BlendKit/BKThemeDescriptor.j @@ -21,9 +21,6 @@ */ @import -@import -@import -@import var ItemSizes = { }, diff --git a/AppKit/Themes/CommonJS/blendtask.j b/AppKit/Themes/CommonJS/blendtask.j index 95f38e52c..36cab5364 100644 --- a/AppKit/Themes/CommonJS/blendtask.j +++ b/AppKit/Themes/CommonJS/blendtask.j @@ -1,7 +1,30 @@ +/* + * blendtask.j + * BlendKit + * + * Created by Francisco Tolmasky. + * Copyright 2009, 280 North, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ - -@import -@import +@import +@import +@import +@import +@import @import diff --git a/Foundation/Foundation.j b/Foundation/Foundation.j index 422501616..93e2a2781 100755 --- a/Foundation/Foundation.j +++ b/Foundation/Foundation.j @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import "_CGGeometry.j" @import "CPArray.j" @import "CPBundle.j" @import "CPCharacterSet.j" @@ -36,7 +37,6 @@ @import "CPException.j" @import "CPExpression.j" @import "CPFormatter.j" -@import "CPGeometry.j" @import "CPIndexSet.j" @import "CPIndexPath.j" @import "CPInvocation.j" diff --git a/Tools/capp/Generate.j b/Tools/capp/Generate.j index 9f5b1e058..63288c6d2 100644 --- a/Tools/capp/Generate.j +++ b/Tools/capp/Generate.j @@ -1,3 +1,24 @@ +/* + * Generate.j + * capp + * + * Created by Francisco Tolmasky. + * Copyright 2009, 280 North, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ @import "Configuration.j" diff --git a/Tools/nib2cib/Converter.j b/Tools/nib2cib/Converter.j index 2ea4eab3e..45f93dc2e 100644 --- a/Tools/nib2cib/Converter.j +++ b/Tools/nib2cib/Converter.j @@ -20,8 +20,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -@import -@import +@import +@import +@import +@import +@import +@import @import @global java diff --git a/Tools/nib2cib/NSButton.j b/Tools/nib2cib/NSButton.j index 198b3150b..0076f635c 100644 --- a/Tools/nib2cib/NSButton.j +++ b/Tools/nib2cib/NSButton.j @@ -27,6 +27,7 @@ @import @import +@import "Converter.j" @import "NSCell.j" @import "NSControl.j" diff --git a/Tools/nib2cib/NSCell.j b/Tools/nib2cib/NSCell.j index 47e6fb233..01307538a 100644 --- a/Tools/nib2cib/NSCell.j +++ b/Tools/nib2cib/NSCell.j @@ -24,6 +24,7 @@ */ @import +@import @import "NSFont.j" diff --git a/Tools/nib2cib/NSComboBox.j b/Tools/nib2cib/NSComboBox.j index ee405c663..f0622eb23 100644 --- a/Tools/nib2cib/NSComboBox.j +++ b/Tools/nib2cib/NSComboBox.j @@ -23,6 +23,7 @@ @import @import +@import "Converter.j" @import "NSTextField.j" diff --git a/Tools/nib2cib/NSDictionary.j b/Tools/nib2cib/NSDictionary.j index d9b33b19a..eb57da8b8 100644 --- a/Tools/nib2cib/NSDictionary.j +++ b/Tools/nib2cib/NSDictionary.j @@ -23,6 +23,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import +@import + + @implementation NSDictionary : CPObject { } diff --git a/Tools/nib2cib/NSFormatter.j b/Tools/nib2cib/NSFormatter.j index e5352dc2d..9a8319876 100644 --- a/Tools/nib2cib/NSFormatter.j +++ b/Tools/nib2cib/NSFormatter.j @@ -1,3 +1,27 @@ +/* + * NSFont.j + * nib2cib + * + * Created by Klaas Pieter Annema. + * Copyright 2010 Cappuccino Foundation. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +@import + @implementation NSFormatter : CPObject { } diff --git a/Tools/nib2cib/NSImageView.j b/Tools/nib2cib/NSImageView.j index 157ac3201..48f94a3f1 100644 --- a/Tools/nib2cib/NSImageView.j +++ b/Tools/nib2cib/NSImageView.j @@ -22,6 +22,8 @@ @import +@import "NSCell.j" + @implementation CPImageView (NSCoding) diff --git a/Tools/nib2cib/NSLevelIndicator.j b/Tools/nib2cib/NSLevelIndicator.j index 8e936d566..b65ac45c0 100644 --- a/Tools/nib2cib/NSLevelIndicator.j +++ b/Tools/nib2cib/NSLevelIndicator.j @@ -22,6 +22,9 @@ @import +@import "NSCell.j" + + @implementation CPLevelIndicator (CPCoding) - (id)NS_initWithCoder:(CPCoder)aCoder diff --git a/Tools/nib2cib/NSMatrix.j b/Tools/nib2cib/NSMatrix.j index 4ee93c847..ca5cbdc69 100644 --- a/Tools/nib2cib/NSMatrix.j +++ b/Tools/nib2cib/NSMatrix.j @@ -21,6 +21,7 @@ */ @import +@import @import @import "NSView.j" diff --git a/Tools/nib2cib/NSMenu.j b/Tools/nib2cib/NSMenu.j index e54284231..6a59da332 100644 --- a/Tools/nib2cib/NSMenu.j +++ b/Tools/nib2cib/NSMenu.j @@ -22,8 +22,6 @@ @import -@import "NSMenuItem.j" - NS_CPMenuNameMap = { diff --git a/Tools/nib2cib/NSMenuItem.j b/Tools/nib2cib/NSMenuItem.j index 2b4a6f222..39a4384f5 100644 --- a/Tools/nib2cib/NSMenuItem.j +++ b/Tools/nib2cib/NSMenuItem.j @@ -26,7 +26,6 @@ @import "NSEvent.j" @import "NSMenu.j" - @implementation CPMenuItem (NSCoding) - (id)NS_initWithCoder:(CPCoder)aCoder diff --git a/Tools/nib2cib/NSMutableString.j b/Tools/nib2cib/NSMutableString.j index 641b27b5d..efc62a0e8 100644 --- a/Tools/nib2cib/NSMutableString.j +++ b/Tools/nib2cib/NSMutableString.j @@ -23,6 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import + + @implementation NSMutableString : CPObject { } diff --git a/Tools/nib2cib/NSNibConnector.j b/Tools/nib2cib/NSNibConnector.j index e2bedde15..fe78a84e2 100644 --- a/Tools/nib2cib/NSNibConnector.j +++ b/Tools/nib2cib/NSNibConnector.j @@ -20,11 +20,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import @import @import @import @import @import +@import NIB_CONNECTION_EQUIVALENCY_TABLE = {}; diff --git a/Tools/nib2cib/NSPopUpButton.j b/Tools/nib2cib/NSPopUpButton.j index ece79a2f9..0a58d88b2 100644 --- a/Tools/nib2cib/NSPopUpButton.j +++ b/Tools/nib2cib/NSPopUpButton.j @@ -23,6 +23,7 @@ @import @import "NSMenu.j" +@import "NSMenuItem.j" @implementation CPPopUpButton (CPCoding) diff --git a/Tools/nib2cib/NSSearchField.j b/Tools/nib2cib/NSSearchField.j index 79f00f241..e4a7b785c 100644 --- a/Tools/nib2cib/NSSearchField.j +++ b/Tools/nib2cib/NSSearchField.j @@ -21,6 +21,8 @@ */ @import + +@import "Converter.j" @import "NSTextField.j" diff --git a/Tools/nib2cib/NSSegmentedControl.j b/Tools/nib2cib/NSSegmentedControl.j index 437e66982..a8de6ecb3 100644 --- a/Tools/nib2cib/NSSegmentedControl.j +++ b/Tools/nib2cib/NSSegmentedControl.j @@ -21,8 +21,11 @@ */ @import + +@import "Converter.j" @import "NSCell.j" + @implementation CPSegmentedControl (CPCoding) - (id)NS_initWithCoder:(CPCoder)aCoder diff --git a/Tools/nib2cib/NSSlider.j b/Tools/nib2cib/NSSlider.j index a754ff432..d842999ae 100644 --- a/Tools/nib2cib/NSSlider.j +++ b/Tools/nib2cib/NSSlider.j @@ -22,6 +22,9 @@ @import +@import "NSCell.j" + + @implementation CPSlider (CPCoding) - (id)NS_initWithCoder:(CPCoder)aCoder diff --git a/Tools/nib2cib/NSSortDescriptor.j b/Tools/nib2cib/NSSortDescriptor.j index c4f0beb87..d245cf458 100644 --- a/Tools/nib2cib/NSSortDescriptor.j +++ b/Tools/nib2cib/NSSortDescriptor.j @@ -1,3 +1,25 @@ +/* + * NSSortDescriptor.j + * nib2cib + * + * Created by Francisco Tolmasky. + * Copyright 2009, 280 North, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + @import @implementation CPSortDescriptor (NSCoding) @@ -32,4 +54,4 @@ return [CPSortDescriptor class]; } -@end \ No newline at end of file +@end diff --git a/Tools/nib2cib/NSStepper.j b/Tools/nib2cib/NSStepper.j index d1146a583..d7e91f141 100644 --- a/Tools/nib2cib/NSStepper.j +++ b/Tools/nib2cib/NSStepper.j @@ -22,6 +22,9 @@ @import +@import "NSCell.j" + + @implementation CPStepper (CPCoding) - (id)NS_initWithCoder:(CPCoder)aCoder diff --git a/Tools/nib2cib/NSTableColumn.j b/Tools/nib2cib/NSTableColumn.j index f10765d84..49aa57524 100644 --- a/Tools/nib2cib/NSTableColumn.j +++ b/Tools/nib2cib/NSTableColumn.j @@ -20,11 +20,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - +@import @import @import @import +@import "NSButton.j" +@import "NSImageView.j" +@import "NSLevelIndicator.j" +@import "NSTextField.j" + @implementation CPTableColumn (NSCoding) - (id)NS_initWithCoder:(CPCoder)aCoder diff --git a/Tools/nib2cib/NSTableHeaderView.j b/Tools/nib2cib/NSTableHeaderView.j index 30c655a11..1aef3f144 100644 --- a/Tools/nib2cib/NSTableHeaderView.j +++ b/Tools/nib2cib/NSTableHeaderView.j @@ -22,6 +22,11 @@ @import +@import "Converter.j" + +@class CPTableView + + @implementation CPTableHeaderView (NSCoding) - (id)NS_initWithCoder:(CPCoder)aCoder diff --git a/Tools/nib2cib/NSTableView.j b/Tools/nib2cib/NSTableView.j index 7e65851d6..02906f290 100644 --- a/Tools/nib2cib/NSTableView.j +++ b/Tools/nib2cib/NSTableView.j @@ -20,9 +20,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - @import +@import "Converter.j" + + @implementation CPTableView (NSCoding) - (id)NS_initWithCoder:(CPCoder)aCoder diff --git a/Tools/nib2cib/NSTextField.j b/Tools/nib2cib/NSTextField.j index 8c6d1241d..a7b196494 100644 --- a/Tools/nib2cib/NSTextField.j +++ b/Tools/nib2cib/NSTextField.j @@ -20,11 +20,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import @import -@import "NSControl.j" @import "NSCell.j" -@import +@import "NSControl.j" @implementation CPTextField (NSCoding) diff --git a/Tools/nib2cib/NSTokenField.j b/Tools/nib2cib/NSTokenField.j index b6216d48a..a471542d1 100644 --- a/Tools/nib2cib/NSTokenField.j +++ b/Tools/nib2cib/NSTokenField.j @@ -20,12 +20,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import @import @import "NSControl.j" @import "NSCell.j" @import "NSTextField.j" -@import @implementation CPTokenField (NSCoding) diff --git a/Tools/nib2cib/NSWindowTemplate.j b/Tools/nib2cib/NSWindowTemplate.j index 49063a668..e9cb2adc7 100644 --- a/Tools/nib2cib/NSWindowTemplate.j +++ b/Tools/nib2cib/NSWindowTemplate.j @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import @import @global CP_NSMapClassName diff --git a/Tools/nib2cib/Nib2Cib.j b/Tools/nib2cib/Nib2Cib.j index d51cae78d..d64205851 100644 --- a/Tools/nib2cib/Nib2Cib.j +++ b/Tools/nib2cib/Nib2Cib.j @@ -20,13 +20,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -@import -@import +@import +@import +@import +@import @import -@import "NSFoundation.j" -@import "NSAppKit.j" - @import "Nib2CibKeyedUnarchiver.j" @import "Converter.j" @import "Converter+Mac.j" diff --git a/Tools/nib2cib/_NSCornerView.j b/Tools/nib2cib/_NSCornerView.j index c7c4184b1..c8944c9e3 100644 --- a/Tools/nib2cib/_NSCornerView.j +++ b/Tools/nib2cib/_NSCornerView.j @@ -21,6 +21,7 @@ */ @import +@import @implementation _CPCornerView (NSCoding)