--- a/dwt/internal/cocoa/NSUnarchiver.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSUnarchiver.d	Tue Aug 19 17:35:17 2008 +0200
@@ -37,68 +37,68 @@
     public static NSString static_classNameDecodedForArchiveClassName_ (NSString inArchiveName)
     {
         objc.id result = OS.objc_msgSend(OS.class_NSUnarchiver, OS.sel_classNameDecodedForArchiveClassName_1,
-                inArchiveName !is null ? inArchiveName.id : null);
+                inArchiveName !is null ? inArchiveName.id_ : null);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSString classNameDecodedForArchiveClassName_ (NSString inArchiveName)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_classNameDecodedForArchiveClassName_1, inArchiveName !is null ? inArchiveName.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_classNameDecodedForArchiveClassName_1, inArchiveName !is null ? inArchiveName.id_ : null);
         return result !is null ? new NSString(result) : null;
     }
 
     public void decodeClassName_asClassName_ (NSString inArchiveName, NSString trueName)
     {
-        OS.objc_msgSend(this.id, OS.sel_decodeClassName_1asClassName_1, inArchiveName !is null ? inArchiveName.id : null,
-                trueName !is null ? trueName.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_decodeClassName_1asClassName_1, inArchiveName !is null ? inArchiveName.id_ : null,
+                trueName !is null ? trueName.id_ : null);
     }
 
     public static void static_decodeClassName_asClassName_ (NSString inArchiveName, NSString trueName)
     {
-        OS.objc_msgSend(OS.class_NSUnarchiver, OS.sel_decodeClassName_1asClassName_1, inArchiveName !is null ? inArchiveName.id : null,
-                trueName !is null ? trueName.id : null);
+        OS.objc_msgSend(OS.class_NSUnarchiver, OS.sel_decodeClassName_1asClassName_1, inArchiveName !is null ? inArchiveName.id_ : null,
+                trueName !is null ? trueName.id_ : null);
     }
 
     public id initForReadingWithData (NSData data)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initForReadingWithData_1, data !is null ? data.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initForReadingWithData_1, data !is null ? data.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public bool isAtEnd ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_isAtEnd) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isAtEnd) !is null;
     }
 
     public NSZone* objectZone ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_objectZone);
+        return cast(NSZone*) OS.objc_msgSend(this.id_, OS.sel_objectZone);
     }
 
     public void replaceObject (id object, id newObject)
     {
-        OS.objc_msgSend(this.id, OS.sel_replaceObject_1withObject_1, object !is null ? object.id : null, newObject !is null ? newObject.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_replaceObject_1withObject_1, object !is null ? object.id_ : null, newObject !is null ? newObject.id_ : null);
     }
 
     public void setObjectZone (NSZone* zone)
     {
-        OS.objc_msgSend(this.id, OS.sel_setObjectZone_1, zone);
+        OS.objc_msgSend(this.id_, OS.sel_setObjectZone_1, zone);
     }
 
     public uint systemVersion ()
     {
-        return cast(uint) OS.objc_msgSend(this.id, OS.sel_systemVersion);
+        return cast(uint) OS.objc_msgSend(this.id_, OS.sel_systemVersion);
     }
 
     public static id unarchiveObjectWithData (NSData data)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSUnarchiver, OS.sel_unarchiveObjectWithData_1, data !is null ? data.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSUnarchiver, OS.sel_unarchiveObjectWithData_1, data !is null ? data.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public static id unarchiveObjectWithFile (NSString path)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSUnarchiver, OS.sel_unarchiveObjectWithFile_1, path !is null ? path.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSUnarchiver, OS.sel_unarchiveObjectWithFile_1, path !is null ? path.id_ : null);
         return result !is null ? new id(result) : null;
     }