Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 06:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 232480: Fix warnings caused by earlier patch in same bug as well as a few random other warnings.

Browse Source 
r=peterv sr=jst
This commit is contained in:
sicking%bigfoot.com 2004-02-19 22:16:16 +00:00
parent a0b34c7ff7
commit 80e7d44850
5 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
content/base/src/nsAttrAndChildArray.cpp
View File

@ -398,16 +398,16 @@ nsAttrAndChildArray::GetExistingAttrNameFromQName(const nsACString& aName) const
PRInt32
nsAttrAndChildArray::IndexOfAttr(nsIAtom* aLocalName, PRInt32 aNamespaceID) const
{
PRInt32 i;
PRInt32 idx;
if (mImpl && mImpl->mMappedAttrs) {
i = mImpl->mMappedAttrs->IndexOfAttr(aLocalName, aNamespaceID);
if (i >= 0) {
return i;
idx = mImpl->mMappedAttrs->IndexOfAttr(aLocalName, aNamespaceID);
if (idx >= 0) {
return idx;
}
}
PRInt32 mapped = MappedAttrCount();
PRUint32 i;
PRUint32 mapped = MappedAttrCount();
PRUint32 slotCount = AttrSlotCount();
if (aNamespaceID == kNameSpaceID_None) {
// This should be the common case so lets make an optimized loop

13
content/base/src/nsGenericDOMDataNode.h
View File

@ -367,19 +367,6 @@ private:
PRBool* aReturn) { \
return nsGenericDOMDataNode::IsSupported(aFeature, aVersion, aReturn); \
} \
NS_IMETHOD GetBaseURI(nsAString& aURI) { \
return nsGenericDOMDataNode::GetBaseURI(aURI); \
} \
NS_IMETHOD LookupPrefix(const nsAString& aNamespaceURI, \
nsAString& aPrefix) { \
return nsGenericDOMDataNode::LookupPrefix(aNamespaceURI, \
aPrefix); \
} \
NS_IMETHOD LookupNamespaceURI(const nsAString& aNamespacePrefix, \
nsAString& aNamespaceURI) { \
return nsGenericDOMDataNode::LookupNamespaceURI(aNamespacePrefix, \
aNamespaceURI); \
} \
NS_IMETHOD CloneNode(PRBool aDeep, nsIDOMNode** aReturn);
#endif /* nsGenericDOMDataNode_h___ */

3
content/base/src/nsGenericElement.h
View File

@ -759,8 +759,7 @@ public:
* @param aDest the destination object
* @param aDeep whether to copy children
*/
NS_IMETHOD CopyInnerTo(nsGenericContainerElement* aDest,
PRBool aDeep);
nsresult CopyInnerTo(nsGenericContainerElement* aDest, PRBool aDeep);
// Remainder of nsIContent
nsresult SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,

2
content/html/content/src/nsGenericHTMLElement.cpp
View File

@ -272,7 +272,7 @@ nsGenericHTMLElement::Shutdown()
}
nsresult
nsGenericHTMLElement::CopyInnerTo(nsGenericHTMLElement* aDst,
nsGenericHTMLElement::CopyInnerTo(nsGenericContainerElement* aDst,
PRBool aDeep)
{
nsresult rv = NS_OK;

4
content/html/content/src/nsGenericHTMLElement.h
View File

@ -97,8 +97,8 @@ public:
nsresult DOMQueryInterface(nsIDOMHTMLElement *aElement, REFNSIID aIID,
void **aInstancePtr);
// From nsGenericElement
nsresult CopyInnerTo(nsGenericHTMLElement* aDest, PRBool aDeep);
// From nsGenericContainerElement
nsresult CopyInnerTo(nsGenericContainerElement* aDest, PRBool aDeep);
// Implementation for nsIDOMNode
NS_METHOD GetNodeName(nsAString& aNodeName);