--- a/dwt/internal/cocoa/NSDate.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSDate.d	Tue Aug 19 17:35:17 2008 +0200
@@ -37,13 +37,13 @@
 
     public id addTimeInterval (double seconds)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_addTimeInterval_1, seconds);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_addTimeInterval_1, seconds);
         return result !is null ? new id(result) : null;
     }
 
     public objc.id compare (NSDate other)
     {
-        return OS.objc_msgSend(this.id, OS.sel_compare_1, other !is null ? other.id : null);
+        return OS.objc_msgSend(this.id_, OS.sel_compare_1, other !is null ? other.id_ : null);
     }
 
     public static NSDate date ()
@@ -54,27 +54,27 @@
 
     public NSCalendarDate dateWithCalendarFormat (NSString format, NSTimeZone aTimeZone)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_dateWithCalendarFormat_1timeZone_1, format !is null ? format.id : null,
-                aTimeZone !is null ? aTimeZone.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_dateWithCalendarFormat_1timeZone_1, format !is null ? format.id_ : null,
+                aTimeZone !is null ? aTimeZone.id_ : null);
         return result !is null ? new NSCalendarDate(result) : null;
     }
 
     public static id static_dateWithNaturalLanguageString_ (NSString string)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSDate, OS.sel_dateWithNaturalLanguageString_1, string !is null ? string.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSDate, OS.sel_dateWithNaturalLanguageString_1, string !is null ? string.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public static id static_dateWithNaturalLanguageString_locale_ (NSString string, id locale)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSDate, OS.sel_dateWithNaturalLanguageString_1locale_1, string !is null ? string.id : null,
-                locale !is null ? locale.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSDate, OS.sel_dateWithNaturalLanguageString_1locale_1, string !is null ? string.id_ : null,
+                locale !is null ? locale.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public static id dateWithString (NSString aString)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSDate, OS.sel_dateWithString_1, aString !is null ? aString.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSDate, OS.sel_dateWithString_1, aString !is null ? aString.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
@@ -98,20 +98,20 @@
 
     public NSString description ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_description);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_description);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSString descriptionWithCalendarFormat (NSString format, NSTimeZone aTimeZone, id locale)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_descriptionWithCalendarFormat_1timeZone_1locale_1, format !is null ? format.id : null,
-                aTimeZone !is null ? aTimeZone.id : null, locale !is null ? locale.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_descriptionWithCalendarFormat_1timeZone_1locale_1, format !is null ? format.id_ : null,
+                aTimeZone !is null ? aTimeZone.id_ : null, locale !is null ? locale.id_ : null);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSString descriptionWithLocale (id locale)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_descriptionWithLocale_1, locale !is null ? locale.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_descriptionWithLocale_1, locale !is null ? locale.id_ : null);
         return result !is null ? new NSString(result) : null;
     }
 
@@ -129,59 +129,59 @@
 
     public NSDate earlierDate (NSDate anotherDate)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_earlierDate_1, anotherDate !is null ? anotherDate.id : null);
-        return result is this.id ? this : (result !is null ? new NSDate(result) : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_earlierDate_1, anotherDate !is null ? anotherDate.id_ : null);
+        return result is this.id_ ? this : (result !is null ? new NSDate(result) : null);
     }
 
     public NSDate initWithString (NSString description)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithString_1, description !is null ? description.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithString_1, description !is null ? description.id_ : null);
         return result !is null ? this : null;
     }
 
     public NSDate initWithTimeInterval (double secsToBeAdded, NSDate anotherDate)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithTimeInterval_1sinceDate_1, secsToBeAdded,
-                anotherDate !is null ? anotherDate.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithTimeInterval_1sinceDate_1, secsToBeAdded,
+                anotherDate !is null ? anotherDate.id_ : null);
         return result !is null ? this : null;
     }
 
     public NSDate initWithTimeIntervalSinceNow (double secsToBeAddedToNow)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithTimeIntervalSinceNow_1, secsToBeAddedToNow);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithTimeIntervalSinceNow_1, secsToBeAddedToNow);
         return result !is null ? this : null;
     }
 
     public NSDate initWithTimeIntervalSinceReferenceDate (double secsToBeAdded)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithTimeIntervalSinceReferenceDate_1, secsToBeAdded);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithTimeIntervalSinceReferenceDate_1, secsToBeAdded);
         return result !is null ? this : null;
     }
 
     public bool isEqualToDate (NSDate otherDate)
     {
-        return OS.objc_msgSend(this.id, OS.sel_isEqualToDate_1, otherDate !is null ? otherDate.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isEqualToDate_1, otherDate !is null ? otherDate.id_ : null) !is null;
     }
 
     public NSDate laterDate (NSDate anotherDate)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_laterDate_1, anotherDate !is null ? anotherDate.id : null);
-        return result is this.id ? this : (result !is null ? new NSDate(result) : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_laterDate_1, anotherDate !is null ? anotherDate.id_ : null);
+        return result is this.id_ ? this : (result !is null ? new NSDate(result) : null);
     }
 
     public double timeIntervalSince1970 ()
     {
-        return OS.objc_msgSend_fpret(this.id, OS.sel_timeIntervalSince1970);
+        return OS.objc_msgSend_fpret(this.id_, OS.sel_timeIntervalSince1970);
     }
 
     public double timeIntervalSinceDate (NSDate anotherDate)
     {
-        return OS.objc_msgSend_fpret(this.id, OS.sel_timeIntervalSinceDate_1, anotherDate !is null ? anotherDate.id : null);
+        return OS.objc_msgSend_fpret(this.id_, OS.sel_timeIntervalSinceDate_1, anotherDate !is null ? anotherDate.id_ : null);
     }
 
     public double timeIntervalSinceNow ()
     {
-        return OS.objc_msgSend_fpret(this.id, OS.sel_timeIntervalSinceNow);
+        return OS.objc_msgSend_fpret(this.id_, OS.sel_timeIntervalSinceNow);
     }
 
     public static double static_timeIntervalSinceReferenceDate ()
@@ -191,7 +191,7 @@
 
     public double timeIntervalSinceReferenceDate ()
     {
-        return OS.objc_msgSend_fpret(this.id, OS.sel_timeIntervalSinceReferenceDate);
+        return OS.objc_msgSend_fpret(this.id_, OS.sel_timeIntervalSinceReferenceDate);
     }
 
 }