--- a/dwt/internal/cocoa/NSScriptCommand.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSScriptCommand.d	Tue Aug 19 17:35:17 2008 +0200
@@ -38,19 +38,19 @@
 
     public NSAppleEventDescriptor appleEvent ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_appleEvent);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_appleEvent);
         return result !is null ? new NSAppleEventDescriptor(result) : null;
     }
 
     public NSDictionary 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 NSDictionary(result) : null;
     }
 
     public NSScriptCommandDescription commandDescription ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_commandDescription);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_commandDescription);
         return result !is null ? new NSScriptCommandDescription(result) : null;
     }
 
@@ -62,119 +62,119 @@
 
     public id directParameter ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_directParameter);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_directParameter);
         return result !is null ? new id(result) : null;
     }
 
     public NSDictionary evaluatedArguments ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_evaluatedArguments);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_evaluatedArguments);
         return result !is null ? new NSDictionary(result) : null;
     }
 
     public id evaluatedReceivers ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_evaluatedReceivers);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_evaluatedReceivers);
         return result !is null ? new id(result) : null;
     }
 
     public id executeCommand ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_executeCommand);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_executeCommand);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithCommandDescription (NSScriptCommandDescription commandDef)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithCommandDescription_1, commandDef !is null ? commandDef.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithCommandDescription_1, commandDef !is null ? commandDef.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public bool isWellFormed ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_isWellFormed) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isWellFormed) !is null;
     }
 
     public id performDefaultImplementation ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_performDefaultImplementation);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_performDefaultImplementation);
         return result !is null ? new id(result) : null;
     }
 
     public NSScriptObjectSpecifier receiversSpecifier ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_receiversSpecifier);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_receiversSpecifier);
         return result !is null ? new NSScriptObjectSpecifier(result) : null;
     }
 
     public void resumeExecutionWithResult (id result)
     {
-        OS.objc_msgSend(this.id, OS.sel_resumeExecutionWithResult_1, result !is null ? result.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_resumeExecutionWithResult_1, result !is null ? result.id_ : null);
     }
 
     public NSAppleEventDescriptor scriptErrorExpectedTypeDescriptor ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_scriptErrorExpectedTypeDescriptor);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_scriptErrorExpectedTypeDescriptor);
         return result !is null ? new NSAppleEventDescriptor(result) : null;
     }
 
     public int scriptErrorNumber ()
     {
-        return cast(int) OS.objc_msgSend(this.id, OS.sel_scriptErrorNumber);
+        return cast(int) OS.objc_msgSend(this.id_, OS.sel_scriptErrorNumber);
     }
 
     public NSAppleEventDescriptor scriptErrorOffendingObjectDescriptor ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_scriptErrorOffendingObjectDescriptor);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_scriptErrorOffendingObjectDescriptor);
         return result !is null ? new NSAppleEventDescriptor(result) : null;
     }
 
     public NSString scriptErrorString ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_scriptErrorString);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_scriptErrorString);
         return result !is null ? new NSString(result) : null;
     }
 
     public void setArguments (NSDictionary args)
     {
-        OS.objc_msgSend(this.id, OS.sel_setArguments_1, args !is null ? args.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setArguments_1, args !is null ? args.id_ : null);
     }
 
     public void setDirectParameter (id directParameter)
     {
-        OS.objc_msgSend(this.id, OS.sel_setDirectParameter_1, directParameter !is null ? directParameter.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setDirectParameter_1, directParameter !is null ? directParameter.id_ : null);
     }
 
     public void setReceiversSpecifier (NSScriptObjectSpecifier receiversRef)
     {
-        OS.objc_msgSend(this.id, OS.sel_setReceiversSpecifier_1, receiversRef !is null ? receiversRef.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setReceiversSpecifier_1, receiversRef !is null ? receiversRef.id_ : null);
     }
 
     public void setScriptErrorExpectedTypeDescriptor (NSAppleEventDescriptor errorExpectedTypeDescriptor)
     {
-        OS.objc_msgSend(this.id, OS.sel_setScriptErrorExpectedTypeDescriptor_1,
-                errorExpectedTypeDescriptor !is null ? errorExpectedTypeDescriptor.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setScriptErrorExpectedTypeDescriptor_1,
+                errorExpectedTypeDescriptor !is null ? errorExpectedTypeDescriptor.id_ : null);
     }
 
     public void setScriptErrorNumber (int errorNumber)
     {
-        OS.objc_msgSend(this.id, OS.sel_setScriptErrorNumber_1, errorNumber);
+        OS.objc_msgSend(this.id_, OS.sel_setScriptErrorNumber_1, errorNumber);
     }
 
     public void setScriptErrorOffendingObjectDescriptor (NSAppleEventDescriptor errorOffendingObjectDescriptor)
     {
-        OS.objc_msgSend(this.id, OS.sel_setScriptErrorOffendingObjectDescriptor_1,
-                errorOffendingObjectDescriptor !is null ? errorOffendingObjectDescriptor.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setScriptErrorOffendingObjectDescriptor_1,
+                errorOffendingObjectDescriptor !is null ? errorOffendingObjectDescriptor.id_ : null);
     }
 
     public void setScriptErrorString (NSString errorString)
     {
-        OS.objc_msgSend(this.id, OS.sel_setScriptErrorString_1, errorString !is null ? errorString.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setScriptErrorString_1, errorString !is null ? errorString.id_ : null);
     }
 
     public void suspendExecution ()
     {
-        OS.objc_msgSend(this.id, OS.sel_suspendExecution);
+        OS.objc_msgSend(this.id_, OS.sel_suspendExecution);
     }
 
 }