--- a/dwt/internal/cocoa/NSSound.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSSound.d	Tue Aug 19 17:35:17 2008 +0200
@@ -39,130 +39,130 @@
 
     public static bool canInitWithPasteboard (NSPasteboard pasteboard)
     {
-        return OS.objc_msgSend(OS.class_NSSound, OS.sel_canInitWithPasteboard_1, pasteboard !is null ? pasteboard.id : null) !is null;
+        return OS.objc_msgSend(OS.class_NSSound, OS.sel_canInitWithPasteboard_1, pasteboard !is null ? pasteboard.id_ : null) !is null;
     }
 
     public NSArray channelMapping ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_channelMapping);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_channelMapping);
         return result !is null ? new NSArray(result) : null;
     }
 
     public NSTimeInterval currentTime ()
     {
-        return cast(NSTimeInterval) OS.objc_msgSend_fpret(this.id, OS.sel_currentTime);
+        return cast(NSTimeInterval) OS.objc_msgSend_fpret(this.id_, OS.sel_currentTime);
     }
 
     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 NSTimeInterval duration ()
     {
-        return cast(NSTimeInterval) OS.objc_msgSend_fpret(this.id, OS.sel_duration);
+        return cast(NSTimeInterval) OS.objc_msgSend_fpret(this.id_, OS.sel_duration);
     }
 
     public id initWithContentsOfFile (NSString path, bool byRef)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfFile_1byReference_1, path !is null ? path.id : null, byRef);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithContentsOfFile_1byReference_1, path !is null ? path.id_ : null, byRef);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithContentsOfURL (NSURL url, bool byRef)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfURL_1byReference_1, url !is null ? url.id : null, byRef);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithContentsOfURL_1byReference_1, url !is null ? url.id_ : null, byRef);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithData (NSData data)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithData_1, data !is null ? data.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithData_1, data !is null ? data.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithPasteboard (NSPasteboard pasteboard)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithPasteboard_1, pasteboard !is null ? pasteboard.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithPasteboard_1, pasteboard !is null ? pasteboard.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public bool isPlaying ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_isPlaying) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isPlaying) !is null;
     }
 
     public bool loops ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_loops) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_loops) !is 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 bool pause ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_pause) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_pause) !is null;
     }
 
     public bool play ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_play) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_play) !is null;
     }
 
     public NSString playbackDeviceIdentifier ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_playbackDeviceIdentifier);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_playbackDeviceIdentifier);
         return result !is null ? new NSString(result) : null;
     }
 
     public bool resume ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_resume) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_resume) !is null;
     }
 
     public void setChannelMapping (NSArray channelMapping)
     {
-        OS.objc_msgSend(this.id, OS.sel_setChannelMapping_1, channelMapping !is null ? channelMapping.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setChannelMapping_1, channelMapping !is null ? channelMapping.id_ : null);
     }
 
     public void setCurrentTime (NSTimeInterval seconds)
     {
-        OS.objc_msgSend(this.id, OS.sel_setCurrentTime_1, seconds);
+        OS.objc_msgSend(this.id_, OS.sel_setCurrentTime_1, seconds);
     }
 
     public void setDelegate (id aDelegate)
     {
-        OS.objc_msgSend(this.id, OS.sel_setDelegate_1, aDelegate !is null ? aDelegate.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setDelegate_1, aDelegate !is null ? aDelegate.id_ : null);
     }
 
     public void setLoops (bool val)
     {
-        OS.objc_msgSend(this.id, OS.sel_setLoops_1, val);
+        OS.objc_msgSend(this.id_, OS.sel_setLoops_1, val);
     }
 
     public bool setName (NSString string)
     {
-        return OS.objc_msgSend(this.id, OS.sel_setName_1, string !is null ? string.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_setName_1, string !is null ? string.id_ : null) !is null;
     }
 
     public void setPlaybackDeviceIdentifier (NSString deviceUID)
     {
-        OS.objc_msgSend(this.id, OS.sel_setPlaybackDeviceIdentifier_1, deviceUID !is null ? deviceUID.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setPlaybackDeviceIdentifier_1, deviceUID !is null ? deviceUID.id_ : null);
     }
 
     public void setVolume (float volume)
     {
-        OS.objc_msgSend(this.id, OS.sel_setVolume_1, volume);
+        OS.objc_msgSend(this.id_, OS.sel_setVolume_1, volume);
     }
 
     public static id soundNamed (NSString name)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSSound, OS.sel_soundNamed_1, name !is null ? name.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSSound, OS.sel_soundNamed_1, name !is null ? name.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
@@ -186,17 +186,17 @@
 
     public bool stop ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_stop) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_stop) !is null;
     }
 
     public float volume ()
     {
-        return cast(float) OS.objc_msgSend_fpret(this.id, OS.sel_volume);
+        return cast(float) OS.objc_msgSend_fpret(this.id_, OS.sel_volume);
     }
 
     public void writeToPasteboard (NSPasteboard pasteboard)
     {
-        OS.objc_msgSend(this.id, OS.sel_writeToPasteboard_1, pasteboard !is null ? pasteboard.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_writeToPasteboard_1, pasteboard !is null ? pasteboard.id_ : null);
     }
 
 }