--- a/dwt/internal/cocoa/NSFileHandle.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSFileHandle.d	Tue Aug 19 17:35:17 2008 +0200
@@ -37,45 +37,45 @@
 
     public void acceptConnectionInBackgroundAndNotify ()
     {
-        OS.objc_msgSend(this.id, OS.sel_acceptConnectionInBackgroundAndNotify);
+        OS.objc_msgSend(this.id_, OS.sel_acceptConnectionInBackgroundAndNotify);
     }
 
     public void acceptConnectionInBackgroundAndNotifyForModes (NSArray modes)
     {
-        OS.objc_msgSend(this.id, OS.sel_acceptConnectionInBackgroundAndNotifyForModes_1, modes !is null ? modes.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_acceptConnectionInBackgroundAndNotifyForModes_1, modes !is null ? modes.id_ : null);
     }
 
     public NSData availableData ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_availableData);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_availableData);
         return result !is null ? new NSData(result) : null;
     }
 
     public void closeFile ()
     {
-        OS.objc_msgSend(this.id, OS.sel_closeFile);
+        OS.objc_msgSend(this.id_, OS.sel_closeFile);
     }
 
     public int fileDescriptor ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_fileDescriptor);
+        return cast(int) OS.objc_msgSend(this.id_, OS.sel_fileDescriptor);
     }
 
     public static id fileHandleForReadingAtPath (NSString path)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSFileHandle, OS.sel_fileHandleForReadingAtPath_1, path !is null ? path.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSFileHandle, OS.sel_fileHandleForReadingAtPath_1, path !is null ? path.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public static id fileHandleForUpdatingAtPath (NSString path)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSFileHandle, OS.sel_fileHandleForUpdatingAtPath_1, path !is null ? path.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSFileHandle, OS.sel_fileHandleForUpdatingAtPath_1, path !is null ? path.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public static id fileHandleForWritingAtPath (NSString path)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSFileHandle, OS.sel_fileHandleForWritingAtPath_1, path !is null ? path.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSFileHandle, OS.sel_fileHandleForWritingAtPath_1, path !is null ? path.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
@@ -105,86 +105,86 @@
 
     public id initWithFileDescriptor_ (int fd)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithFileDescriptor_1, fd);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithFileDescriptor_1, fd);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithFileDescriptor_closeOnDealloc_ (int fd, bool closeopt)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithFileDescriptor_1closeOnDealloc_1, fd, closeopt);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithFileDescriptor_1closeOnDealloc_1, fd, closeopt);
         return result !is null ? new id(result) : null;
     }
 
     public long offsetInFile ()
     {
-        return cast(long) OS.objc_msgSend(this.id, OS.sel_offsetInFile);
+        return cast(long) OS.objc_msgSend(this.id_, OS.sel_offsetInFile);
     }
 
     public NSData readDataOfLength (NSUInteger length)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_readDataOfLength_1, length);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_readDataOfLength_1, length);
         return result !is null ? new NSData(result) : null;
     }
 
     public NSData readDataToEndOfFile ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_readDataToEndOfFile);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_readDataToEndOfFile);
         return result !is null ? new NSData(result) : null;
     }
 
     public void readInBackgroundAndNotify ()
     {
-        OS.objc_msgSend(this.id, OS.sel_readInBackgroundAndNotify);
+        OS.objc_msgSend(this.id_, OS.sel_readInBackgroundAndNotify);
     }
 
     public void readInBackgroundAndNotifyForModes (NSArray modes)
     {
-        OS.objc_msgSend(this.id, OS.sel_readInBackgroundAndNotifyForModes_1, modes !is null ? modes.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_readInBackgroundAndNotifyForModes_1, modes !is null ? modes.id_ : null);
     }
 
     public void readToEndOfFileInBackgroundAndNotify ()
     {
-        OS.objc_msgSend(this.id, OS.sel_readToEndOfFileInBackgroundAndNotify);
+        OS.objc_msgSend(this.id_, OS.sel_readToEndOfFileInBackgroundAndNotify);
     }
 
     public void readToEndOfFileInBackgroundAndNotifyForModes (NSArray modes)
     {
-        OS.objc_msgSend(this.id, OS.sel_readToEndOfFileInBackgroundAndNotifyForModes_1, modes !is null ? modes.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_readToEndOfFileInBackgroundAndNotifyForModes_1, modes !is null ? modes.id_ : null);
     }
 
     public long seekToEndOfFile ()
     {
-        return cast(long) OS.objc_msgSend(this.id, OS.sel_seekToEndOfFile);
+        return cast(long) OS.objc_msgSend(this.id_, OS.sel_seekToEndOfFile);
     }
 
     public void seekToFileOffset (long offset)
     {
-        OS.objc_msgSend(this.id, OS.sel_seekToFileOffset_1, offset);
+        OS.objc_msgSend(this.id_, OS.sel_seekToFileOffset_1, offset);
     }
 
     public void synchronizeFile ()
     {
-        OS.objc_msgSend(this.id, OS.sel_synchronizeFile);
+        OS.objc_msgSend(this.id_, OS.sel_synchronizeFile);
     }
 
     public void truncateFileAtOffset (long offset)
     {
-        OS.objc_msgSend(this.id, OS.sel_truncateFileAtOffset_1, offset);
+        OS.objc_msgSend(this.id_, OS.sel_truncateFileAtOffset_1, offset);
     }
 
     public void waitForDataInBackgroundAndNotify ()
     {
-        OS.objc_msgSend(this.id, OS.sel_waitForDataInBackgroundAndNotify);
+        OS.objc_msgSend(this.id_, OS.sel_waitForDataInBackgroundAndNotify);
     }
 
     public void waitForDataInBackgroundAndNotifyForModes (NSArray modes)
     {
-        OS.objc_msgSend(this.id, OS.sel_waitForDataInBackgroundAndNotifyForModes_1, modes !is null ? modes.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_waitForDataInBackgroundAndNotifyForModes_1, modes !is null ? modes.id_ : null);
     }
 
     public void writeData (NSData data)
     {
-        OS.objc_msgSend(this.id, OS.sel_writeData_1, data !is null ? data.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_writeData_1, data !is null ? data.id_ : null);
     }
 
 }