--- a/dstep/foundation/NSXMLDocument.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSXMLDocument.d	Sun Jan 03 22:06:11 2010 +0100
@@ -6,11 +6,18 @@
  */
 module dstep.foundation.NSXMLDocument;
 
+import dstep.foundation.NSArray;
 import dstep.foundation.NSData;
+import dstep.foundation.NSDictionary;
+import dstep.foundation.NSError;
+import dstep.foundation.NSObjCRuntime;
+import dstep.foundation.NSString;
+import dstep.foundation.NSURL;
 import dstep.foundation.NSXMLDTD;
+import dstep.foundation.NSXMLElement;
 import dstep.foundation.NSXMLNode;
 import dstep.objc.bridge.Bridge;
-import dstep.objc.objc : id;
+import dstep.objc.objc;
 
 alias NSUInteger NSXMLDocumentContentKind;
 
@@ -24,54 +31,76 @@
 
 class NSXMLDocument : NSXMLNode
 {
-	mixin ObjcWrap;
-
-	Object initWithXMLString (NSString string, NSUInteger mask, NSError** error)
+	mixin (ObjcWrap);
+	
+	this ()
 	{
-		return invokeObjcSelf!(Object, "initWithXMLString:options:error:", NSString, NSUInteger, NSError**)(string, mask, error);
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
 	}
 
-	this (NSString string, NSUInteger mask, NSError** error)
+	Object initWithXMLString (NSString string, NSUInteger mask, ref NSError error)
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initWithXMLString:options:error:", NSString, NSUInteger, NSError**)(objcObject, string, mask, error);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		id err;
+		
+		if (error)
+			err = new objc_object;
+				
+		Object result = invokeObjcSelf!(Object, "initWithXMLString:options:error:", NSString, NSUInteger, id*)(string, mask, &err);
+		
+		if (err)
+			error = new NSError(err);
+		
+		return result;
 	}
 
-	Object initWithContentsOfURL (NSURL url, NSUInteger mask, NSError** error)
+	this (NSString string, NSUInteger mask, ref NSError error)
 	{
-		return invokeObjcSelf!(Object, "initWithContentsOfURL:options:error:", NSURL, NSUInteger, NSError**)(url, mask, error);
+		typeof(this).alloc.initWithXMLString(string, mask, error);
 	}
 
-	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;
+		
+		if (error)
+			err = new objc_object;
+		
+		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;
+		
+		if (error)
+			err = new objc_object;
+		
+		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);
 	}
 
 	Object initWithRootElement (NSXMLElement element)
@@ -81,18 +110,12 @@
 
 	this (NSXMLElement element)
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initWithRootElement:", NSXMLElement)(objcObject, element);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		typeof(this).alloc.initWithRootElement(element);
 	}
 
 	static Class replacementClassForClass (Class cls)
 	{
-		return invokeObjcSelfClass!(Class, "replacementClassForClass:", Class)(cls);
+		return invokeObjcSuperClass!(Class, "replacementClassForClass:", Class)(cls);
 	}
 
 	void setCharacterEncoding (NSString encoding)
@@ -205,24 +228,64 @@
 		return invokeObjcSelf!(NSData, "XMLDataWithOptions:", NSUInteger)(options);
 	}
 
-	Object objectByApplyingXSLT (NSData xslt, NSDictionary arguments, NSError** error)
+	Object objectByApplyingXSLT (NSData xslt, NSDictionary arguments, ref NSError error)
 	{
-		return invokeObjcSelf!(Object, "objectByApplyingXSLT:arguments:error:", NSData, NSDictionary, NSError**)(xslt, arguments, error);
+		id err;
+		
+		if (error)
+			err = new objc_object;
+		
+		Object result = invokeObjcSelf!(Object, "objectByApplyingXSLT:arguments:error:", NSData, NSDictionary, id*)(xslt, arguments, &err);
+		
+		if (err)
+			error = new NSError(err);
+		
+		return result;
 	}
 
-	Object objectByApplyingXSLTString (NSString xslt, NSDictionary arguments, NSError** error)
+	Object objectByApplyingXSLTString (NSString xslt, NSDictionary arguments, ref NSError error)
 	{
-		return invokeObjcSelf!(Object, "objectByApplyingXSLTString:arguments:error:", NSString, NSDictionary, NSError**)(xslt, arguments, error);
+		id err;
+		
+		if (error)
+			err = new objc_object;
+		
+		Object result = invokeObjcSelf!(Object, "objectByApplyingXSLTString:arguments:error:", NSString, NSDictionary, id*)(xslt, arguments, &err);
+		
+		if (err)
+			error = new NSError(err);
+		
+		return result;
 	}
 
-	Object objectByApplyingXSLTAtURL (NSURL xsltURL, NSDictionary argument, NSError** error)
+	Object objectByApplyingXSLTAtURL (NSURL xsltURL, NSDictionary argument, ref NSError error)
 	{
-		return invokeObjcSelf!(Object, "objectByApplyingXSLTAtURL:arguments:error:", NSURL, NSDictionary, NSError**)(xsltURL, argument, error);
+		id err;
+		
+		if (error)
+			err = new objc_object;
+		
+		Object result = invokeObjcSelf!(Object, "objectByApplyingXSLTAtURL:arguments:error:", NSURL, NSDictionary, id*)(xsltURL, argument, &err);
+		
+		if (err)
+			error = new NSError(err);
+		
+		return result;
 	}
 
-	bool validateAndReturnError (NSError** error)
+	bool validateAndReturnError (ref NSError error)
 	{
-		return invokeObjcSelf!(bool, "validateAndReturnError:", NSError**)(error);
+		id err;
+		
+		if (error)
+			err = new objc_object;
+		
+		bool result = invokeObjcSelf!(bool, "validateAndReturnError:", id*)(&err);
+		
+		if (err)
+			error = new NSError(err);
+		
+		return result;
 	}
 }