--- a/dwt/internal/mozilla/nsIHelperAppLauncher.d	Fri Jan 16 12:19:08 2009 +0100
+++ b/dwt/internal/mozilla/nsIHelperAppLauncher.d	Fri Jan 16 12:49:08 2009 +0100
@@ -1,81 +1,35 @@
-/* ***** 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) 2003, 2008 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-module dwt.internal.mozilla.nsIHelperAppLauncher;
-
-import dwt.dwthelper.utils;
-
-public class nsIHelperAppLauncher extends nsISupports {
-
-    static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9;
-
-    public static final String NS_IHELPERAPPLAUNCHER_IID_STR =
-        "9503d0fe-4c9d-11d4-98d0-001083010e9b";
-
-    public static final nsID NS_IHELPERAPPLAUNCHER_IID =
-        new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
-
-    public nsIHelperAppLauncher(int /*long*/ address) {
-        super(address);
-    }
-
-    public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
-    }
-
-    public int GetSource(int /*long*/[] aSource) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource);
-    }
-
-    public int GetSuggestedFileName(int /*long*/[] aSuggestedFileName) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
-    }
-
-    public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
-    }
-
-    public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
-    }
-
-    public int Cancel() {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
-    }
-
-    public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aWebProgressListener);
-    }
-
-    public int CloseProgressWindow() {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
-    }
-
-    public int GetDownloadInfo(int /*long*/[] aSourceUrl, long[] aTimeDownloadStarted, int /*long*/[] _retval) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSourceUrl, aTimeDownloadStarted, _retval);
-    }
-}
+module dwt.internal.mozilla.nsIHelperAppLauncher;
+
+private import dwt.internal.mozilla.Common;
+private import dwt.internal.mozilla.nsID;
+private import dwt.internal.mozilla.nsISupports;
+private import dwt.internal.mozilla.nsIURI;
+private import dwt.internal.mozilla.nsIMIMEInfo;
+private import dwt.internal.mozilla.nsIFile;
+private import dwt.internal.mozilla.nsIWebProgressListener;
+private import dwt.internal.mozilla.nsStringAPI;
+private import dwt.internal.mozilla.prtime;
+
+const char[] NS_IHELPERAPPLAUNCHER_IID_STR = "9503d0fe-4c9d-11d4-98d0-001083010e9b";
+
+const nsIID NS_IHELPERAPPLAUNCHER_IID= 
+  {0x9503d0fe, 0x4c9d, 0x11d4, 
+    [ 0x98, 0xd0, 0x00, 0x10, 0x83, 0x01, 0x0e, 0x9b ]};
+
+interface nsIHelperAppLauncher : nsISupports {
+
+  static const char[] IID_STR = NS_IHELPERAPPLAUNCHER_IID_STR;
+  static const nsIID IID = NS_IHELPERAPPLAUNCHER_IID;
+
+extern(System):
+  nsresult GetMIMEInfo(nsIMIMEInfo  *aMIMEInfo);
+  nsresult GetSource(nsIURI  *aSource);
+  nsresult GetSuggestedFileName(nsAString * aSuggestedFileName);
+  nsresult SaveToDisk(nsIFile aNewFileLocation, PRBool aRememberThisPreference);
+  nsresult LaunchWithApplication(nsIFile aApplication, PRBool aRememberThisPreference);
+  nsresult Cancel();
+  nsresult SetWebProgressListener(nsIWebProgressListener aWebProgressListener);
+  nsresult CloseProgressWindow();
+  nsresult GetDownloadInfo( nsIURI* aSourceUrl, PRTime* aTimeDownloadStarted, nsIFile* result);
+
+}
\ No newline at end of file