--- a/dwt/internal/mozilla/nsIInterfaceRequestor.d	Fri Jan 16 12:19:08 2009 +0100
+++ b/dwt/internal/mozilla/nsIInterfaceRequestor.d	Fri Jan 16 12:49:08 2009 +0100
@@ -1,49 +1,22 @@
-/* ***** 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, 2005 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
 module dwt.internal.mozilla.nsIInterfaceRequestor;
 
-import dwt.dwthelper.utils;
-
-public class nsIInterfaceRequestor extends nsISupports {
+import dwt.internal.mozilla.Common;
+import dwt.internal.mozilla.nsID;
+import dwt.internal.mozilla.nsISupports;
 
-    static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1;
+const char[] NS_IINTERFACEREQUESTOR_IID_STR = "033a1470-8b2a-11d3-af88-00a024ffc08c";
 
-    public static final String NS_IINTERFACEREQUESTOR_IID_STR =
-        "033a1470-8b2a-11d3-af88-00a024ffc08c";
+const nsIID NS_IINTERFACEREQUESTOR_IID= 
+  {0x033a1470, 0x8b2a, 0x11d3, 
+    [ 0xaf, 0x88, 0x00, 0xa0, 0x24, 0xff, 0xc0, 0x8c ]};
 
-    public static final nsID NS_IINTERFACEREQUESTOR_IID =
-        new nsID(NS_IINTERFACEREQUESTOR_IID_STR);
+interface nsIInterfaceRequestor : nsISupports {
+
+  static const char[] IID_STR = NS_IINTERFACEREQUESTOR_IID_STR;
+  static const nsIID IID = NS_IINTERFACEREQUESTOR_IID;
 
-    public nsIInterfaceRequestor(int /*long*/ address) {
-        super(address);
-    }
+extern(System):
+  nsresult GetInterface(nsIID * uuid, void * *result);
 
-    public int GetInterface(nsID uuid, int /*long*/[] result) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uuid, result);
-    }
 }
+