--- a/dwt/internal/cocoa/NSBundle.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSBundle.d	Tue Aug 19 17:35:17 2008 +0200
@@ -48,7 +48,7 @@
 
     public NSString builtInPlugInsPath ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_builtInPlugInsPath);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_builtInPlugInsPath);
         return result !is null ? new NSString(result) : null;
     }
 
@@ -60,93 +60,93 @@
 
     public NSString bundleIdentifier ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_bundleIdentifier);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_bundleIdentifier);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSString bundlePath ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_bundlePath);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_bundlePath);
         return result !is null ? new NSString(result) : null;
     }
 
     public static NSBundle bundleWithIdentifier (NSString identifier)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_bundleWithIdentifier_1, identifier !is null ? identifier.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_bundleWithIdentifier_1, identifier !is null ? identifier.id_ : null);
         return result !is null ? new NSBundle(result) : null;
     }
 
     public static NSBundle bundleWithPath (NSString path)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_bundleWithPath_1, path !is null ? path.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_bundleWithPath_1, path !is null ? path.id_ : null);
         return result !is null ? new NSBundle(result) : null;
     }
 
     public objc.Class classNamed (NSString className)
     {
-        return OS.objc_msgSend(this.id, OS.sel_classNamed_1, className !is null ? className.id : null);
+        return cast(objc.Class) OS.objc_msgSend(this.id_, OS.sel_classNamed_1, className !is null ? className.id_ : null);
     }
 
     public NSString developmentLocalization ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_developmentLocalization);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_developmentLocalization);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSArray executableArchitectures ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_executableArchitectures);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_executableArchitectures);
         return result !is null ? new NSArray(result) : null;
     }
 
     public NSString executablePath ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_executablePath);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_executablePath);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSDictionary infoDictionary ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_infoDictionary);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_infoDictionary);
         return result !is null ? new NSDictionary(result) : null;
     }
 
     public NSBundle initWithPath (NSString path)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithPath_1, path !is null ? path.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithPath_1, path !is null ? path.id_ : null);
         return result !is null ? this : null;
     }
 
     public bool isLoaded ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_isLoaded) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isLoaded) !is null;
     }
 
     //public bool load() {
-    //  return OS.objc_msgSend(this.id, OS.sel_load) !is null;
+    //  return OS.objc_msgSend(this.id_, OS.sel_load) !is null;
     //}
 
     public bool loadAndReturnError (objc.id** error)
     {
-        return OS.objc_msgSend(this.id, OS.sel_loadAndReturnError_1, error) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_loadAndReturnError_1, error) !is null;
     }
 
     public NSArray localizations ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_localizations);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_localizations);
         return result !is null ? new NSArray(result) : null;
     }
 
     public NSDictionary localizedInfoDictionary ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_localizedInfoDictionary);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_localizedInfoDictionary);
         return result !is null ? new NSDictionary(result) : null;
     }
 
     public NSString localizedStringForKey (NSString key, NSString value, NSString tableName)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_localizedStringForKey_1value_1table_1, key !is null ? key.id : null,
-                value !is null ? value.id : null, tableName !is null ? tableName.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_localizedStringForKey_1value_1table_1, key !is null ? key.id_ : null,
+                value !is null ? value.id_ : null, tableName !is null ? tableName.id_ : null);
         return result !is null ? new NSString(result) : null;
     }
 
@@ -158,126 +158,126 @@
 
     public id objectForInfoDictionaryKey (NSString key)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_objectForInfoDictionaryKey_1, key !is null ? key.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_objectForInfoDictionaryKey_1, key !is null ? key.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public NSString pathForAuxiliaryExecutable (NSString executableName)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_pathForAuxiliaryExecutable_1, executableName !is null ? executableName.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_pathForAuxiliaryExecutable_1, executableName !is null ? executableName.id_ : null);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSString pathForResource_ofType_ (NSString name, NSString ext)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_pathForResource_1ofType_1, name !is null ? name.id : null, ext !is null ? ext.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_pathForResource_1ofType_1, name !is null ? name.id_ : null, ext !is null ? ext.id_ : null);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSString pathForResource_ofType_inDirectory_ (NSString name, NSString ext, NSString subpath)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_pathForResource_1ofType_1inDirectory_1, name !is null ? name.id : null,
-                ext !is null ? ext.id : null, subpath !is null ? subpath.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_pathForResource_1ofType_1inDirectory_1, name !is null ? name.id_ : null,
+                ext !is null ? ext.id_ : null, subpath !is null ? subpath.id_ : null);
         return result !is null ? new NSString(result) : null;
     }
 
     public static NSString static_pathForResource_ofType_inDirectory_ (NSString name, NSString ext, NSString bundlePath)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_pathForResource_1ofType_1inDirectory_1, name !is null ? name.id : null,
