--- a/dwt/internal/cocoa/NSExpression.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSExpression.d	Tue Aug 19 17:35:17 2008 +0200
@@ -13,6 +13,7 @@
  *******************************************************************************/
 module dwt.internal.cocoa.NSExpression;
 
+import dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSArray;
 import dwt.internal.cocoa.NSMutableDictionary;
 import dwt.internal.cocoa.NSObject;
@@ -50,31 +51,31 @@
 
     public NSArray arguments ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_arguments);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_arguments);
         return result !is null ? new NSArray(result) : null;
     }
 
     public id collection ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_collection);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_collection);
         return result !is null ? new id(result) : null;
     }
 
     public id constantValue ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_constantValue);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_constantValue);
         return result !is null ? new id(result) : null;
     }
 
     public static NSExpression expressionForAggregate (NSArray subexpressions)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForAggregate_1, subexpressions !is null ? subexpressions.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForAggregate_1, subexpressions !is null ? subexpressions.id_ : null);
         return result !is null ? new NSExpression(result) : null;
     }
 
     public static NSExpression expressionForConstantValue (id obj)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForConstantValue_1, obj !is null ? obj.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForConstantValue_1, obj !is null ? obj.id_ : null);
         return result !is null ? new NSExpression(result) : null;
     }
 
@@ -86,115 +87,115 @@
 
     public static NSExpression static_expressionForFunction_arguments_ (NSString name, NSArray parameters)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForFunction_1arguments_1, name !is null ? name.id : null,
-                parameters !is null ? parameters.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForFunction_1arguments_1, name !is null ? name.id_ : null,
+                parameters !is null ? parameters.id_ : null);
         return result !is null ? new NSExpression(result) : null;
     }
 
     public static NSExpression static_expressionForFunction_selectorName_arguments_ (NSExpression target, NSString name, NSArray parameters)
     {
         objc.id result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForFunction_1selectorName_1arguments_1,
-                target !is null ? target.id : null, name !is null ? name.id : null, parameters !is null ? parameters.id : null);
+                target !is null ? target.id_ : null, name !is null ? name.id_ : null, parameters !is null ? parameters.id_ : null);
         return result !is null ? new NSExpression(result) : null;
     }
 
     public static NSExpression expressionForIntersectSet (NSExpression left, NSExpression right)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForIntersectSet_1with_1, left !is null ? left.id : null,
-                right !is null ? right.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForIntersectSet_1with_1, left !is null ? left.id_ : null,
+                right !is null ? right.id_ : null);
         return result !is null ? new NSExpression(result) : null;
     }
 
     public static NSExpression expressionForKeyPath (NSString keyPath)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForKeyPath_1, keyPath !is null ? keyPath.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForKeyPath_1, keyPath !is null ? keyPath.id_ : null);
         return result !is null ? new NSExpression(result) : null;
     }
 
     public static NSExpression expressionForMinusSet (NSExpression left, NSExpression right)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForMinusSet_1with_1, left !is null ? left.id : null,
-                right !is null ? right.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForMinusSet_1with_1, left !is null ? left.id_ : null,
+                right !is null ? right.id_ : null);
         return result !is null ? new NSExpression(result) : null;
     }
 
     public static NSExpression expressionForSubquery (NSExpression expression, NSString variable, id predicate)
     {
         objc.id result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForSubquery_1usingIteratorVariable_1predicate_1,
-                expression !is null ? expression.id : null, variable !is null ? variable.id : null, predicate !is null ? predicate.id : null);
+                expression !is null ? expression.id_ : null, variable !is null ? variable.id_ : null, predicate !is null ? predicate.id_ : null);
         return result !is null ? new NSExpression(result) : null;
     }
 
     public static NSExpression expressionForUnionSet (NSExpression left, NSExpression right)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForUnionSet_1with_1, left !is null ? left.id : null,
-                right !is null ? right.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForUnionSet_1with_1, left !is null ? left.id_ : null,
+                right !is null ? right.id_ : null);
         return result !is null ? new NSExpression(result) : null;
     }
 
     public static NSExpression expressionForVariable (NSString string)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForVariable_1, string !is null ? string.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSExpression, OS.sel_expressionForVariable_1, string !is null ? string.id_ : null);
         return result !is null ? new NSExpression(result) : null;
     }
 
     public NSExpressionType expressionType ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_expressionType);
+        return cast(NSExpressionType) OS.objc_msgSend(this.id_, OS.sel_expressionType);
     }
 
     public id expressionValueWithObject (id object, NSMutableDictionary context)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_expressionValueWithObject_1context_1, object !is null ? object.id : null,
-                context !is null ? context.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_expressionValueWithObject_1context_1, object !is null ? object.id_ : null,
+                context !is null ? context.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public NSString functionn ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_function);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_function);
         return result !is null ? new NSString(result) : null;
     }
 
     public id initWithExpressionType (NSExpressionType type)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithExpressionType_1, type);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithExpressionType_1, type);
         return result !is null ? new id(result) : null;
     }
 
     public NSString keyPath ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_keyPath);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_keyPath);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSExpression leftExpression ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_leftExpression);
-        return result is this.id ? this : (result !is null ? new NSExpression(result) : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_leftExpression);
+        return result is this.id_ ? this : (result !is null ? new NSExpression(result) : null);
     }
 
     public NSExpression operand ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_operand);
-        return result is this.id ? this : (result !is null ? new NSExpression(result) : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_operand);
+        return result is this.id_ ? this : (result !is null ? new NSExpression(result) : null);
     }
 
     public NSPredicate predicate ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_predicate);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_predicate);
         return result !is null ? new NSPredicate(result) : null;
     }
 
     public NSExpression rightExpression ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_rightExpression);
-        return result is this.id ? this : (result !is null ? new NSExpression(result) : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_rightExpression);
+        return result is this.id_ ? this : (result !is null ? new NSExpression(result) : null);
     }
 
     public NSString variable ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_variable);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_variable);
         return result !is null ? new NSString(result) : null;
     }