--- a/dwt/internal/mozilla/nsICookieManager.d	Fri Jan 16 12:19:08 2009 +0100
+++ b/dwt/internal/mozilla/nsICookieManager.d	Fri Jan 16 12:49:08 2009 +0100
@@ -1,57 +1,26 @@
-/* ***** 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.nsICookieManager;
 
-import dwt.dwthelper.utils;
-
-public class nsICookieManager extends nsISupports {
-
-    static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
+import dwt.internal.mozilla.Common;
+import dwt.internal.mozilla.nsID;
+import dwt.internal.mozilla.nsISupports;
+import dwt.internal.mozilla.nsISimpleEnumerator;
+import dwt.internal.mozilla.nsStringAPI;
 
-    public static final String NS_ICOOKIEMANAGER_IID_STR =
-        "aaab6710-0f2c-11d5-a53b-0010a401eb10";
+const char[] NS_ICOOKIEMANAGER_IID_STR = "aaab6710-0f2c-11d5-a53b-0010a401eb10";
 
-    public static final nsID NS_ICOOKIEMANAGER_IID =
-        new nsID(NS_ICOOKIEMANAGER_IID_STR);
+const nsIID NS_ICOOKIEMANAGER_IID= 
+  {0xaaab6710, 0x0f2c, 0x11d5, 
+    [ 0xa5, 0x3b, 0x00, 0x10, 0xa4, 0x01, 0xeb, 0x10 ]};
 
-    public nsICookieManager(int /*long*/ address) {
-        super(address);
-    }
+interface nsICookieManager : nsISupports {
 
-    public int RemoveAll() {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
-    }
+  static const char[] IID_STR = NS_ICOOKIEMANAGER_IID_STR;
+  static const nsIID IID = NS_ICOOKIEMANAGER_IID;
 
-    public int GetEnumerator(int /*long*/[] aEnumerator) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEnumerator);
-    }
+extern(System):
+  nsresult RemoveAll();
+  nsresult GetEnumerator(nsISimpleEnumerator  *aEnumerator);
+  nsresult Remove(nsACString * aDomain, nsACString * aName, nsACString * aPath, PRBool aBlocked);
 
-    public int Remove(int /*long*/ aDomain, int /*long*/ aName, int /*long*/ aPath, int aBlocked) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDomain, aName, aPath, aBlocked);
-    }
 }
+