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

r=peterv sr=jst

content/base/src/nsAttrAndChildArray.cpp

@@ -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

content/base/src/nsGenericDOMDataNode.h

@@ -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___ */

content/base/src/nsGenericElement.h

@@ -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,

content/html/content/src/nsGenericHTMLElement.cpp

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

content/html/content/src/nsGenericHTMLElement.h

@@ -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);