--- a/dwt/internal/cocoa/NSIndexSet.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSIndexSet.d	Tue Aug 19 17:35:17 2008 +0200
@@ -35,57 +35,57 @@
 
     public bool containsIndex (NSUInteger value)
     {
-        return OS.objc_msgSend(this.id, OS.sel_containsIndex_1, value) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_containsIndex_1, value) !is null;
     }
 
     public bool containsIndexes (NSIndexSet indexSet)
     {
-        return OS.objc_msgSend(this.id, OS.sel_containsIndexes_1, indexSet !is null ? indexSet.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_containsIndexes_1, indexSet !is null ? indexSet.id_ : null) !is null;
     }
 
     public bool containsIndexesInRange (NSRange range)
     {
-        return OS.objc_msgSend(this.id, OS.sel_containsIndexesInRange_1, range) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_containsIndexesInRange_1, range) !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 NSUInteger countOfIndexesInRange (NSRange range)
     {
-        return OS.objc_msgSend(this.id, OS.sel_countOfIndexesInRange_1, range);
+        return cast(NSUInteger) OS.objc_msgSend(this.id_, OS.sel_countOfIndexesInRange_1, range);
     }
 
     public NSUInteger firstIndex ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_firstIndex);
+        return cast(NSUInteger) OS.objc_msgSend(this.id_, OS.sel_firstIndex);
     }
 
     public NSUInteger getIndexes (NSUInteger* indexBuffer, NSUInteger bufferSize, NSRangePointer range)
     {
-        return OS.objc_msgSend(this.id, OS.sel_getIndexes_1maxCount_1inIndexRange_1, indexBuffer, bufferSize, range);
+        return cast(NSUInteger) OS.objc_msgSend(this.id_, OS.sel_getIndexes_1maxCount_1inIndexRange_1, indexBuffer, bufferSize, range);
     }
 
     public NSUInteger indexGreaterThanIndex (NSUInteger value)
     {
-        return OS.objc_msgSend(this.id, OS.sel_indexGreaterThanIndex_1, value);
+        return cast(NSUInteger) OS.objc_msgSend(this.id_, OS.sel_indexGreaterThanIndex_1, value);
     }
 
     public NSUInteger indexGreaterThanOrEqualToIndex (NSUInteger value)
     {
-        return OS.objc_msgSend(this.id, OS.sel_indexGreaterThanOrEqualToIndex_1, value);
+        return cast(NSUInteger) OS.objc_msgSend(this.id_, OS.sel_indexGreaterThanOrEqualToIndex_1, value);
     }
 
     public NSUInteger indexLessThanIndex (NSUInteger value)
     {
-        return OS.objc_msgSend(this.id, OS.sel_indexLessThanIndex_1, value);
+        return cast(NSUInteger) OS.objc_msgSend(this.id_, OS.sel_indexLessThanIndex_1, value);
     }
 
     public NSUInteger indexLessThanOrEqualToIndex (NSUInteger value)
     {
-        return OS.objc_msgSend(this.id, OS.sel_indexLessThanOrEqualToIndex_1, value);
+        return cast(NSUInteger) OS.objc_msgSend(this.id_, OS.sel_indexLessThanOrEqualToIndex_1, value);
     }
 
     public static id indexSet ()
@@ -108,35 +108,35 @@
 
     public id initWithIndex (NSUInteger value)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithIndex_1, value);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithIndex_1, value);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithIndexSet (NSIndexSet indexSet)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithIndexSet_1, indexSet !is null ? indexSet.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithIndexSet_1, indexSet !is null ? indexSet.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithIndexesInRange (NSRange range)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithIndexesInRange_1, range);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithIndexesInRange_1, range);
         return result !is null ? new id(result) : null;
     }
 
     public bool intersectsIndexesInRange (NSRange range)
     {
-        return OS.objc_msgSend(this.id, OS.sel_intersectsIndexesInRange_1, range) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_intersectsIndexesInRange_1, range) !is null;
     }
 
     public bool isEqualToIndexSet (NSIndexSet indexSet)
     {
-        return OS.objc_msgSend(this.id, OS.sel_isEqualToIndexSet_1, indexSet !is null ? indexSet.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isEqualToIndexSet_1, indexSet !is null ? indexSet.id_ : null) !is null;
     }
 
     public NSUInteger lastIndex ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_lastIndex);
+        return cast(NSUInteger) OS.objc_msgSend(this.id_, OS.sel_lastIndex);
     }
 
 }