--- a/dwt/internal/cocoa/NSSocketPort.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSSocketPort.d	Tue Aug 19 17:35:17 2008 +0200
@@ -13,6 +13,7 @@
  *******************************************************************************/
 module dwt.internal.cocoa.NSSocketPort;
 
+import dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSData;
 import dwt.internal.cocoa.NSPort;
 import dwt.internal.cocoa.NSString;
@@ -34,60 +35,60 @@
 
     public NSData address ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_address);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_address);
         return result !is null ? new NSData(result) : null;
     }
 
     public id initRemoteWithProtocolFamily (int family, int type, int protocol, NSData address)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initRemoteWithProtocolFamily_1socketType_1protocol_1address_1, family, type, protocol,
-                address !is null ? address.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initRemoteWithProtocolFamily_1socketType_1protocol_1address_1, family, type, protocol,
+                address !is null ? address.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public id initRemoteWithTCPPort (ushort port, NSString hostName)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initRemoteWithTCPPort_1host_1, port, hostName !is null ? hostName.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initRemoteWithTCPPort_1host_1, port, hostName !is null ? hostName.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithProtocolFamily_socketType_protocol_address_ (int family, int type, int protocol, NSData address)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithProtocolFamily_1socketType_1protocol_1address_1, family, type, protocol,
-                address !is null ? address.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithProtocolFamily_1socketType_1protocol_1address_1, family, type, protocol,
+                address !is null ? address.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithProtocolFamily_socketType_protocol_socket_ (int family, int type, int protocol, NSSocketNativeHandle sock)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithProtocolFamily_1socketType_1protocol_1socket_1, family, type, protocol, sock);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithProtocolFamily_1socketType_1protocol_1socket_1, family, type, protocol, sock);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithTCPPort (short port)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithTCPPort_1, port);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithTCPPort_1, port);
         return result !is null ? new id(result) : null;
     }
 
     public int protocol ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_protocol);
+        return cast(int) OS.objc_msgSend(this.id_, OS.sel_protocol);
     }
 
     public int protocolFamily ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_protocolFamily);
+        return cast(int) OS.objc_msgSend(this.id_, OS.sel_protocolFamily);
     }
 
     public NSSocketNativeHandle socket ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_socket);
+        return cast(NSSocketNativeHandle) OS.objc_msgSend(this.id_, OS.sel_socket);
     }
 
     public int socketType ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_socketType);
+        return cast(int) OS.objc_msgSend(this.id_, OS.sel_socketType);
     }
 
 }