--- a/dwt/internal/cocoa/NSHashTable.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSHashTable.d	Tue Aug 19 17:35:17 2008 +0200
@@ -38,29 +38,29 @@
 
     public void addObject (id object)
     {
-        OS.objc_msgSend(this.id, OS.sel_addObject_1, object !is null ? object.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_addObject_1, object !is null ? object.id_ : null);
     }
 
     public NSArray allObjects ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_allObjects);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_allObjects);
         return result !is null ? new NSArray(result) : null;
     }
 
     public id anyObject ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_anyObject);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_anyObject);
         return result !is null ? new id(result) : null;
     }
 
     public bool containsObject (id anObject)
     {
-        return OS.objc_msgSend(this.id, OS.sel_containsObject_1, anObject !is null ? anObject.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_containsObject_1, anObject !is null ? anObject.id_ : null) !is null;
     }
 
     public NSUInteger count ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_count);
+        return cast(NSUInteger) OS.objc_msgSend(this.id_, OS.sel_count);
     }
 
     public static id hashTableWithOptions (NSPointerFunctionsOptions options)
@@ -77,79 +77,79 @@
 
     public id initWithOptions (NSPointerFunctionsOptions options, NSUInteger initialCapacity)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithOptions_1capacity_1, options, initialCapacity);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithOptions_1capacity_1, options, initialCapacity);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithPointerFunctions (NSPointerFunctions functions, NSUInteger initialCapacity)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithPointerFunctions_1capacity_1, functions !is null ? functions.id : null,
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithPointerFunctions_1capacity_1, functions !is null ? functions.id_ : null,
                 initialCapacity);
         return result !is null ? new id(result) : null;
     }
 
     public void intersectHashTable (NSHashTable other)
     {
-        OS.objc_msgSend(this.id, OS.sel_intersectHashTable_1, other !is null ? other.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_intersectHashTable_1, other !is null ? other.id_ : null);
     }
 
     public bool intersectsHashTable (NSHashTable other)
     {
-        return OS.objc_msgSend(this.id, OS.sel_intersectsHashTable_1, other !is null ? other.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_intersectsHashTable_1, other !is null ? other.id_ : null) !is null;
     }
 
     public bool isEqualToHashTable (NSHashTable other)
     {
-        return OS.objc_msgSend(this.id, OS.sel_isEqualToHashTable_1, other !is null ? other.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isEqualToHashTable_1, other !is null ? other.id_ : null) !is null;
     }
 
     public bool isSubsetOfHashTable (NSHashTable other)
     {
-        return OS.objc_msgSend(this.id, OS.sel_isSubsetOfHashTable_1, other !is null ? other.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isSubsetOfHashTable_1, other !is null ? other.id_ : null) !is null;
     }
 
     public id member (id object)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_member_1, object !is null ? object.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_member_1, object !is null ? object.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public void minusHashTable (NSHashTable other)
     {
-        OS.objc_msgSend(this.id, OS.sel_minusHashTable_1, other !is null ? other.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_minusHashTable_1, other !is null ? other.id_ : null);
     }
 
     public NSEnumerator objectEnumerator ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_objectEnumerator);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_objectEnumerator);
         return result !is null ? new NSEnumerator(result) : null;
     }
 
     public NSPointerFunctions pointerFunctions ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_pointerFunctions);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_pointerFunctions);
         return result !is null ? new NSPointerFunctions(result) : null;
     }
 
     public void removeAllObjects ()
     {
-        OS.objc_msgSend(this.id, OS.sel_removeAllObjects);
+        OS.objc_msgSend(this.id_, OS.sel_removeAllObjects);
     }
 
     public void removeObject (id object)
     {
-        OS.objc_msgSend(this.id, OS.sel_removeObject_1, object !is null ? object.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_removeObject_1, object !is null ? object.id_ : null);
     }
 
     public NSSet setRepresentation ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_setRepresentation);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_setRepresentation);
         return result !is null ? new NSSet(result) : null;
     }
 
     public void unionHashTable (NSHashTable other)
     {
-        OS.objc_msgSend(this.id, OS.sel_unionHashTable_1, other !is null ? other.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_unionHashTable_1, other !is null ? other.id_ : null);
     }
 
 }