--- a/dstep/foundation/NSXMLDTD.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSXMLDTD.d	Sun Jan 03 22:06:11 2010 +0100
@@ -6,47 +6,62 @@
  */
 module dstep.foundation.NSXMLDTD;
 
+import dstep.foundation.NSArray;
 import dstep.foundation.NSData;
-import dstep.foundation.NSMutableDictionary;
+import dstep.foundation.NSDictionary;
+import dstep.foundation.NSError;
+import dstep.foundation.NSObjCRuntime;
+import dstep.foundation.NSString;
+import dstep.foundation.NSURL;
 import dstep.foundation.NSXMLDTDNode;
 import dstep.foundation.NSXMLNode;
 import dstep.objc.bridge.Bridge;
-import dstep.objc.objc : id;
+import dstep.objc.objc;
 
 class NSXMLDTD : NSXMLNode
 {
-	mixin ObjcWrap;
-
-	Object initWithContentsOfURL (NSURL url, NSUInteger mask, NSError** error)
+	mixin (ObjcWrap);
+	
+	this ()
 	{
-		return invokeObjcSelf!(Object, "initWithContentsOfURL:options:error:", NSURL, NSUInteger, NSError**)(url, mask, error);
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
 	}
 
-	this (NSURL url, NSUInteger mask, NSError** error)
+	Object initWithContentsOfURL (NSURL url, NSUInteger mask, ref NSError error)
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initWithContentsOfURL:options:error:", NSURL, NSUInteger, NSError**)(objcObject, url, mask, error);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		id err = error ? new objc_object : null;					
+		Object result = invokeObjcSelf!(Object, "initWithContentsOfURL:options:error:", NSURL, NSUInteger, id*)(url, mask, &err);
+		
+		if (err)
+			error = new NSError(err);
+		
+		return result;
 	}
 
-	Object initWithData (NSData data, NSUInteger mask, NSError** error)
+	this (NSURL url, NSUInteger mask, ref NSError error)
 	{
-		return invokeObjcSelf!(Object, "initWithData:options:error:", NSData, NSUInteger, NSError**)(data, mask, error);
+		typeof(this).alloc.initWithContentsOfURL(url, mask, error);
 	}
 
-	this (NSData data, NSUInteger mask, NSError** error)
+	Object initWithData (NSData data, NSUInteger mask, ref NSError error)
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initWithData:options:error:", NSData, NSUInteger, NSError**)(objcObject, data, mask, error);
+		id err = error ? new objc_object : null;	
+		Object result = invokeObjcSelf!(Object, "initWithData:options:error:", NSData, NSUInteger, id*)(data, mask, &err);
+		
+		if (err)
+			error = new NSError(err);
+		
+		return result;
+	}
 
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+	this (NSData data, NSUInteger mask, ref NSError error)
+	{
+		typeof(this).alloc.initWithData(data, mask, error);
 	}
 
 	void setPublicID (NSString publicID)
@@ -121,7 +136,7 @@
 
 	static NSXMLDTDNode predefinedEntityDeclarationForName (NSString name)
 	{
-		return invokeObjcSelfClass!(NSXMLDTDNode, "predefinedEntityDeclarationForName:", NSString)(name);
+		return invokeObjcSuperClass!(NSXMLDTDNode, "predefinedEntityDeclarationForName:", NSString)(name);
 	}
 }