-                ext !is null ? ext.id : null, bundlePath !is null ? bundlePath.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_pathForResource_1ofType_1inDirectory_1, name !is null ? name.id_ : null,
+                ext !is null ? ext.id_ : null, bundlePath !is null ? bundlePath.id_ : null);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSString pathForResource_ofType_inDirectory_forLocalization_ (NSString name, NSString ext, NSString subpath, NSString localizationName)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_pathForResource_1ofType_1inDirectory_1forLocalization_1, name !is null ? name.id : null,
-                ext !is null ? ext.id : null, subpath !is null ? subpath.id : null, localizationName !is null ? localizationName.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_pathForResource_1ofType_1inDirectory_1forLocalization_1, name !is null ? name.id_ : null,
+                ext !is null ? ext.id_ : null, subpath !is null ? subpath.id_ : null, localizationName !is null ? localizationName.id_ : null);
         return result !is null ? new NSString(result) : null;
     }
 
     public static NSArray static_pathsForResourcesOfType_inDirectory_ (NSString ext, NSString bundlePath)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_pathsForResourcesOfType_1inDirectory_1, ext !is null ? ext.id : null,
-                bundlePath !is null ? bundlePath.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_pathsForResourcesOfType_1inDirectory_1, ext !is null ? ext.id_ : null,
+                bundlePath !is null ? bundlePath.id_ : null);
         return result !is null ? new NSArray(result) : null;
     }
 
     public NSArray pathsForResourcesOfType_inDirectory_ (NSString ext, NSString subpath)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_pathsForResourcesOfType_1inDirectory_1, ext !is null ? ext.id : null,
-                subpath !is null ? subpath.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_pathsForResourcesOfType_1inDirectory_1, ext !is null ? ext.id_ : null,
+                subpath !is null ? subpath.id_ : null);
         return result !is null ? new NSArray(result) : null;
     }
 
     public NSArray pathsForResourcesOfType_inDirectory_forLocalization_ (NSString ext, NSString subpath, NSString localizationName)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_pathsForResourcesOfType_1inDirectory_1forLocalization_1, ext !is null ? ext.id : null,
-                subpath !is null ? subpath.id : null, localizationName !is null ? localizationName.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_pathsForResourcesOfType_1inDirectory_1forLocalization_1, ext !is null ? ext.id_ : null,
+                subpath !is null ? subpath.id_ : null, localizationName !is null ? localizationName.id_ : null);
         return result !is null ? new NSArray(result) : null;
     }
 
     public NSArray preferredLocalizations ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_preferredLocalizations);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_preferredLocalizations);
         return result !is null ? new NSArray(result) : null;
     }
 
     public static NSArray static_preferredLocalizationsFromArray_ (NSArray localizationsArray)
     {
         objc.id result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_preferredLocalizationsFromArray_1,
-                localizationsArray !is null ? localizationsArray.id : null);
+                localizationsArray !is null ? localizationsArray.id_ : null);
         return result !is null ? new NSArray(result) : null;
     }
 
     public static NSArray static_preferredLocalizationsFromArray_forPreferences_ (NSArray localizationsArray, NSArray preferencesArray)
     {
         objc.id result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_preferredLocalizationsFromArray_1forPreferences_1,
-                localizationsArray !is null ? localizationsArray.id : null, preferencesArray !is null ? preferencesArray.id : null);
+                localizationsArray !is null ? localizationsArray.id_ : null, preferencesArray !is null ? preferencesArray.id_ : null);
         return result !is null ? new NSArray(result) : null;
     }
 
     public bool preflightAndReturnError (objc.id** error)
     {
-        return OS.objc_msgSend(this.id, OS.sel_preflightAndReturnError_1, error) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_preflightAndReturnError_1, error) !is null;
     }
 
     public objc.Class principalClass ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_principalClass);
+        return cast(objc.Class) OS.objc_msgSend(this.id_, OS.sel_principalClass);
     }
 
     public NSString privateFrameworksPath ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_privateFrameworksPath);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_privateFrameworksPath);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSString resourcePath ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_resourcePath);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_resourcePath);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSString sharedFrameworksPath ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_sharedFrameworksPath);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_sharedFrameworksPath);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSString sharedSupportPath ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_sharedSupportPath);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_sharedSupportPath);
         return result !is null ? new NSString(result) : null;
     }
 
     public bool unload ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_unload) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_unload) !is null;
     }
 
     public static bool loadNibFile (id fileName, id dict, id zone)
     {
-        return OS.objc_msgSend(OS.class_NSBundle, OS.sel_loadNibFile_1externalNameTable_1withZone_1, fileName.id, dict.id, 0) !is null;
+        return OS.objc_msgSend(OS.class_NSBundle, OS.sel_loadNibFile_1externalNameTable_1withZone_1, fileName.id_, dict.id_, 0) !is null;
     }
 
 }