Mercurial > projects > dstep
changeset 22:f8a3b67adfcb
Removed duplicated methods
| author | Jacob Carlborg <doob@me.com> |
|---|---|
| date | Tue, 09 Feb 2010 18:02:03 +0100 |
| parents | 6b688d8f62c5 |
| children | 420969b22201 |
| files | dsss.conf dstep/appkit/NSColorPicker.d dstep/appkit/NSDictionaryController.d dstep/appkit/NSDocument.d dstep/appkit/NSDocumentController.d dstep/appkit/NSFileWrapper.d dstep/appkit/NSFontManager.d dstep/appkit/NSImage.d dstep/appkit/NSLayoutManager.d dstep/appkit/NSSimpleHorizontalTypesetter.d dstep/appkit/NSTextView.d dstep/appkit/NSView.d dstep/appkit/NSWindowController.d dstep/foundation/NSObject.d dstep/qtkit/QTMovie.d dstep/quartzcore/CAAnimation.d dstep/quartzcore/CALayer.d dstep/quartzcore/CIColor.d dstep/quartzcore/CIImage.d |
| diffstat | 19 files changed, 30 insertions(+), 144 deletions(-) [+] |
line wrap: on
line diff
--- a/dsss.conf Wed Feb 03 18:28:58 2010 +0100 +++ b/dsss.conf Tue Feb 09 18:02:03 2010 +0100 @@ -1,16 +1,17 @@ [dstep] #target=cocoa-d-test + version (GNU){ - buildflags += -framework Foundation -framework ApplicationServices -framework CoreFoundation -framework CoreServices -framework DiskArbitration -framework Security -framework QuartzCore -framework QTKit -framework AppKit + buildflags += -framework Foundation -framework ApplicationServices -framework CoreFoundation -framework CoreServices -framework DiskArbitration -framework Security -framework QuartzCore -framework QTKit -framework AppKit -framework CoreData } version (LDC) { - buildflags += -L-framework -LFoundation -L-framework -LApplicationServices -L-framework -LCoreFoundation -L-framework -LCoreServices -L-framework -LDiskArbitration -L-framework -LSecurity -L-framework -LQuartzCore -L-framework -LQTKit -L-framework -LAppKit + buildflags += -L-framework -LFoundation -L-framework -LApplicationServices -L-framework -LCoreFoundation -L-framework -LCoreServices -L-framework -LDiskArbitration -L-framework -LSecurity -L-framework -LQuartzCore -L-framework -LQTKit -L-framework -LAppKit -L-framework -LCoreData } version (DigitalMars) { - buildflags += -L-framework -LFoundation -L-framework -LApplicationServices -L-framework -LCoreFoundation -L-framework -LCoreServices -L-framework -LDiskArbitration -L-framework -LSecurity -L-framework -LQuartzCore -L-framework -LQTKit -L-framework -LAppKit + buildflags += -L-framework -LFoundation -L-framework -LApplicationServices -L-framework -LCoreFoundation -L-framework -LCoreServices -L-framework -LDiskArbitration -L-framework -LSecurity -L-framework -LQuartzCore -L-framework -LQTKit -L-framework -LAppKit -L-framework -LCoreData } #-L-dead_strip -L-x -L-S \ No newline at end of file
--- a/dstep/appkit/NSColorPicker.d Wed Feb 03 18:28:58 2010 +0100 +++ b/dstep/appkit/NSColorPicker.d Tue Feb 09 18:02:03 2010 +0100 @@ -52,6 +52,11 @@ { return invokeObjcSelf!(void, "viewSizeChanged:", Object)(sender); } + + void alphaControlAddedOrRemoved (Object sender) + { + return invokeObjcSelf!(void, "alphaControlAddedOrRemoved:", Object)(sender); + } void attachColorList (NSColorList colorList) { @@ -77,30 +82,5 @@ { return invokeObjcSelf!(NSSize, "minContentSize"); } - - void insertNewButtonImage (NSImage newButtonImage, NSButtonCell buttonCell) - { - return invokeObjcSelf!(void, "insertNewButtonImage:in:", NSImage, NSButtonCell)(newButtonImage, buttonCell); - } - - void viewSizeChanged (Object sender) - { - return invokeObjcSelf!(void, "viewSizeChanged:", Object)(sender); - } - - void alphaControlAddedOrRemoved (Object sender) - { - return invokeObjcSelf!(void, "alphaControlAddedOrRemoved:", Object)(sender); - } - - void attachColorList (NSColorList colorList) - { - return invokeObjcSelf!(void, "attachColorList:", NSColorList)(colorList); - } - - void detachColorList (NSColorList colorList) - { - return invokeObjcSelf!(void, "detachColorList:", NSColorList)(colorList); - } }
--- a/dstep/appkit/NSDictionaryController.d Wed Feb 03 18:28:58 2010 +0100 +++ b/dstep/appkit/NSDictionaryController.d Tue Feb 09 18:02:03 2010 +0100 @@ -17,7 +17,7 @@ { mixin (ObjcWrap); - Object newObject () + NSDictionaryController newObject () { return invokeObjcSelf!(Object, "newObject"); } @@ -35,7 +35,7 @@ this () { - super(NSDictionaryController.alloc.initialKey.objcObject); + super(NSDictionaryController.alloc.newObject.objcObject); } void setInitialValue (Object value) @@ -49,11 +49,6 @@ return result is this.objcObject ? this : (result !is null ? new NSDictionaryController(result) : null); } - this () - { - super(NSDictionaryController.alloc.initialValue.objcObject); - } - void setIncludedKeys (NSArray keys) { return invokeObjcSelf!(void, "setIncludedKeys:", NSArray)(keys);
--- a/dstep/appkit/NSDocument.d Wed Feb 03 18:28:58 2010 +0100 +++ b/dstep/appkit/NSDocument.d Tue Feb 09 18:02:03 2010 +0100 @@ -731,11 +731,6 @@ { return invokeObjcSelf!(bool, "validateUserInterfaceItem:", INSValidatedUserInterfaceItem)(anItem); } - - bool validateUserInterfaceItem (INSValidatedUserInterfaceItem anItem) - { - return invokeObjcSelf!(bool, "validateUserInterfaceItem:", INSValidatedUserInterfaceItem)(anItem); - } // NSDeprecated NSData dataRepresentationOfType (NSString type)
--- a/dstep/appkit/NSDocumentController.d Wed Feb 03 18:28:58 2010 +0100 +++ b/dstep/appkit/NSDocumentController.d Tue Feb 09 18:02:03 2010 +0100 @@ -313,10 +313,5 @@ { return invokeObjcSelf!(bool, "validateUserInterfaceItem:", INSValidatedUserInterfaceItem)(anItem); } - - bool validateUserInterfaceItem (INSValidatedUserInterfaceItem anItem) - { - return invokeObjcSelf!(bool, "validateUserInterfaceItem:", INSValidatedUserInterfaceItem)(anItem); - } }
--- a/dstep/appkit/NSFileWrapper.d Wed Feb 03 18:28:58 2010 +0100 +++ b/dstep/appkit/NSFileWrapper.d Tue Feb 09 18:02:03 2010 +0100 @@ -62,11 +62,6 @@ return result is this.objcObject ? this : (result !is null ? new NSFileWrapper(result) : null); } - this (NSString path) - { - super(NSFileWrapper.alloc.initSymbolicLinkWithDestination(path).objcObject); - } - NSFileWrapper initWithPath (NSString path) { id result = invokeObjcSelf!(id, "initWithPath:", NSString)(path); @@ -84,11 +79,6 @@ return result is this.objcObject ? this : (result !is null ? new NSFileWrapper(result) : null); } - this (NSData data) - { - super(NSFileWrapper.alloc.initWithSerializedRepresentation(data).objcObject); - } - bool writeToFile (NSString path, bool atomicFlag, bool updateFilenamesFlag) { return invokeObjcSelf!(bool, "writeToFile:atomically:updateFilenames:", NSString, bool, bool)(path, atomicFlag, updateFilenamesFlag);
--- a/dstep/appkit/NSFontManager.d Wed Feb 03 18:28:58 2010 +0100 +++ b/dstep/appkit/NSFontManager.d Tue Feb 09 18:02:03 2010 +0100 @@ -225,7 +225,7 @@ return invokeObjcSelf!(NSFont, "convertFont:toFace:", NSFont, NSString)(fontObj, typeface); } - NSFont convertFont (NSFont fontObj, NSString family) + NSFont convertFont_toFamily (NSFont fontObj, NSString family) { return invokeObjcSelf!(NSFont, "convertFont:toFamily:", NSFont, NSString)(fontObj, family); } @@ -235,7 +235,7 @@ return invokeObjcSelf!(NSFont, "convertFont:toHaveTrait:", NSFont, uint)(fontObj, trait); } - NSFont convertFont (NSFont fontObj, uint trait) + NSFont convertFont_toNotHaveTrait (NSFont fontObj, uint trait) { return invokeObjcSelf!(NSFont, "convertFont:toNotHaveTrait:", NSFont, uint)(fontObj, trait); }
--- a/dstep/appkit/NSImage.d Wed Feb 03 18:28:58 2010 +0100 +++ b/dstep/appkit/NSImage.d Tue Feb 09 18:02:03 2010 +0100 @@ -530,22 +530,12 @@ return result is this.objcObject ? this : (result !is null ? new NSImage(result) : null); } - this (NSString fileName) - { - super(NSImage.alloc.initByReferencingFile(fileName).objcObject); - } - NSImage initByReferencingURL (NSURL url) { id result = invokeObjcSelf!(id, "initByReferencingURL:", NSURL)(url); return result is this.objcObject ? this : (result !is null ? new NSImage(result) : null); } - this (NSURL url) - { - super(NSImage.alloc.initByReferencingURL(url).objcObject); - } - NSImage initWithIconRef (IconRef iconRef) { id result = invokeObjcSelf!(id, "initWithIconRef:", IconRef)(iconRef);
--- a/dstep/appkit/NSLayoutManager.d Wed Feb 03 18:28:58 2010 +0100 +++ b/dstep/appkit/NSLayoutManager.d Tue Feb 09 18:02:03 2010 +0100 @@ -809,16 +809,6 @@ { return invokeObjcSelf!(void, "setUsesFontLeading:", bool)(flag); } - - void insertGlyphs (NSGlyph* glyphs, NSUInteger length, NSUInteger glyphIndex, NSUInteger charIndex) - { - return invokeObjcSelf!(void, "insertGlyphs:length:forStartingGlyphAtIndex:characterIndex:", NSGlyph*, NSUInteger, NSUInteger, NSUInteger)(glyphs, length, glyphIndex, charIndex); - } - - void setIntAttribute (NSInteger attributeTag, NSInteger val, NSUInteger glyphIndex) - { - return invokeObjcSelf!(void, "setIntAttribute:value:forGlyphAtIndex:", NSInteger, NSInteger, NSUInteger)(attributeTag, val, glyphIndex); - } // NSTextViewSupport NSArray rulerMarkersForTextView (NSTextView view, NSParagraphStyle style, NSRulerView ruler)
--- a/dstep/appkit/NSSimpleHorizontalTypesetter.d Wed Feb 03 18:28:58 2010 +0100 +++ b/dstep/appkit/NSSimpleHorizontalTypesetter.d Tue Feb 09 18:02:03 2010 +0100 @@ -204,11 +204,6 @@ return invokeObjcSelf!(NSUInteger, "glyphIndexToBreakLineByWordWrappingAtIndex:", NSUInteger)(charIndex); } - NSLayoutStatus layoutControlGlyphForLineFragment (NSRect lineFrag) - { - return invokeObjcSelf!(NSLayoutStatus, "layoutControlGlyphForLineFragment:", NSRect)(lineFrag); - } - void fullJustifyLineAtGlyphIndex (NSUInteger glyphIndexForLineBreak) { return invokeObjcSelf!(void, "fullJustifyLineAtGlyphIndex:", NSUInteger)(glyphIndexForLineBreak);
--- a/dstep/appkit/NSTextView.d Wed Feb 03 18:28:58 2010 +0100 +++ b/dstep/appkit/NSTextView.d Tue Feb 09 18:02:03 2010 +0100 @@ -976,7 +976,7 @@ return invokeObjcSelf!(void, "textView:clickedOnCell:inRect:atIndex:", NSTextView, INSTextAttachmentCell, NSRect, NSUInteger)(textView, cell, cellFrame, charIndex); } - void textView (NSTextView textView, INSTextAttachmentCell cell, NSRect cellFrame, NSUInteger charIndex) + void textView_doubleClickedOnCell_inRect_atIndex (NSTextView textView, INSTextAttachmentCell cell, NSRect cellFrame, NSUInteger charIndex) { return invokeObjcSelf!(void, "textView:doubleClickedOnCell:inRect:atIndex:", NSTextView, INSTextAttachmentCell, NSRect, NSUInteger)(textView, cell, cellFrame, charIndex); } @@ -1006,7 +1006,7 @@ return invokeObjcSelf!(NSArray, "textView:willChangeSelectionFromCharacterRanges:toCharacterRanges:", NSTextView, NSArray, NSArray)(textView, oldSelectedCharRanges, newSelectedCharRanges); } - bool textView (NSTextView textView, NSArray affectedRanges, NSArray replacementStrings) + bool textView_shouldChangeTextInRanges_replacementStrings (NSTextView textView, NSArray affectedRanges, NSArray replacementStrings) { return invokeObjcSelf!(bool, "textView:shouldChangeTextInRanges:replacementStrings:", NSTextView, NSArray, NSArray)(textView, affectedRanges, replacementStrings); } @@ -1066,7 +1066,7 @@ return invokeObjcSelf!(void, "textView:clickedOnCell:inRect:", NSTextView, INSTextAttachmentCell, NSRect)(textView, cell, cellFrame); } - void textView (NSTextView textView, INSTextAttachmentCell cell, NSRect cellFrame) + void textViewdoubleClickedOnCell_inRect (NSTextView textView, INSTextAttachmentCell cell, NSRect cellFrame) { return invokeObjcSelf!(void, "textView:doubleClickedOnCell:inRect:", NSTextView, INSTextAttachmentCell, NSRect)(textView, cell, cellFrame); }
--- a/dstep/appkit/NSView.d Wed Feb 03 18:28:58 2010 +0100 +++ b/dstep/appkit/NSView.d Tue Feb 09 18:02:03 2010 +0100 @@ -679,7 +679,7 @@ return invokeObjcSelf!(NSPoint, "convertPoint:fromView:", NSPoint, NSView)(aPoint, aView); } - NSPoint convertPoint (NSPoint aPoint, NSView aView) + NSPoint convertPoint_toView (NSPoint aPoint, NSView aView) { return invokeObjcSelf!(NSPoint, "convertPoint:toView:", NSPoint, NSView)(aPoint, aView); } @@ -689,7 +689,7 @@ return invokeObjcSelf!(NSSize, "convertSize:fromView:", NSSize, NSView)(aSize, aView); } - NSSize convertSize (NSSize aSize, NSView aView) + NSSize convertSize_toView (NSSize aSize, NSView aView) { return invokeObjcSelf!(NSSize, "convertSize:toView:", NSSize, NSView)(aSize, aView); } @@ -699,7 +699,7 @@ return invokeObjcSelf!(NSRect, "convertRect:fromView:", NSRect, NSView)(aRect, aView); } - NSRect convertRect (NSRect aRect, NSView aView) + NSRect convertRect_toView (NSRect aRect, NSView aView) { return invokeObjcSelf!(NSRect, "convertRect:toView:", NSRect, NSView)(aRect, aView); }
--- a/dstep/appkit/NSWindowController.d Wed Feb 03 18:28:58 2010 +0100 +++ b/dstep/appkit/NSWindowController.d Tue Feb 09 18:02:03 2010 +0100 @@ -75,11 +75,6 @@ return result is this.objcObject ? this : (result !is null ? new NSWindowController(result) : null); } - this (NSString windowNibPath, Object owner) - { - super(NSWindowController.alloc.initWithWindowNibPath(windowNibPath, owner).objcObject); - } - NSString windowNibName () { return invokeObjcSelf!(NSString, "windowNibName");
--- a/dstep/foundation/NSObject.d Wed Feb 03 18:28:58 2010 +0100 +++ b/dstep/foundation/NSObject.d Tue Feb 09 18:02:03 2010 +0100 @@ -651,7 +651,7 @@ return invokeObjcSelf!(bool, "fileManager:shouldProceedAfterError:movingItemAtPath:toPath:", NSFileManager, NSError, NSString, NSString)(fileManager, error, srcPath, dstPath); } - bool fileManager (NSFileManager fileManager, NSString srcPath, NSString dstPath) + bool fileManager_shouldLinkItemAtPath_toPath (NSFileManager fileManager, NSString srcPath, NSString dstPath) { return invokeObjcSelf!(bool, "fileManager:shouldLinkItemAtPath:toPath:", NSFileManager, NSString, NSString)(fileManager, srcPath, dstPath); } @@ -1041,11 +1041,6 @@ return invokeObjcSelf!(Object, "newScriptingObjectOfClass:forValueForKey:withContentsValue:properties:", Class, NSString, Object, NSDictionary)(objectClass, key, contentsValue, properties); } - Object scriptingValueForSpecifier (NSScriptObjectSpecifier objectSpecifier) - { - return invokeObjcSelf!(Object, "scriptingValueForSpecifier:", NSScriptObjectSpecifier)(objectSpecifier); - } - bool scriptingIsEqualTo (Object object) { return invokeObjcSelf!(bool, "scriptingIsEqualTo:", Object)(object);
--- a/dstep/qtkit/QTMovie.d Wed Feb 03 18:28:58 2010 +0100 +++ b/dstep/qtkit/QTMovie.d Tue Feb 09 18:02:03 2010 +0100 @@ -2445,11 +2445,6 @@ return result is this.objcObject ? this : (result !is null ? new typeof(this)(result) : null); } - this (NSString filename, ref NSError errorPtr) - { - super(typeof(this).alloc.initToWritableFile(filename, errorPtr).objcObject); - } - typeof(this) initToWritableData (NSMutableData data, ref NSError errorPtr) { id __arg1; @@ -2485,11 +2480,6 @@ return result is this.objcObject ? this : (result !is null ? new typeof(this)(result) : null); } - this (QTDataReference dataReference, ref NSError errorPtr) - { - super(typeof(this).alloc.initToWritableDataReference(dataReference, errorPtr).objcObject); - } - void invalidate () { return invokeObjcSelf!(void, "invalidate");
--- a/dstep/quartzcore/CAAnimation.d Wed Feb 03 18:28:58 2010 +0100 +++ b/dstep/quartzcore/CAAnimation.d Tue Feb 09 18:02:03 2010 +0100 @@ -175,6 +175,8 @@ { return invokeObjcSelf!(void, "setDelegate:", Object)(arg0); } + + alias setDelegate delegate_; bool isRemovedOnCompletion () { @@ -319,16 +321,6 @@ return invokeObjcSelf!(Object, "modelLayer"); } - static Object defaultValueForKey (NSString key) - { - return invokeObjcSelfClass!(Object, "defaultValueForKey:", NSString)(key); - } - - bool shouldArchiveValueForKey (NSString key) - { - return invokeObjcSelf!(bool, "shouldArchiveValueForKey:", NSString)(key); - } - CGRect bounds () { return invokeObjcSelf!(CGRect, "bounds"); @@ -439,7 +431,7 @@ return invokeObjcSelf!(void, "insertSublayer:below:", dstep.quartzcore.CALayer.CALayer, dstep.quartzcore.CALayer.CALayer)(layer, sibling); } - void insertSublayer (dstep.quartzcore.CALayer.CALayer layer, dstep.quartzcore.CALayer.CALayer sibling) + void insertSublayer_above (dstep.quartzcore.CALayer.CALayer layer, dstep.quartzcore.CALayer.CALayer sibling) { return invokeObjcSelf!(void, "insertSublayer:above:", dstep.quartzcore.CALayer.CALayer, dstep.quartzcore.CALayer.CALayer)(layer, sibling); } @@ -474,7 +466,7 @@ return invokeObjcSelf!(CGPoint, "convertPoint:fromLayer:", CGPoint, dstep.quartzcore.CALayer.CALayer)(p, l); } - CGPoint convertPoint (CGPoint p, dstep.quartzcore.CALayer.CALayer l) + CGPoint convertPoint_toLayer (CGPoint p, dstep.quartzcore.CALayer.CALayer l) { return invokeObjcSelf!(CGPoint, "convertPoint:toLayer:", CGPoint, dstep.quartzcore.CALayer.CALayer)(p, l); } @@ -484,7 +476,7 @@ return invokeObjcSelf!(CGRect, "convertRect:fromLayer:", CGRect, dstep.quartzcore.CALayer.CALayer)(r, l); } - CGRect convertRect (CGRect r, dstep.quartzcore.CALayer.CALayer l) + CGRect convertRect_toLayer (CGRect r, dstep.quartzcore.CALayer.CALayer l) { return invokeObjcSelf!(CGRect, "convertRect:toLayer:", CGRect, dstep.quartzcore.CALayer.CALayer)(r, l); } @@ -494,7 +486,7 @@ return invokeObjcSelf!(double, "convertTime:fromLayer:", double, dstep.quartzcore.CALayer.CALayer)(t, l); } - double convertTime (double t, dstep.quartzcore.CALayer.CALayer l) + double convertTime_toLayer (double t, dstep.quartzcore.CALayer.CALayer l) { return invokeObjcSelf!(double, "convertTime:toLayer:", double, dstep.quartzcore.CALayer.CALayer)(t, l); } @@ -764,13 +756,6 @@ return invokeObjcSelf!(CAAnimation, "animationForKey:", NSString)(key); } - void setDelegate (Object arg0) - { - return invokeObjcSelf!(void, "setDelegate:", Object)(arg0); - } - - alias setDelegate delegate_; - void runActionForKey (NSString event, Object anObject, NSDictionary dict) { return invokeObjcSelf!(void, "runActionForKey:object:arguments:", NSString, Object, NSDictionary)(event, anObject, dict);
--- a/dstep/quartzcore/CALayer.d Wed Feb 03 18:28:58 2010 +0100 +++ b/dstep/quartzcore/CALayer.d Tue Feb 09 18:02:03 2010 +0100 @@ -376,7 +376,7 @@ return invokeObjcSelf!(void, "insertSublayer:below:", CALayer, CALayer)(layer, sibling); } - void insertSublayer (CALayer layer, CALayer sibling) + void insertSublayer_above (CALayer layer, CALayer sibling) { return invokeObjcSelf!(void, "insertSublayer:above:", CALayer, CALayer)(layer, sibling); } @@ -411,7 +411,7 @@ return invokeObjcSelf!(CGPoint, "convertPoint:fromLayer:", CGPoint, CALayer)(p, l); } - CGPoint convertPoint (CGPoint p, CALayer l) + CGPoint convertPoint_toLayer (CGPoint p, CALayer l) { return invokeObjcSelf!(CGPoint, "convertPoint:toLayer:", CGPoint, CALayer)(p, l); } @@ -421,7 +421,7 @@ return invokeObjcSelf!(CGRect, "convertRect:fromLayer:", CGRect, CALayer)(r, l); } - CGRect convertRect (CGRect r, CALayer l) + CGRect convertRect_toLayer (CGRect r, CALayer l) { return invokeObjcSelf!(CGRect, "convertRect:toLayer:", CGRect, CALayer)(r, l); } @@ -431,7 +431,7 @@ return invokeObjcSelf!(double, "convertTime:fromLayer:", double, CALayer)(t, l); } - double convertTime (double t, CALayer l) + double convertTime_toLayer (double t, CALayer l) { return invokeObjcSelf!(double, "convertTime:toLayer:", double, CALayer)(t, l); }
--- a/dstep/quartzcore/CIColor.d Wed Feb 03 18:28:58 2010 +0100 +++ b/dstep/quartzcore/CIColor.d Tue Feb 09 18:02:03 2010 +0100 @@ -40,11 +40,6 @@ { return invokeObjcSelf!(typeof(this), "initWithCoder:", NSCoder)(aDecoder); } - - typeof(this) copyWithZone (NSZone* zone) - { - return invokeObjcSelf!(typeof(this), "copyWithZone:", NSZone*)(zone); - } static CIColor colorWithCGColor (CGColorRef c) {
--- a/dstep/quartzcore/CIImage.d Wed Feb 03 18:28:58 2010 +0100 +++ b/dstep/quartzcore/CIImage.d Tue Feb 09 18:02:03 2010 +0100 @@ -72,11 +72,6 @@ { return invokeObjcSelf!(typeof(this), "initWithCoder:", NSCoder)(aDecoder); } - - typeof(this) copyWithZone (NSZone* zone) - { - return invokeObjcSelf!(typeof(this), "copyWithZone:", NSZone*)(zone); - } static CIImage imageWithCGImage (CGImageRef image) {