--- a/dwt/internal/cocoa/NSCalendarDate.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSCalendarDate.d	Tue Aug 19 17:35:17 2008 +0200
@@ -42,155 +42,155 @@
 
     public NSString calendarFormat ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_calendarFormat);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_calendarFormat);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSCalendarDate dateByAddingYears (NSInteger year, NSInteger month, NSInteger day, NSInteger hour, NSInteger minute, NSInteger second)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_dateByAddingYears_1months_1days_1hours_1minutes_1seconds_1, year, month, day, hour, minute,
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_dateByAddingYears_1months_1days_1hours_1minutes_1seconds_1, year, month, day, hour, minute,
                 second);
-        return result is this.id ? this : (result !is null ? new NSCalendarDate(result) : null);
+        return result is this.id_ ? this : (result !is null ? new NSCalendarDate(result) : null);
     }
 
     public static id static_dateWithString_calendarFormat_ (NSString description, NSString format)
     {
         objc.id result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_dateWithString_1calendarFormat_1,
-                description !is null ? description.id : null, format !is null ? format.id : null);
+                description !is null ? description.id_ : null, format !is null ? format.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public static id static_dateWithString_calendarFormat_locale_ (NSString description, NSString format, id locale)
     {
         objc.id result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_dateWithString_1calendarFormat_1locale_1,
-                description !is null ? description.id : null, format !is null ? format.id : null, locale !is null ? locale.id : null);
+                description !is null ? description.id_ : null, format !is null ? format.id_ : null, locale !is null ? locale.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public static NSCalendarDate dateWithYear (NSInteger year, NSInteger month, NSInteger day, NSInteger hour, NSInteger minute, NSInteger second, NSTimeZone aTimeZone)
     {
         objc.id result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_dateWithYear_1month_1day_1hour_1minute_1second_1timeZone_1, year, month,
-                day, hour, minute, second, aTimeZone !is null ? aTimeZone.id : null);
+                day, hour, minute, second, aTimeZone !is null ? aTimeZone.id_ : null);
         return result !is null ? new NSCalendarDate(result) : null;
     }
 
     public NSInteger dayOfCommonEra ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_dayOfCommonEra);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_dayOfCommonEra);
     }
 
     public NSInteger dayOfMonth ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_dayOfMonth);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_dayOfMonth);
     }
 
     public NSInteger dayOfWeek ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_dayOfWeek);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_dayOfWeek);
     }
 
     public NSInteger dayOfYear ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_dayOfYear);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_dayOfYear);
     }
 
     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)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_descriptionWithCalendarFormat_1, format !is null ? format.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_descriptionWithCalendarFormat_1, format !is null ? format.id_ : null);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSString descriptionWithCalendarFormat_locale_ (NSString format, id locale)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_descriptionWithCalendarFormat_1locale_1, format !is null ? format.id : null,
-                locale !is null ? locale.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_descriptionWithCalendarFormat_1locale_1, format !is null ? format.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;
     }
 
     public NSInteger hourOfDay ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_hourOfDay);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_hourOfDay);
     }
 
     public NSCalendarDate 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 NSCalendarDate initWithString_calendarFormat_ (NSString description, NSString format)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithString_1calendarFormat_1, description !is null ? description.id : null,
-                format !is null ? format.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithString_1calendarFormat_1, description !is null ? description.id_ : null,
+                format !is null ? format.id_ : null);
         return result !is null ? this : null;
     }
 
     public NSCalendarDate initWithString_calendarFormat_locale_ (NSString description, NSString format, id locale)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithString_1calendarFormat_1locale_1, description !is null ? description.id : null,
-                format !is null ? format.id : null, locale !is null ? locale.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithString_1calendarFormat_1locale_1, description !is null ? description.id_ : null,
+                format !is null ? format.id_ : null, locale !is null ? locale.id_ : null);
         return result !is null ? this : null;
     }
 
     public id initWithYear (NSInteger year, NSUInteger month, NSUInteger day, NSUInteger hour, NSUInteger minute, NSUInteger second, NSTimeZone aTimeZone)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithYear_1month_1day_1hour_1minute_1second_1timeZone_1, year, month, day, hour, minute,
-                second, aTimeZone !is null ? aTimeZone.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithYear_1month_1day_1hour_1minute_1second_1timeZone_1, year, month, day, hour, minute,
+                second, aTimeZone !is null ? aTimeZone.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public NSInteger minuteOfHour ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_minuteOfHour);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_minuteOfHour);
     }
 
     public NSInteger monthOfYear ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_monthOfYear);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_monthOfYear);
     }
 
     public NSInteger secondOfMinute ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_secondOfMinute);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_secondOfMinute);
     }
 
     public void setCalendarFormat (NSString format)
     {
-        OS.objc_msgSend(this.id, OS.sel_setCalendarFormat_1, format !is null ? format.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setCalendarFormat_1, format !is null ? format.id_ : null);
     }
 
     public void setTimeZone (NSTimeZone aTimeZone)
     {
-        OS.objc_msgSend(this.id, OS.sel_setTimeZone_1, aTimeZone !is null ? aTimeZone.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setTimeZone_1, aTimeZone !is null ? aTimeZone.id_ : null);
     }
 
     public NSTimeZone timeZone ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_timeZone);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_timeZone);
         return result !is null ? new NSTimeZone(result) : null;
     }
 
     public NSInteger yearOfCommonEra ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_yearOfCommonEra);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_yearOfCommonEra);
     }
 
     public void years (NSInteger* yp, NSInteger* mop, NSInteger* dp, NSInteger* hp, NSInteger* mip, NSInteger* sp, NSCalendarDate date)
     {
-        OS.objc_msgSend(this.id, OS.sel_years_1months_1days_1hours_1minutes_1seconds_1sinceDate_1, yp, mop, dp, hp, mip, sp,
-                date !is null ? date.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_years_1months_1days_1hours_1minutes_1seconds_1sinceDate_1, yp, mop, dp, hp, mip, sp,
+                date !is null ? date.id_ : null);
     }
 
 }