--- a/dwt/internal/cocoa/NSTimer.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSTimer.d	Tue Aug 19 17:35:17 2008 +0200
@@ -35,36 +35,36 @@
 
     public void fire ()
     {
-        OS.objc_msgSend(this.id, OS.sel_fire);
+        OS.objc_msgSend(this.id_, OS.sel_fire);
     }
 
     public NSDate fireDate ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_fireDate);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_fireDate);
         return result !is null ? new NSDate(result) : null;
     }
 
     public id initWithFireDate (NSDate date, NSTimeInterval ti, id t, objc.SEL s, id ui, bool rep)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithFireDate_1interval_1target_1selector_1userInfo_1repeats_1,
-                date !is null ? date.id : null, ti, t !is null ? t.id : null, s, ui !is null ? ui.id : null, rep);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithFireDate_1interval_1target_1selector_1userInfo_1repeats_1,
+                date !is null ? date.id_ : null, ti, t !is null ? t.id_ : null, s, ui !is null ? ui.id_ : null, rep);
         return result !is null ? new id(result) : null;
     }
 
     public void invalidate ()
     {
-        OS.objc_msgSend(this.id, OS.sel_invalidate);
+        OS.objc_msgSend(this.id_, OS.sel_invalidate);
     }
 
     public bool isValid ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_isValid) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isValid) !is null;
     }
 
     public static NSTimer static_scheduledTimerWithTimeInterval_invocation_repeats_ (NSTimeInterval ti, NSInvocation invocation, bool yesOrNo)
     {
         objc.id result = OS.objc_msgSend(OS.class_NSTimer, OS.sel_scheduledTimerWithTimeInterval_1invocation_1repeats_1, ti,
-                invocation !is null ? invocation.id : null, yesOrNo);
+                invocation !is null ? invocation.id_ : null, yesOrNo);
         return result !is null ? new NSTimer(result) : null;
     }
 
@@ -72,24 +72,24 @@
             objc.id userInfo, bool yesOrNo)
     {
         objc.id result = OS.objc_msgSend(OS.class_NSTimer, OS.sel_scheduledTimerWithTimeInterval_1target_1selector_1userInfo_1repeats_1, ti,
-                aTarget !is null ? aTarget.id : null, aSelector, userInfo, yesOrNo);
+                aTarget !is null ? aTarget.id_ : null, aSelector, userInfo, yesOrNo);
         return result !is null ? new NSTimer(result) : null;
     }
 
     public void setFireDate (NSDate date)
     {
-        OS.objc_msgSend(this.id, OS.sel_setFireDate_1, date !is null ? date.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setFireDate_1, date !is null ? date.id_ : null);
     }
 
     public NSTimeInterval timeInterval ()
     {
-        return cast(NSTimeInterval) OS.objc_msgSend_fpret(this.id, OS.sel_timeInterval);
+        return cast(NSTimeInterval) OS.objc_msgSend_fpret(this.id_, OS.sel_timeInterval);
     }
 
     public static NSTimer static_timerWithTimeInterval_invocation_repeats_ (NSTimeInterval ti, NSInvocation invocation, bool yesOrNo)
     {
         objc.id result = OS.objc_msgSend(OS.class_NSTimer, OS.sel_timerWithTimeInterval_1invocation_1repeats_1, ti,
-                invocation !is null ? invocation.id : null, yesOrNo);
+                invocation !is null ? invocation.id_ : null, yesOrNo);
         return result !is null ? new NSTimer(result) : null;
     }
 
@@ -97,13 +97,13 @@
             bool yesOrNo)
     {
         objc.id result = OS.objc_msgSend(OS.class_NSTimer, OS.sel_timerWithTimeInterval_1target_1selector_1userInfo_1repeats_1, ti,
-                aTarget !is null ? aTarget.id : null, aSelector, userInfo !is null ? userInfo.id : null, yesOrNo);
+                aTarget !is null ? aTarget.id_ : null, aSelector, userInfo !is null ? userInfo.id_ : null, yesOrNo);
         return result !is null ? new NSTimer(result) : null;
     }
 
     public objc.id userInfo ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_userInfo);
+        return OS.objc_msgSend(this.id_, OS.sel_userInfo);
     }
 
 }