From 45421d6c99417f5e580e6033d5a35a47d7e8b01a Mon Sep 17 00:00:00 2001 From: "vidur%netscape.com" Date: Tue, 18 Jan 2000 23:41:27 +0000 Subject: [PATCH] Cleanup - dealing with people modifying the idl generator and not checking in the generated file or vice-versa. r=pollmann. git-svn-id: svn://10.0.0.236/trunk@58158 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/dom/public/base/nsIDOMWindow.h | 2 ++ mozilla/dom/public/html/nsIDOMHTMLOptionElement.h | 2 ++ mozilla/dom/src/base/nsJSWindow.cpp | 2 ++ mozilla/dom/src/coreDOM/nsJSDocument.cpp | 3 +-- mozilla/dom/src/html/nsJSHTMLInputElement.cpp | 2 +- mozilla/dom/src/html/nsJSHTMLOptionElement.cpp | 2 ++ mozilla/dom/src/html/nsJSHTMLTextAreaElement.cpp | 2 +- mozilla/dom/tools/FileGen.cpp | 2 ++ 8 files changed, 13 insertions(+), 4 deletions(-) diff --git a/mozilla/dom/public/base/nsIDOMWindow.h b/mozilla/dom/public/base/nsIDOMWindow.h index 3702fe87f69..4f34ddb2464 100644 --- a/mozilla/dom/public/base/nsIDOMWindow.h +++ b/mozilla/dom/public/base/nsIDOMWindow.h @@ -16,6 +16,8 @@ * Communications Corporation. Portions created by Netscape are * Copyright (C) 1998 Netscape Communications Corporation. All * Rights Reserved. + * + * Contributor(s): */ /* AUTO-GENERATED. DO NOT EDIT!!! */ diff --git a/mozilla/dom/public/html/nsIDOMHTMLOptionElement.h b/mozilla/dom/public/html/nsIDOMHTMLOptionElement.h index f4dd4aa03e4..d9729c5dcde 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLOptionElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLOptionElement.h @@ -16,6 +16,8 @@ * Communications Corporation. Portions created by Netscape are * Copyright (C) 1998 Netscape Communications Corporation. All * Rights Reserved. + * + * Contributor(s): */ /* AUTO-GENERATED. DO NOT EDIT!!! */ diff --git a/mozilla/dom/src/base/nsJSWindow.cpp b/mozilla/dom/src/base/nsJSWindow.cpp index b614999ef81..0e1b8c1a7dd 100644 --- a/mozilla/dom/src/base/nsJSWindow.cpp +++ b/mozilla/dom/src/base/nsJSWindow.cpp @@ -16,6 +16,8 @@ * Communications Corporation. Portions created by Netscape are * Copyright (C) 1998 Netscape Communications Corporation. All * Rights Reserved. + * + * Contributor(s): */ /* AUTO-GENERATED. DO NOT EDIT!!! */ diff --git a/mozilla/dom/src/coreDOM/nsJSDocument.cpp b/mozilla/dom/src/coreDOM/nsJSDocument.cpp index fbacfcaa857..8bedc29bf73 100644 --- a/mozilla/dom/src/coreDOM/nsJSDocument.cpp +++ b/mozilla/dom/src/coreDOM/nsJSDocument.cpp @@ -81,7 +81,6 @@ enum Document_slots { NSDOCUMENT_HEIGHT = -5, NSDOCUMENT_STYLESHEETS = -6, NSDOCUMENT_CHARACTERSET = -7 - }; /***********************************************************************/ @@ -937,7 +936,7 @@ static JSPropertySpec DocumentProperties[] = {"height", NSDOCUMENT_HEIGHT, JSPROP_ENUMERATE | JSPROP_READONLY}, {"styleSheets", NSDOCUMENT_STYLESHEETS, JSPROP_ENUMERATE | JSPROP_READONLY}, {"characterSet", NSDOCUMENT_CHARACTERSET, JSPROP_ENUMERATE | JSPROP_READONLY}, - {0} + {0} }; diff --git a/mozilla/dom/src/html/nsJSHTMLInputElement.cpp b/mozilla/dom/src/html/nsJSHTMLInputElement.cpp index 82d1637251b..df8cdac344a 100644 --- a/mozilla/dom/src/html/nsJSHTMLInputElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLInputElement.cpp @@ -453,7 +453,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) result = b->GetControllers(&prop); if(NS_SUCCEEDED(result)) { // get the js object; n.b., this will do a release on 'prop' - nsJSUtils::nsConvertXPCObjectToJSVal(prop, nsIControllers::GetIID(), cx, obj, vp); + nsJSUtils::nsConvertXPCObjectToJSVal(prop, NS_GET_IID(nsIControllers), cx, obj, vp); NS_RELEASE(b); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLOptionElement.cpp b/mozilla/dom/src/html/nsJSHTMLOptionElement.cpp index 06b7919983c..f1d794807a0 100644 --- a/mozilla/dom/src/html/nsJSHTMLOptionElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLOptionElement.cpp @@ -16,6 +16,8 @@ * Communications Corporation. Portions created by Netscape are * Copyright (C) 1998 Netscape Communications Corporation. All * Rights Reserved. + * + * Contributor(s): */ /* AUTO-GENERATED. DO NOT EDIT!!! */ diff --git a/mozilla/dom/src/html/nsJSHTMLTextAreaElement.cpp b/mozilla/dom/src/html/nsJSHTMLTextAreaElement.cpp index 61f3a0d3c4d..cc8cbafdec1 100644 --- a/mozilla/dom/src/html/nsJSHTMLTextAreaElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTextAreaElement.cpp @@ -301,7 +301,7 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp result = b->GetControllers(&prop); if(NS_SUCCEEDED(result)) { // get the js object; n.b., this will do a release on 'prop' - nsJSUtils::nsConvertXPCObjectToJSVal(prop, nsIControllers::GetIID(), cx, obj, vp); + nsJSUtils::nsConvertXPCObjectToJSVal(prop, NS_GET_IID(nsIControllers), cx, obj, vp); NS_RELEASE(b); } else { diff --git a/mozilla/dom/tools/FileGen.cpp b/mozilla/dom/tools/FileGen.cpp index 7e691f994d2..8efbbfe090e 100644 --- a/mozilla/dom/tools/FileGen.cpp +++ b/mozilla/dom/tools/FileGen.cpp @@ -53,6 +53,8 @@ static const char *kNPLStr = \ " * Communications Corporation. Portions created by Netscape are\n" " * Copyright (C) 1998 Netscape Communications Corporation. All\n" " * Rights Reserved.\n" +" *\n" +" * Contributor(s): \n" " */\n"; static const char *kDisclaimerStr = "/* AUTO-GENERATED. DO NOT EDIT!!! */\n"; static const char *kObjTypeStr = "nsIDOM%s*";