Mercurial > projects > dwt-mac
diff dwt/internal/cocoa/NSEnumerator.d @ 45:d8635bb48c7c
Merge with SWT 3.5
author | Jacob Carlborg <doob@me.com> |
---|---|
date | Mon, 01 Dec 2008 17:07:00 +0100 |
parents | f565d3a95c0a |
children |
line wrap: on
line diff
--- a/dwt/internal/cocoa/NSEnumerator.d Tue Oct 21 15:20:04 2008 +0200 +++ b/dwt/internal/cocoa/NSEnumerator.d Mon Dec 01 17:07:00 2008 +0100 @@ -1,55 +1,41 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. + * Copyright (c) 2000, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation * * Port to the D programming language: - * Jacob Carlborg <jacob.carlborg@gmail.com> + * Jacob Carlborg <doob@me.com> *******************************************************************************/ module dwt.internal.cocoa.NSEnumerator; -import dwt.internal.cocoa.id; -import dwt.internal.cocoa.NSArray; +import dwt.dwthelper.utils; +import cocoa = dwt.internal.cocoa.id; import dwt.internal.cocoa.NSObject; import dwt.internal.cocoa.OS; import objc = dwt.internal.objc.runtime; -struct NSFastEnumerationState -{ - uint state; - objc.id* itemsPtr; - uint* mutationsPtr; - /*unsigned long extra[5];*/ uint* extra; +public class NSEnumerator : NSObject { + +public this() { + super(); +} + +public this(objc.id id) { + super(id); } -public class NSEnumerator : NSObject -{ - - public this () - { - super(); - } +public this(cocoa.id id) { + super(id); +} - public this (objc.id id) - { - super(id); - } - - public NSArray allObjects () - { - objc.id result = OS.objc_msgSend(this.id_, OS.sel_allObjects); - return result !is null ? new NSArray(result) : null; - } - - public id nextObject () - { - objc.id result = OS.objc_msgSend(this.id_, OS.sel_nextObject); - return result !is null ? new id(result) : null; - } +public cocoa.id nextObject() { + objc.id result = OS.objc_msgSend(this.id, OS.sel_nextObject); + return result !is null ? new cocoa.id(result) : null; +} }