--- a/dwt/internal/cocoa/NSURLHandle.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSURLHandle.d	Tue Aug 19 17:35:17 2008 +0200
@@ -50,98 +50,98 @@
 
     public static objc.Class URLHandleClassForURL (NSURL anURL)
     {
-        return cast(objc.Class) OS.objc_msgSend(OS.class_NSURLHandle, OS.sel_URLHandleClassForURL_1, anURL !is null ? anURL.id : null);
+        return cast(objc.Class) OS.objc_msgSend(OS.class_NSURLHandle, OS.sel_URLHandleClassForURL_1, anURL !is null ? anURL.id_ : null);
     }
 
     public void addClient (id client)
     {
-        OS.objc_msgSend(this.id, OS.sel_addClient_1, client !is null ? client.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_addClient_1, client !is null ? client.id_ : null);
     }
 
     public NSData availableResourceData ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_availableResourceData);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_availableResourceData);
         return result !is null ? new NSData(result) : null;
     }
 
     public void backgroundLoadDidFailWithReason (NSString reason)
     {
-        OS.objc_msgSend(this.id, OS.sel_backgroundLoadDidFailWithReason_1, reason !is null ? reason.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_backgroundLoadDidFailWithReason_1, reason !is null ? reason.id_ : null);
     }
 
     public void beginLoadInBackground ()
     {
-        OS.objc_msgSend(this.id, OS.sel_beginLoadInBackground);
+        OS.objc_msgSend(this.id_, OS.sel_beginLoadInBackground);
     }
 
     public static NSURLHandle cachedHandleForURL (NSURL anURL)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSURLHandle, OS.sel_cachedHandleForURL_1, anURL !is null ? anURL.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSURLHandle, OS.sel_cachedHandleForURL_1, anURL !is null ? anURL.id_ : null);
         return result !is null ? new NSURLHandle(result) : null;
     }
 
     public static bool canInitWithURL (NSURL anURL)
     {
-        return OS.objc_msgSend(OS.class_NSURLHandle, OS.sel_canInitWithURL_1, anURL !is null ? anURL.id : null) !is null;
+        return OS.objc_msgSend(OS.class_NSURLHandle, OS.sel_canInitWithURL_1, anURL !is null ? anURL.id_ : null) !is null;
     }
 
     public void cancelLoadInBackground ()
     {
-        OS.objc_msgSend(this.id, OS.sel_cancelLoadInBackground);
+        OS.objc_msgSend(this.id_, OS.sel_cancelLoadInBackground);
     }
 
     public void didLoadBytes (NSData newBytes, bool yorn)
     {
-        OS.objc_msgSend(this.id, OS.sel_didLoadBytes_1loadComplete_1, newBytes !is null ? newBytes.id : null, yorn);
+        OS.objc_msgSend(this.id_, OS.sel_didLoadBytes_1loadComplete_1, newBytes !is null ? newBytes.id_ : null, yorn);
     }
 
     public void endLoadInBackground ()
     {
-        OS.objc_msgSend(this.id, OS.sel_endLoadInBackground);
+        OS.objc_msgSend(this.id_, OS.sel_endLoadInBackground);
     }
 
     public long expectedResourceDataSize ()
     {
-        return cast(long) OS.objc_msgSend(this.id, OS.sel_expectedResourceDataSize);
+        return cast(long) OS.objc_msgSend(this.id_, OS.sel_expectedResourceDataSize);
     }
 
     public NSString failureReason ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_failureReason);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_failureReason);
         return result !is null ? new NSString(result) : null;
     }
 
     public void flushCachedData ()
     {
-        OS.objc_msgSend(this.id, OS.sel_flushCachedData);
+        OS.objc_msgSend(this.id_, OS.sel_flushCachedData);
     }
 
     public id initWithURL (NSURL anURL, bool willCache)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithURL_1cached_1, anURL !is null ? anURL.id : null, willCache);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithURL_1cached_1, anURL !is null ? anURL.id_ : null, willCache);
         return result !is null ? new id(result) : null;
     }
 
     public void loadInBackground ()
     {
-        OS.objc_msgSend(this.id, OS.sel_loadInBackground);
+        OS.objc_msgSend(this.id_, OS.sel_loadInBackground);
     }
 
     public NSData loadInForeground ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_loadInForeground);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_loadInForeground);
         return result !is null ? new NSData(result) : null;
     }
 
     public id propertyForKey (NSString propertyKey)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_propertyForKey_1, propertyKey !is null ? propertyKey.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_propertyForKey_1, propertyKey !is null ? propertyKey.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public id propertyForKeyIfAvailable (NSString propertyKey)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_propertyForKeyIfAvailable_1, propertyKey !is null ? propertyKey.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_propertyForKeyIfAvailable_1, propertyKey !is null ? propertyKey.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
@@ -152,29 +152,29 @@
 
     public void removeClient (id client)
     {
-        OS.objc_msgSend(this.id, OS.sel_removeClient_1, client !is null ? client.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_removeClient_1, client !is null ? client.id_ : null);
     }
 
     public NSData resourceData ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_resourceData);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_resourceData);
         return result !is null ? new NSData(result) : null;
     }
 
     public NSURLHandleStatus status ()
     {
-        return cast(NSURLHandleStatus) OS.objc_msgSend(this.id, OS.sel_status);
+        return cast(NSURLHandleStatus) OS.objc_msgSend(this.id_, OS.sel_status);
     }
 
     public bool writeData (NSData data)
     {
-        return OS.objc_msgSend(this.id, OS.sel_writeData_1, data !is null ? data.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_writeData_1, data !is null ? data.id_ : null) !is null;
     }
 
     public bool writeProperty (id propertyValue, NSString propertyKey)
     {
-        return OS.objc_msgSend(this.id, OS.sel_writeProperty_1forKey_1, propertyValue !is null ? propertyValue.id : null,
-                propertyKey !is null ? propertyKey.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_writeProperty_1forKey_1, propertyValue !is null ? propertyValue.id_ : null,
+                propertyKey !is null ? propertyKey.id_ : null) !is null;
     }
 
 }