--- a/dwt/internal/mozilla/nsIDownload.d	Fri Jan 16 12:19:08 2009 +0100
+++ b/dwt/internal/mozilla/nsIDownload.d	Fri Jan 16 12:49:08 2009 +0100
@@ -1,97 +1,41 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and DWT
- * -  Copyright (C) 2004, 2005 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
 module dwt.internal.mozilla.nsIDownload;
 
-import dwt.dwthelper.utils;
-
-public class nsIDownload extends nsISupports {
-
-    static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 13;
-
-    public static final String NS_IDOWNLOAD_IID_STR =
-        "06cb92f2-1dd2-11b2-95f2-96dfdfb804a1";
-
-    public static final nsID NS_IDOWNLOAD_IID =
-        new nsID(NS_IDOWNLOAD_IID_STR);
-
-    public nsIDownload(int /*long*/ address) {
-        super(address);
-    }
+import dwt.internal.mozilla.Common;
+import dwt.internal.mozilla.nsISupports;
+import dwt.internal.mozilla.nsID;
+import dwt.internal.mozilla.nsITransfer;
+import dwt.internal.mozilla.nsIWebProgressListener;
+import dwt.internal.mozilla.nsIURI; 
+import dwt.internal.mozilla.nsILocalFile;
+import dwt.internal.mozilla.nsIObserver; 
+import dwt.internal.mozilla.nsICancelable;
+import dwt.internal.mozilla.nsIMIMEInfo; 
+import dwt.internal.mozilla.nsStringAPI;
+import dwt.internal.mozilla.prtime;
 
-    public int Init(int /*long*/ aSource, int /*long*/ aTarget, char[] aDisplayName, int /*long*/ aMIMEInfo, long startTime, int /*long*/ aPersist) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aPersist);
-    }
-
-    public int GetSource(int /*long*/[] aSource) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource);
-    }
+const char[] NS_IDOWNLOAD_IID_STR = "9e1fd9f2-9727-4926-85cd-f16c375bba6d";
 
-    public int GetTarget(int /*long*/[] aTarget) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aTarget);
-    }
-
-    public int GetPersist(int /*long*/[] aPersist) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPersist);
-    }
+const nsIID NS_IDOWNLOAD_IID= 
+  {0x9e1fd9f2, 0x9727, 0x4926, 
+    [ 0x85, 0xcd, 0xf1, 0x6c, 0x37, 0x5b, 0xba, 0x6d ]};
 
-    public int GetPercentComplete(int[] aPercentComplete) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPercentComplete);
-    }
-
-    public int GetDisplayName(int /*long*/[] aDisplayName) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDisplayName);
-    }
+interface nsIDownload : nsISupports {
 
-    public int SetDisplayName(char[] aDisplayName) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aDisplayName);
-    }
-
-    public int GetStartTime(long[] aStartTime) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStartTime);
-    }
+  static const char[] IID_STR = NS_IDOWNLOAD_IID_STR;
+  static const nsIID IID = NS_IDOWNLOAD_IID;
 
-    public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aMIMEInfo);
-    }
-
-    public int GetListener(int /*long*/[] aListener) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aListener);
-    }
-
-    public int SetListener(int /*long*/ aListener) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aListener);
-    }
-
-    public int GetObserver(int /*long*/[] aObserver) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aObserver);
-    }
-
-    public int SetObserver(int /*long*/ aObserver) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aObserver);
-    }
+extern(System):
+  nsresult Init(nsIURI aSource, nsIURI aTarget, nsAString* aDisplayName, nsIMIMEInfo aMIMEInfo, PRTime startTime, PRBool aPersist);
+  nsresult GetSource(nsIURI  *aSource);
+  nsresult GetTarget(nsIURI  *aTarget);
+  nsresult GetPersist(PRBool *aPersist);
+  nsresult GetPercentComplete(PRInt32 *aPercentComplete);
+  nsresult GetDisplayName(PRUnichar * *aDisplayName);
+  nsresult SetDisplayName(PRUnichar* aDisplayName);
+  nsresult GetStartTime(PRInt64 *aStartTime);
+  nsresult GetMIMEInfo(nsIMIMEInfo  *aMIMEInfo);
+  nsresult GetListener(nsIWebProgressListener* aListener);
+  nsresult SetListener(nsIWebProgressListener aListener);
+  nsresult GetObserver(nsIObserver * aObserver);
+  nsresult SetObserver(nsIObserver aObserver);
 }