--- a/dwt/internal/cocoa/NSConnection.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSConnection.d	Tue Aug 19 17:35:17 2008 +0200
@@ -41,12 +41,12 @@
 
     public void addRequestMode (NSString rmode)
     {
-        OS.objc_msgSend(this.id, OS.sel_addRequestMode_1, rmode !is null ? rmode.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_addRequestMode_1, rmode !is null ? rmode.id_ : null);
     }
 
     public void addRunLoop (NSRunLoop runloop)
     {
-        OS.objc_msgSend(this.id, OS.sel_addRunLoop_1, runloop !is null ? runloop.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_addRunLoop_1, runloop !is null ? runloop.id_ : null);
     }
 
     public static NSArray allConnections ()
@@ -58,21 +58,21 @@
     public static id connectionWithReceivePort (NSPort receivePort, NSPort sendPort)
     {
         objc.id result = OS.objc_msgSend(OS.class_NSConnection, OS.sel_connectionWithReceivePort_1sendPort_1,
-                receivePort !is null ? receivePort.id : null, sendPort !is null ? sendPort.id : null);
+                receivePort !is null ? receivePort.id_ : null, sendPort !is null ? sendPort.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public static id static_connectionWithRegisteredName_host_ (NSString name, NSString hostName)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSConnection, OS.sel_connectionWithRegisteredName_1host_1, name !is null ? name.id : null,
-                hostName !is null ? hostName.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSConnection, OS.sel_connectionWithRegisteredName_1host_1, name !is null ? name.id_ : null,
+                hostName !is null ? hostName.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public static id static_connectionWithRegisteredName_host_usingNameServer_ (NSString name, NSString hostName, NSPortNameServer server)
     {
         objc.id result = OS.objc_msgSend(OS.class_NSConnection, OS.sel_connectionWithRegisteredName_1host_1usingNameServer_1,
-                name !is null ? name.id : null, hostName !is null ? hostName.id : null, server !is null ? server.id : null);
+                name !is null ? name.id_ : null, hostName !is null ? hostName.id_ : null, server !is null ? server.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
@@ -90,112 +90,112 @@
 
     public id delegatee ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_delegate);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_delegate);
         return result !is null ? new id(result) : null;
     }
 
     public void enableMultipleThreads ()
     {
-        OS.objc_msgSend(this.id, OS.sel_enableMultipleThreads);
+        OS.objc_msgSend(this.id_, OS.sel_enableMultipleThreads);
     }
 
     public bool independentConversationQueueing ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_independentConversationQueueing) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_independentConversationQueueing) !is null;
     }
 
     public id initWithReceivePort (NSPort receivePort, NSPort sendPort)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithReceivePort_1sendPort_1, receivePort !is null ? receivePort.id : null,
-                sendPort !is null ? sendPort.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithReceivePort_1sendPort_1, receivePort !is null ? receivePort.id_ : null,
+                sendPort !is null ? sendPort.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public void invalidate ()
     {
-        OS.objc_msgSend(this.id, OS.sel_invalidate);
+        OS.objc_msgSend(this.id_, OS.sel_invalidate);
     }
 
     public bool isValid ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_isValid) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isValid) !is null;
     }
 
     public NSArray localObjects ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_localObjects);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_localObjects);
         return result !is null ? new NSArray(result) : null;
     }
 
     public bool multipleThreadsEnabled ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_multipleThreadsEnabled) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_multipleThreadsEnabled) !is null;
     }
 
     public NSPort receivePort ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_receivePort);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_receivePort);
         return result !is null ? new NSPort(result) : null;
     }
 
     public bool registerName_ (NSString name)
     {
-        return OS.objc_msgSend(this.id, OS.sel_registerName_1, name !is null ? name.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_registerName_1, name !is null ? name.id_ : null) !is null;
     }
 
     public bool registerName_withNameServer_ (NSString name, NSPortNameServer server)
     {
-        return OS.objc_msgSend(this.id, OS.sel_registerName_1withNameServer_1, name !is null ? name.id : null, server !is null ? server.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_registerName_1withNameServer_1, name !is null ? name.id_ : null, server !is null ? server.id_ : null) !is null;
     }
 
     public NSArray remoteObjects ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_remoteObjects);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_remoteObjects);
         return result !is null ? new NSArray(result) : null;
     }
 
     public void removeRequestMode (NSString rmode)
     {
-        OS.objc_msgSend(this.id, OS.sel_removeRequestMode_1, rmode !is null ? rmode.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_removeRequestMode_1, rmode !is null ? rmode.id_ : null);
     }
 
     public void removeRunLoop (NSRunLoop runloop)
     {
-        OS.objc_msgSend(this.id, OS.sel_removeRunLoop_1, runloop !is null ? runloop.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_removeRunLoop_1, runloop !is null ? runloop.id_ : null);
     }
 
     public double replyTimeout ()
     {
-        return OS.objc_msgSend_fpret(this.id, OS.sel_replyTimeout);
+        return OS.objc_msgSend_fpret(this.id_, OS.sel_replyTimeout);
     }
 
     public NSArray requestModes ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_requestModes);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_requestModes);
         return result !is null ? new NSArray(result) : null;
     }
 
     public double requestTimeout ()
     {
-        return OS.objc_msgSend_fpret(this.id, OS.sel_requestTimeout);
+        return OS.objc_msgSend_fpret(this.id_, OS.sel_requestTimeout);
     }
 
     public id rootObject ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_rootObject);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_rootObject);
         return result !is null ? new id(result) : null;
     }
 
     public NSDistantObject rootProxy ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_rootProxy);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_rootProxy);
         return result !is null ? new NSDistantObject(result) : null;
     }
 
     public static NSDistantObject static_rootProxyForConnectionWithRegisteredName_host_ (NSString name, NSString hostName)
     {
         objc.id result = OS.objc_msgSend(OS.class_NSConnection, OS.sel_rootProxyForConnectionWithRegisteredName_1host_1,
-                name !is null ? name.id : null, hostName !is null ? hostName.id : null);
+                name !is null ? name.id_ : null, hostName !is null ? hostName.id_ : null);
         return result !is null ? new NSDistantObject(result) : null;
     }
 
