diff dwt/browser/AppFileLocProvider.d @ 154:535243e6d16a

Fixes to make dwt compile with ldc
author Jacob Carlborg <doob@me.com>
date Sat, 13 Jun 2009 00:25:05 +0200
parents 5583f8eeee6c
children
line wrap: on
line diff
--- a/dwt/browser/AppFileLocProvider.d	Thu Jun 11 01:36:32 2009 +0200
+++ b/dwt/browser/AppFileLocProvider.d	Sat Jun 13 00:25:05 2009 +0200
@@ -68,7 +68,7 @@
 nsresult QueryInterface (nsID* riid, void** ppvObject) {
     if (riid is null || ppvObject is null) return XPCOM.NS_ERROR_NO_INTERFACE;
 
-    if (*riid == nsISupports.IID) {
+    if (*riid == nsISupports.IID) {    
         *ppvObject = cast(void*)cast(nsISupports)this;
         AddRef ();
         return XPCOM.NS_OK;
@@ -155,8 +155,8 @@
                 /* value appears to be a valid pathname */
                 if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
                 if (localFile is null) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
-
-                rc = localFile.QueryInterface (&nsIFile.IID, cast(void**)&file); 
+                //rc = localFile.QueryInterface (&nsIFile.IID, cast(void**)&file); TODO
+                rc = localFile.QueryInterface (&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 ();
@@ -241,6 +241,7 @@
         if (localFile is null) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
         
         nsIFile 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);