--- a/dwt/internal/cocoa/NSPredicateEditorRowTemplate.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSPredicateEditorRowTemplate.d	Tue Aug 19 17:35:17 2008 +0200
@@ -13,6 +13,7 @@
  *******************************************************************************/
 module dwt.internal.cocoa.NSPredicateEditorRowTemplate;
 
+import dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSArray;
 import dwt.internal.cocoa.NSAttributeType;
 import dwt.internal.cocoa.NSComparisonPredicate : NSComparisonPredicateModifier;
@@ -37,96 +38,96 @@
 
     public NSArray compoundTypes ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_compoundTypes);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_compoundTypes);
         return result !is null ? new NSArray(result) : null;
     }
 
     public NSArray displayableSubpredicatesOfPredicate (NSPredicate predicate)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_displayableSubpredicatesOfPredicate_1, predicate !is null ? predicate.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_displayableSubpredicatesOfPredicate_1, predicate !is null ? predicate.id_ : null);
         return result !is null ? new NSArray(result) : null;
     }
 
     public id initWithCompoundTypes (NSArray compoundTypes)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithCompoundTypes_1, compoundTypes !is null ? compoundTypes.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithCompoundTypes_1, compoundTypes !is null ? compoundTypes.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithLeftExpressions_rightExpressionAttributeType_modifier_operators_options_ (NSArray leftExpressions,
             NSAttributeType attributeType, NSComparisonPredicateModifier modifier, NSArray operators, NSUInteger options)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithLeftExpressions_1rightExpressionAttributeType_1modifier_1operators_1options_1,
-                leftExpressions !is null ? leftExpressions.id : null, attributeType, modifier, operators !is null ? operators.id : null, options);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithLeftExpressions_1rightExpressionAttributeType_1modifier_1operators_1options_1,
+                leftExpressions !is null ? leftExpressions.id_ : null, attributeType, modifier, operators !is null ? operators.id_ : null, options);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithLeftExpressions_rightExpressions_modifier_operators_options_ (NSArray leftExpressions, NSArray rightExpressions, NSComparisonPredicateModifier modifier,
             NSArray operators, NSUInteger options)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithLeftExpressions_1rightExpressions_1modifier_1operators_1options_1,
-                leftExpressions !is null ? leftExpressions.id : null, rightExpressions !is null ? rightExpressions.id : null, modifier,
-                operators !is null ? operators.id : null, options);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithLeftExpressions_1rightExpressions_1modifier_1operators_1options_1,
+                leftExpressions !is null ? leftExpressions.id_ : null, rightExpressions !is null ? rightExpressions.id_ : null, modifier,
+                operators !is null ? operators.id_ : null, options);
         return result !is null ? new id(result) : null;
     }
 
     public NSArray leftExpressions ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_leftExpressions);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_leftExpressions);
         return result !is null ? new NSArray(result) : null;
     }
 
     public double matchForPredicate (NSPredicate predicate)
     {
-        return OS.objc_msgSend_fpret(this.id, OS.sel_matchForPredicate_1, predicate !is null ? predicate.id : null);
+        return OS.objc_msgSend_fpret(this.id_, OS.sel_matchForPredicate_1, predicate !is null ? predicate.id_ : null);
     }
 
     public NSComparisonPredicateModifier modifier ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_modifier);
+        return cast(NSComparisonPredicateModifier) OS.objc_msgSend(this.id_, OS.sel_modifier);
     }
 
     public NSArray operators ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_operators);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_operators);
         return result !is null ? new NSArray(result) : null;
     }
 
     public NSUInteger options ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_options);
+        return cast(NSUInteger) OS.objc_msgSend(this.id_, OS.sel_options);
     }
 
     public NSPredicate predicateWithSubpredicates (NSArray subpredicates)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_predicateWithSubpredicates_1, subpredicates !is null ? subpredicates.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_predicateWithSubpredicates_1, subpredicates !is null ? subpredicates.id_ : null);
         return result !is null ? new NSPredicate(result) : null;
     }
 
     public NSAttributeType rightExpressionAttributeType ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_rightExpressionAttributeType);
+        return cast(NSAttributeType) OS.objc_msgSend(this.id_, OS.sel_rightExpressionAttributeType);
     }
 
     public NSArray rightExpressions ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_rightExpressions);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_rightExpressions);
         return result !is null ? new NSArray(result) : null;
     }
 
     public void setPredicate (NSPredicate predicate)
     {
-        OS.objc_msgSend(this.id, OS.sel_setPredicate_1, predicate !is null ? predicate.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setPredicate_1, predicate !is null ? predicate.id_ : null);
     }
 
     public NSArray templateViews ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_templateViews);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_templateViews);
         return result !is null ? new NSArray(result) : null;
     }
 
 //public static NSArray templatesWithAttributeKeyPaths(NSArray keyPaths, NSEntityDescription entityDescription) {
-//  objc.id result = OS.objc_msgSend(OS.class_NSPredicateEditorRowTemplate, OS.sel_templatesWithAttributeKeyPaths_1inEntityDescription_1, keyPaths !is null ? keyPaths.id : null, entityDescription !is null ? entityDescription.id : null);
+//  objc.id result = OS.objc_msgSend(OS.class_NSPredicateEditorRowTemplate, OS.sel_templatesWithAttributeKeyPaths_1inEntityDescription_1, keyPaths !is null ? keyPaths.id_ : null, entityDescription !is null ? entityDescription.id_ : null);
 //  return result !is null ? new NSArray(result) : null;
 //}