--- a/dstep/foundation/NSCalendar.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSCalendar.d	Sun Jan 03 22:06:11 2010 +0100
@@ -7,15 +7,17 @@
 module dstep.foundation.NSCalendar;
 
 import dstep.corefoundation.CFCalendar;
+import dstep.foundation.NSCoder;
 import dstep.foundation.NSDate;
-import dstep.foundation.NSDateComponents;
 import dstep.foundation.NSLocale;
+import dstep.foundation.NSObjCRuntime;
 import dstep.foundation.NSObject;
 import dstep.foundation.NSRange;
 import dstep.foundation.NSString;
 import dstep.foundation.NSTimeZone;
+import dstep.foundation.NSZone;
 import dstep.objc.bridge.Bridge;
-import dstep.objc.objc : id;
+import dstep.objc.objc;
 
 alias NSUInteger NSCalendarUnit;
 
@@ -45,7 +47,17 @@
 
 class NSDateComponents : NSObject, INSCopying, INSCoding
 {
-	mixin ObjcWrap;
+	mixin (ObjcWrap);
+	
+	this ()
+	{
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
+	}
 
 	NSInteger era ()
 	{
@@ -164,28 +176,32 @@
 
 	this (NSCoder aDecoder)
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initWithCoder:", NSCoder)(objcObject, aDecoder);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		typeof(this).alloc.initWithCoder(aDecoder);
 	}
 }
 
 class NSCalendar : NSObject, INSCopying, INSCoding
 {
-	mixin ObjcWrap;
+	mixin (ObjcWrap);
+	
+	this ()
+	{
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
+	}
 
 	static Object currentCalendar ()
 	{
-		return invokeObjcSelfClass!(Object, "currentCalendar");
+		return invokeObjcSuperClass!(Object, "currentCalendar");
 	}
 
 	static Object autoupdatingCurrentCalendar ()
 	{
-		return invokeObjcSelfClass!(Object, "autoupdatingCurrentCalendar");
+		return invokeObjcSuperClass!(Object, "autoupdatingCurrentCalendar");
 	}
 
 	Object initWithCalendarIdentifier (NSString ident)
@@ -195,13 +211,7 @@
 
 	this (NSString ident)
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initWithCalendarIdentifier:", NSString)(objcObject, ident);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		typeof(this).alloc.initWithCalendarIdentifier(ident);
 	}
 
 	NSString calendarIdentifier ()
@@ -269,9 +279,15 @@
 		return invokeObjcSelf!(NSUInteger, "ordinalityOfUnit:inUnit:forDate:", uint, uint, NSDate)(smaller, larger, date);
 	}
 
-	bool rangeOfUnit (uint unit, NSDate** datep, NSTimeInterval* tip, NSDate date)
+	bool rangeOfUnit (uint unit, out NSDate datep, NSTimeInterval* tip, NSDate date)
 	{
-		return invokeObjcSelf!(bool, "rangeOfUnit:startDate:interval:forDate:", uint, NSDate**, NSTimeInterval*, NSDate)(unit, datep, tip, date);
+		id d = new objc_object;
+		bool result =  invokeObjcSelf!(bool, "rangeOfUnit:startDate:interval:forDate:", uint, id*, NSTimeInterval*, NSDate)(unit, &d, tip, date);
+		
+		if (d)
+			datep = new NSDate(d);
+		
+		return result;
 	}
 
 	NSDate dateFromComponents (NSDateComponents comps)
@@ -311,13 +327,7 @@
 
 	this (NSCoder aDecoder)
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initWithCoder:", NSCoder)(objcObject, aDecoder);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		typeof(this).alloc.initWithCoder(aDecoder);
 	}
 }