@@ -203,63 +203,63 @@
             NSPortNameServer server)
     {
         objc.id result = OS.objc_msgSend(OS.class_NSConnection, OS.sel_rootProxyForConnectionWithRegisteredName_1host_1usingNameServer_1,
-                name !is null ? name.id : null, hostName !is null ? hostName.id : null, server !is null ? server.id : null);
+                name !is null ? name.id_ : null, hostName !is null ? hostName.id_ : null, server !is null ? server.id_ : null);
         return result !is null ? new NSDistantObject(result) : null;
     }
 
     public void runInNewThread ()
     {
-        OS.objc_msgSend(this.id, OS.sel_runInNewThread);
+        OS.objc_msgSend(this.id_, OS.sel_runInNewThread);
     }
 
     public NSPort sendPort ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_sendPort);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_sendPort);
         return result !is null ? new NSPort(result) : null;
     }
 
     public static id static_serviceConnectionWithName_rootObject_ (NSString name, id root)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSConnection, OS.sel_serviceConnectionWithName_1rootObject_1, name !is null ? name.id : null,
-                root !is null ? root.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSConnection, OS.sel_serviceConnectionWithName_1rootObject_1, name !is null ? name.id_ : null,
+                root !is null ? root.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public static id static_serviceConnectionWithName_rootObject_usingNameServer_ (NSString name, id root, NSPortNameServer server)
     {
         objc.id result = OS.objc_msgSend(OS.class_NSConnection, OS.sel_serviceConnectionWithName_1rootObject_1usingNameServer_1,
-                name !is null ? name.id : null, root !is null ? root.id : null, server !is null ? server.id : null);
+                name !is null ? name.id_ : null, root !is null ? root.id_ : null, server !is null ? server.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public void setDelegate (id anObject)
     {
-        OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anObject !is null ? anObject.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setDelegate_1, anObject !is null ? anObject.id_ : null);
     }
 
     public void setIndependentConversationQueueing (bool yorn)
     {
-        OS.objc_msgSend(this.id, OS.sel_setIndependentConversationQueueing_1, yorn);
+        OS.objc_msgSend(this.id_, OS.sel_setIndependentConversationQueueing_1, yorn);
     }
 
     public void setReplyTimeout (double ti)
     {
-        OS.objc_msgSend(this.id, OS.sel_setReplyTimeout_1, ti);
+        OS.objc_msgSend(this.id_, OS.sel_setReplyTimeout_1, ti);
     }
 
     public void setRequestTimeout (double ti)
     {
-        OS.objc_msgSend(this.id, OS.sel_setRequestTimeout_1, ti);
+        OS.objc_msgSend(this.id_, OS.sel_setRequestTimeout_1, ti);
     }
 
     public void setRootObject (id anObject)
     {
-        OS.objc_msgSend(this.id, OS.sel_setRootObject_1, anObject !is null ? anObject.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setRootObject_1, anObject !is null ? anObject.id_ : null);
     }
 
     public NSDictionary statistics ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_statistics);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_statistics);
         return result !is null ? new NSDictionary(result) : null;
     }