Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing static IID's (NS_DEFINE_IID()) and replace the static IID's with NS_GET_IID(), this cleans things up and simplifies my fix for nsbeta3+ bug 7515. r=pollmann@netscape.com

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@78591 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jst%netscape.com
2000-09-09 05:46:14 +00:00
parent e1c11314d8
commit f54ba5cc66
173 changed files with 916 additions and 1349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/layout/html/content/src/nsHTMLFieldSetElement.cpp
View File

@@ -35,10 +35,6 @@
#include "nsIFormControl.h"
#include "nsISizeOfHandler.h"
static NS_DEFINE_IID(kIDOMHTMLFieldSetElementIID, NS_IDOMHTMLFIELDSETELEMENT_IID);
static NS_DEFINE_IID(kIDOMHTMLFormElementIID, NS_IDOMHTMLFORMELEMENT_IID);
static NS_DEFINE_IID(kIFormControlIID, NS_IFORMCONTROL_IID);
static NS_DEFINE_IID(kIFormIID, NS_IFORM_IID);
class nsHTMLFieldSetElement : public nsIDOMHTMLFieldSetElement,
public nsIJSScriptObject,
@@ -96,7 +92,7 @@ NS_NewHTMLFieldSetElement(nsIHTMLContent** aInstancePtrResult,
if (nsnull == it) {
return NS_ERROR_OUT_OF_MEMORY;
}
return it->QueryInterface(kIHTMLContentIID, (void**) aInstancePtrResult);
return it->QueryInterface(NS_GET_IID(nsIHTMLContent), (void**) aInstancePtrResult);
}
@@ -122,12 +118,12 @@ nsresult
nsHTMLFieldSetElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
{
NS_IMPL_HTML_CONTENT_QUERY_INTERFACE(aIID, aInstancePtr, this)
if (aIID.Equals(kIDOMHTMLFieldSetElementIID)) {
if (aIID.Equals(NS_GET_IID(nsIDOMHTMLFieldSetElement))) {
*aInstancePtr = (void*)(nsIDOMHTMLFieldSetElement*)this;
NS_ADDREF_THIS();
return NS_OK;
}
else if (aIID.Equals(kIFormControlIID)) {
else if (aIID.Equals(NS_GET_IID(nsIFormControl))) {
*aInstancePtr = (void*)(nsIFormControl*)this;
NS_ADDREF_THIS();
return NS_OK;
@@ -146,7 +142,7 @@ nsHTMLFieldSetElement::CloneNode(PRBool aDeep, nsIDOMNode** aReturn)
}
nsCOMPtr<nsIDOMNode> kungFuDeathGrip(it);
mInner.CopyInnerTo(this, &it->mInner, aDeep);
return it->QueryInterface(kIDOMNodeIID, (void**) aReturn);
return it->QueryInterface(NS_GET_IID(nsIDOMNode), (void**) aReturn);
}
// nsIContent
@@ -170,7 +166,7 @@ nsHTMLFieldSetElement::GetForm(nsIDOMHTMLFormElement** aForm)
*aForm = nsnull;
if (nsnull != mForm) {
nsIDOMHTMLFormElement* formElem = nsnull;
result = mForm->QueryInterface(kIDOMHTMLFormElementIID, (void**)&formElem);
result = mForm->QueryInterface(NS_GET_IID(nsIDOMHTMLFormElement), (void**)&formElem);
if (NS_OK == result) {
*aForm = formElem;
}
@@ -182,7 +178,7 @@ NS_IMETHODIMP
nsHTMLFieldSetElement::SetForm(nsIDOMHTMLFormElement* aForm)
{
nsCOMPtr<nsIFormControl> formControl;
nsresult result = QueryInterface(kIFormControlIID, getter_AddRefs(formControl));
nsresult result = QueryInterface(NS_GET_IID(nsIFormControl), getter_AddRefs(formControl));
if (NS_FAILED(result)) formControl = nsnull;
nsAutoString nameVal, idVal;