diff dwt/browser/AppFileLocProvider.d @ 333:8235a17d9255

Continued progress on Mozilla.d
author John Reimer <terminal.node@gmail.com>
date Sun, 19 Oct 2008 21:18:43 -0700
parents c7c696cdfec2
children 3f4a5c7d138f
line wrap: on
line diff
--- a/dwt/browser/AppFileLocProvider.d	Sun Oct 19 01:20:57 2008 +0200
+++ b/dwt/browser/AppFileLocProvider.d	Sun Oct 19 21:18:43 2008 -0700
@@ -45,15 +45,15 @@
     static final String PREFERENCES_FILE = "prefs.js"; //$NON-NLS-1$
     
 this (String path) {
-    mozillaPath = path ~ SEPARATOR_OS;f
+    mozillaPath = path ~ SEPARATOR_OS;
 }
 
-int AddRef () {
+nsrefcnt AddRef () {
     refCount++;
     return refCount;
 }
 
-int QueryInterface (nsID* riid, int void** ppvObject) {
+nsresult QueryInterface (nsID* riid, int void** ppvObject) {
     if (riid is null || ppvObject is null) return XPCOM.NS_ERROR_NO_INTERFACE;
 
     if (*riid == nsISupports.IID)) {
@@ -76,7 +76,7 @@
     return XPCOM.NS_ERROR_NO_INTERFACE;
 }
 
-int Release () {
+nsrefcnt Release () {
     refCount--;
     if (refCount is 0) return 0;
     return refCount;
@@ -143,7 +143,7 @@
                 if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
                 if (localFile is null) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
 
-                rc = localFile.QueryInterface (nsIFile.NS_IFILE_IID, &(cast(void*)file)); 
+                rc = localFile.QueryInterface (nsIFile.NS_IFILE_IID, cast(void**)&file); 
                 if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
                 if (file is null) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
                 localFile.Release ();
@@ -230,7 +230,7 @@
         if (localFile is null) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
         
         nsIFile file;
-        rc = localFile.QueryInterface (nsIFile.IID, &(cast(void*)file)); 
+        rc = localFile.QueryInterface (&nsIFile.IID, cast(void**)&file)); 
         if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
         if (file is null) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);