--- a/dwt/internal/cocoa/NSNetService.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSNetService.d	Tue Aug 19 17:35:17 2008 +0200
@@ -47,146 +47,146 @@
 
     public NSData TXTRecordData ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_TXTRecordData);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_TXTRecordData);
         return result !is null ? new NSData(result) : null;
     }
 
     public NSArray addresses ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_addresses);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_addresses);
         return result !is null ? new NSArray(result) : null;
     }
 
     public static NSData dataFromTXTRecordDictionary (NSDictionary txtDictionary)
     {
         objc.id result = OS.objc_msgSend(OS.class_NSNetService, OS.sel_dataFromTXTRecordDictionary_1,
-                txtDictionary !is null ? txtDictionary.id : null);
+                txtDictionary !is null ? txtDictionary.id_ : null);
         return result !is null ? new NSData(result) : null;
     }
 
     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 static NSDictionary dictionaryFromTXTRecordData (NSData txtData)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSNetService, OS.sel_dictionaryFromTXTRecordData_1, txtData !is null ? txtData.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSNetService, OS.sel_dictionaryFromTXTRecordData_1, txtData !is null ? txtData.id_ : null);
         return result !is null ? new NSDictionary(result) : null;
     }
 
     public NSString domain ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_domain);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_domain);
         return result !is null ? new NSString(result) : null;
     }
 
     public bool getInputStream (objc.id** inputStream, objc.id** outputStream)
     {
-        return OS.objc_msgSend(this.id, OS.sel_getInputStream_1outputStream_1, inputStream, outputStream) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_getInputStream_1outputStream_1, inputStream, outputStream) !is null;
     }
 
     public NSString hostName ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_hostName);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_hostName);
         return result !is null ? new NSString(result) : null;
     }
 
     public id initWithDomain_type_name_ (NSString domain, NSString type, NSString name)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithDomain_1type_1name_1, domain !is null ? domain.id : null,
-                type !is null ? type.id : null, name !is null ? name.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithDomain_1type_1name_1, domain !is null ? domain.id_ : null,
+                type !is null ? type.id_ : null, name !is null ? name.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithDomain_type_name_port_ (NSString domain, NSString type, NSString name, int port)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithDomain_1type_1name_1port_1, domain !is null ? domain.id : null,
-                type !is null ? type.id : null, name !is null ? name.id : null, port);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithDomain_1type_1name_1port_1, domain !is null ? domain.id_ : null,
+                type !is null ? type.id_ : null, name !is null ? name.id_ : null, port);
         return result !is null ? new id(result) : null;
     }
 
     public NSString name ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_name);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_name);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSInteger port ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_port);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_port);
     }
 
     public NSString protocolSpecificInformation ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_protocolSpecificInformation);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_protocolSpecificInformation);
         return result !is null ? new NSString(result) : null;
     }
 
     public void publish ()
     {
-        OS.objc_msgSend(this.id, OS.sel_publish);
+        OS.objc_msgSend(this.id_, OS.sel_publish);
     }
 
     public void publishWithOptions (NSNetServiceOptions options)
     {
-        OS.objc_msgSend(this.id, OS.sel_publishWithOptions_1, options);
+        OS.objc_msgSend(this.id_, OS.sel_publishWithOptions_1, options);
     }
 
     public void removeFromRunLoop (NSRunLoop aRunLoop, NSString mode)
     {
-        OS.objc_msgSend(this.id, OS.sel_removeFromRunLoop_1forMode_1, aRunLoop !is null ? aRunLoop.id : null, mode !is null ? mode.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_removeFromRunLoop_1forMode_1, aRunLoop !is null ? aRunLoop.id_ : null, mode !is null ? mode.id_ : null);
     }
 
     public void resolve ()
     {
-        OS.objc_msgSend(this.id, OS.sel_resolve);
+        OS.objc_msgSend(this.id_, OS.sel_resolve);
     }
 
     public void resolveWithTimeout (NSTimeInterval timeout)
     {
-        OS.objc_msgSend(this.id, OS.sel_resolveWithTimeout_1, timeout);
+        OS.objc_msgSend(this.id_, OS.sel_resolveWithTimeout_1, timeout);
     }
 
     public void scheduleInRunLoop (NSRunLoop aRunLoop, NSString mode)
     {
-        OS.objc_msgSend(this.id, OS.sel_scheduleInRunLoop_1forMode_1, aRunLoop !is null ? aRunLoop.id : null, mode !is null ? mode.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_scheduleInRunLoop_1forMode_1, aRunLoop !is null ? aRunLoop.id_ : null, mode !is null ? mode.id_ : null);
     }
 
     public void setDelegate (id delegatee)
     {
-        OS.objc_msgSend(this.id, OS.sel_setDelegate_1, delegatee !is null ? delegatee.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setDelegate_1, delegatee !is null ? delegatee.id_ : null);
     }
 
     public void setProtocolSpecificInformation (NSString specificInformation)
     {
-        OS.objc_msgSend(this.id, OS.sel_setProtocolSpecificInformation_1, specificInformation !is null ? specificInformation.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setProtocolSpecificInformation_1, specificInformation !is null ? specificInformation.id_ : null);
     }
 
     public bool setTXTRecordData (NSData recordData)
     {
-        return OS.objc_msgSend(this.id, OS.sel_setTXTRecordData_1, recordData !is null ? recordData.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_setTXTRecordData_1, recordData !is null ? recordData.id_ : null) !is null;
     }
 
     public void startMonitoring ()
     {
-        OS.objc_msgSend(this.id, OS.sel_startMonitoring);
+        OS.objc_msgSend(this.id_, OS.sel_startMonitoring);
     }
 
     public void stop ()
     {
-        OS.objc_msgSend(this.id, OS.sel_stop);
+        OS.objc_msgSend(this.id_, OS.sel_stop);
     }
 
     public void stopMonitoring ()
     {
-        OS.objc_msgSend(this.id, OS.sel_stopMonitoring);
+        OS.objc_msgSend(this.id_, OS.sel_stopMonitoring);
     }
 
     public NSString type ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_type);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_type);
         return result !is null ? new NSString(result) : null;
     }