From 06dc1cd8e8afa49761f2a397210471734ca1b802 Mon Sep 17 00:00:00 2001 From: "sicking%bigfoot.com" Date: Wed, 2 Nov 2005 07:39:29 +0000 Subject: [PATCH] Bug 157142: get rid of txAtom typedef r=Pike rs=peterv --- content/xslt/src/base/txAtoms.cpp | 8 +++---- content/xslt/src/base/txAtoms.h | 2 +- content/xslt/src/base/txExpandedNameMap.h | 2 +- content/xslt/src/xml/txAttr.cpp | 6 ++--- content/xslt/src/xml/txDOM.h | 24 +++++++++---------- content/xslt/src/xml/txElement.cpp | 12 +++++----- content/xslt/src/xml/txNodeDefinition.cpp | 4 ++-- .../xslt/src/xml/txProcessingInstruction.cpp | 2 +- content/xslt/src/xml/txXMLUtils.cpp | 2 +- content/xslt/src/xml/txXMLUtils.h | 8 +++---- content/xslt/src/xpath/nsXPathEvaluator.cpp | 4 ++-- content/xslt/src/xpath/nsXPathEvaluator.h | 4 ++-- content/xslt/src/xpath/nsXPathExpression.cpp | 2 +- .../xslt/src/xpath/txBooleanFunctionCall.cpp | 2 +- content/xslt/src/xpath/txExpr.h | 18 +++++++------- content/xslt/src/xpath/txExprParser.cpp | 10 ++++---- content/xslt/src/xpath/txExprParser.h | 4 ++-- content/xslt/src/xpath/txForwardContext.cpp | 2 +- content/xslt/src/xpath/txFunctionCall.cpp | 2 +- content/xslt/src/xpath/txIXPathContext.h | 8 +++---- content/xslt/src/xpath/txNameTest.cpp | 4 ++-- content/xslt/src/xpath/txNodeSetContext.cpp | 2 +- .../xslt/src/xpath/txNodeSetFunctionCall.cpp | 4 ++-- content/xslt/src/xpath/txNodeTypeTest.cpp | 2 +- .../xslt/src/xpath/txNumberFunctionCall.cpp | 2 +- content/xslt/src/xpath/txSingleNodeContext.h | 2 +- .../xslt/src/xpath/txStringFunctionCall.cpp | 2 +- content/xslt/src/xpath/txVariableRefExpr.cpp | 2 +- .../xslt/src/xslt/txCurrentFunctionCall.cpp | 2 +- .../xslt/src/xslt/txDocumentFunctionCall.cpp | 2 +- .../src/xslt/txElementAvailableFnCall.cpp | 2 +- .../src/xslt/txFormatNumberFunctionCall.cpp | 2 +- .../src/xslt/txFunctionAvailableFnCall.cpp | 2 +- .../src/xslt/txGenerateIdFunctionCall.cpp | 2 +- content/xslt/src/xslt/txHTMLOutput.cpp | 4 ++-- content/xslt/src/xslt/txKeyFunctionCall.cpp | 2 +- content/xslt/src/xslt/txNodeSorter.cpp | 2 +- content/xslt/src/xslt/txNodeSorter.h | 2 +- content/xslt/src/xslt/txPatternParser.cpp | 4 ++-- .../src/xslt/txSystemPropertyFunctionCall.cpp | 2 +- content/xslt/src/xslt/txXMLOutput.cpp | 4 ++-- content/xslt/src/xslt/txXMLOutput.h | 2 +- content/xslt/src/xslt/txXSLTNumber.cpp | 4 ++-- content/xslt/src/xslt/txXSLTPatterns.h | 4 ++-- 44 files changed, 94 insertions(+), 94 deletions(-) diff --git a/content/xslt/src/base/txAtoms.cpp b/content/xslt/src/base/txAtoms.cpp index a548d7113f0b..7300ab0a96c3 100644 --- a/content/xslt/src/base/txAtoms.cpp +++ b/content/xslt/src/base/txAtoms.cpp @@ -39,16 +39,16 @@ #include "txAtoms.h" -#define TX_ATOM(_name, _value) txAtom* txXMLAtoms::_name = 0 +#define TX_ATOM(_name, _value) nsIAtom* txXMLAtoms::_name = 0 XML_ATOMS; #undef TX_ATOM -#define TX_ATOM(_name, _value) txAtom* txXPathAtoms::_name = 0 +#define TX_ATOM(_name, _value) nsIAtom* txXPathAtoms::_name = 0 #include "txXPathAtomList.h" #undef TX_ATOM -#define TX_ATOM(_name, _value) txAtom* txXSLTAtoms::_name = 0 +#define TX_ATOM(_name, _value) nsIAtom* txXSLTAtoms::_name = 0 #include "txXSLTAtomList.h" #undef TX_ATOM -#define TX_ATOM(_name, _value) txAtom* txHTMLAtoms::_name = 0 +#define TX_ATOM(_name, _value) nsIAtom* txHTMLAtoms::_name = 0 #include "txHTMLAtomList.h" #undef TX_ATOM diff --git a/content/xslt/src/base/txAtoms.h b/content/xslt/src/base/txAtoms.h index 72a7308e9ad1..8cab54670c92 100644 --- a/content/xslt/src/base/txAtoms.h +++ b/content/xslt/src/base/txAtoms.h @@ -61,7 +61,7 @@ TX_ATOM(space, "space"); \ TX_ATOM(xml, "xml"); \ TX_ATOM(xmlns, "xmlns") -#define TX_ATOM(_name, _value) static txAtom* _name +#define TX_ATOM(_name, _value) static nsIAtom* _name class txXMLAtoms { diff --git a/content/xslt/src/base/txExpandedNameMap.h b/content/xslt/src/base/txExpandedNameMap.h index 9757fce7dcac..66388b84f786 100644 --- a/content/xslt/src/base/txExpandedNameMap.h +++ b/content/xslt/src/base/txExpandedNameMap.h @@ -125,7 +125,7 @@ public: private: struct MapItem { PRInt32 mNamespaceID; - txAtom* mLocalName; + nsIAtom* mLocalName; TxObject* mValue; }; diff --git a/content/xslt/src/xml/txAttr.cpp b/content/xslt/src/xml/txAttr.cpp index ef814ea7b36e..1adca9e19348 100644 --- a/content/xslt/src/xml/txAttr.cpp +++ b/content/xslt/src/xml/txAttr.cpp @@ -49,7 +49,7 @@ Attr::Attr(const nsAString& name, Document* owner): // namespace handling has to be handled late, the attribute must // be added to the tree to resolve the prefix, unless it's // xmlns or xml, try to do that here - txAtom* prefixAtom = TX_GET_ATOM(Substring(nodeName, 0, idx)); + nsIAtom* prefixAtom = TX_GET_ATOM(Substring(nodeName, 0, idx)); if (prefixAtom == txXMLAtoms::xmlns) mNamespaceID = kNameSpaceID_XMLNS; else if (prefixAtom == txXMLAtoms::xml) @@ -104,7 +104,7 @@ Node* Attr::appendChild(Node* newChild) // //Return the attributes local (unprefixed) name atom. // -MBool Attr::getLocalName(txAtom** aLocalName) +MBool Attr::getLocalName(nsIAtom** aLocalName) { if (!aLocalName) return MB_FALSE; @@ -126,7 +126,7 @@ PRInt32 Attr::getNamespaceID() mNamespaceID = kNameSpaceID_None; PRInt32 idx = nodeName.FindChar(':'); if (idx != kNotFound) { - nsCOMPtr prefixAtom = TX_GET_ATOM(Substring(nodeName, 0, idx)); + nsCOMPtr prefixAtom = TX_GET_ATOM(Substring(nodeName, 0, idx)); mNamespaceID = lookupNamespaceID(prefixAtom); } return mNamespaceID; diff --git a/content/xslt/src/xml/txDOM.h b/content/xslt/src/xml/txDOM.h index 8313a7f24bdb..3c68d2a68cf2 100644 --- a/content/xslt/src/xml/txDOM.h +++ b/content/xslt/src/xml/txDOM.h @@ -115,9 +115,9 @@ class Node : public TxObject virtual nsresult getNamespaceURI(nsAString& aNSURI) = 0; //txXPathNode functions - virtual MBool getLocalName(txAtom** aLocalName) = 0; + virtual MBool getLocalName(nsIAtom** aLocalName) = 0; virtual PRInt32 getNamespaceID() = 0; - virtual PRInt32 lookupNamespaceID(txAtom* aPrefix) = 0; + virtual PRInt32 lookupNamespaceID(nsIAtom* aPrefix) = 0; virtual Node* getXPathParent() = 0; virtual PRInt32 compareDocumentPosition(Node* aOther) = 0; }; @@ -249,9 +249,9 @@ class NodeDefinition : public Node, public NodeList nsresult getNamespaceURI(nsAString& aNSURI); //txXPathNode functions - virtual MBool getLocalName(txAtom** aLocalName); + virtual MBool getLocalName(nsIAtom** aLocalName); virtual PRInt32 getNamespaceID(); - virtual PRInt32 lookupNamespaceID(txAtom*); + virtual PRInt32 lookupNamespaceID(nsIAtom*); virtual Node* getXPathParent(); virtual PRInt32 compareDocumentPosition(Node* aOther); @@ -419,10 +419,10 @@ class Element : public NodeDefinition Node* appendChild(Node* newChild); //txXPathNode functions override - MBool getLocalName(txAtom** aLocalName); + MBool getLocalName(nsIAtom** aLocalName); PRInt32 getNamespaceID(); - MBool getAttr(txAtom* aLocalName, PRInt32 aNSID, nsAString& aValue); - MBool hasAttr(txAtom* aLocalName, PRInt32 aNSID); + MBool getAttr(nsIAtom* aLocalName, PRInt32 aNSID, nsAString& aValue); + MBool hasAttr(nsIAtom* aLocalName, PRInt32 aNSID); private: friend class Document; @@ -431,7 +431,7 @@ class Element : public NodeDefinition Document* aOwner); AttrMap mAttributes; - txAtom* mLocalName; + nsIAtom* mLocalName; PRInt32 mNamespaceID; }; @@ -454,7 +454,7 @@ class Attr : public NodeDefinition Node* appendChild(Node* newChild); //txXPathNode functions override - MBool getLocalName(txAtom** aLocalName); + MBool getLocalName(nsIAtom** aLocalName); PRInt32 getNamespaceID(); Node* getXPathParent(); @@ -470,7 +470,7 @@ class Attr : public NodeDefinition Element* ownerElement; - txAtom* mLocalName; + nsIAtom* mLocalName; PRInt32 mNamespaceID; }; @@ -488,14 +488,14 @@ class ProcessingInstruction : public NodeDefinition ~ProcessingInstruction(); //txXPathNode functions override - MBool getLocalName(txAtom** aLocalName); + MBool getLocalName(nsIAtom** aLocalName); private: friend class Document; ProcessingInstruction(const nsAString& theTarget, const nsAString& theData, Document* owner); - txAtom* mLocalName; + nsIAtom* mLocalName; }; class txNamespaceManager diff --git a/content/xslt/src/xml/txElement.cpp b/content/xslt/src/xml/txElement.cpp index 8e2eae4bd5d6..0309183a644f 100644 --- a/content/xslt/src/xml/txElement.cpp +++ b/content/xslt/src/xml/txElement.cpp @@ -99,7 +99,7 @@ Node* Element::appendChild(Node* newChild) // //Return the elements local (unprefixed) name. // -MBool Element::getLocalName(txAtom** aLocalName) +MBool Element::getLocalName(nsIAtom** aLocalName) { if (!aLocalName) return MB_FALSE; @@ -182,7 +182,7 @@ void Element::setAttributeNS(const nsAString& aNamespaceURI, AttrMap::ListItem* item = mAttributes.firstItem; while (item) { foundNode = (Attr*)item->node; - txAtom* attrName; + nsIAtom* attrName; if (foundNode->getLocalName(&attrName) && namespaceID == foundNode->getNamespaceID() && localName == attrName) { @@ -219,14 +219,14 @@ Attr* Element::getAttributeNode(const nsAString& name) // exists, and sets aValue to the value of the attribute. // Return false, if the attribute does not exist. // -MBool Element::getAttr(txAtom* aLocalName, PRInt32 aNSID, +MBool Element::getAttr(nsIAtom* aLocalName, PRInt32 aNSID, nsAString& aValue) { aValue.Truncate(); AttrMap::ListItem* item = mAttributes.firstItem; while (item) { Attr* attrNode = (Attr*)item->node; - txAtom* localName; + nsIAtom* localName; if (attrNode->getLocalName(&localName) && aNSID == attrNode->getNamespaceID() && aLocalName == localName) { @@ -244,12 +244,12 @@ MBool Element::getAttr(txAtom* aLocalName, PRInt32 aNSID, // Return true if the attribute specified by localname and nsID // exists. Return false otherwise. // -MBool Element::hasAttr(txAtom* aLocalName, PRInt32 aNSID) +MBool Element::hasAttr(nsIAtom* aLocalName, PRInt32 aNSID) { AttrMap::ListItem* item = mAttributes.firstItem; while (item) { Attr* attrNode = (Attr*)item->node; - txAtom* localName; + nsIAtom* localName; if (attrNode->getLocalName(&localName) && aNSID == attrNode->getNamespaceID() && aLocalName == localName) { diff --git a/content/xslt/src/xml/txNodeDefinition.cpp b/content/xslt/src/xml/txNodeDefinition.cpp index 4793aebe47ca..3b0cb9fa3ce5 100644 --- a/content/xslt/src/xml/txNodeDefinition.cpp +++ b/content/xslt/src/xml/txNodeDefinition.cpp @@ -266,7 +266,7 @@ MBool NodeDefinition::hasChildNodes() const return MB_FALSE; } -MBool NodeDefinition::getLocalName(txAtom** aLocalName) +MBool NodeDefinition::getLocalName(nsIAtom** aLocalName) { if (!aLocalName) return MB_FALSE; @@ -290,7 +290,7 @@ PRInt32 NodeDefinition::getNamespaceID() // // @return namespace associated with prefix // -PRInt32 NodeDefinition::lookupNamespaceID(txAtom* aPrefix) +PRInt32 NodeDefinition::lookupNamespaceID(nsIAtom* aPrefix) { // this is http://www.w3.org/2000/xmlns/, // ID = kNameSpaceID_XMLNS, see txNamespaceManager::Init diff --git a/content/xslt/src/xml/txProcessingInstruction.cpp b/content/xslt/src/xml/txProcessingInstruction.cpp index c60fc2627d70..b499034a3280 100644 --- a/content/xslt/src/xml/txProcessingInstruction.cpp +++ b/content/xslt/src/xml/txProcessingInstruction.cpp @@ -57,7 +57,7 @@ ProcessingInstruction::~ProcessingInstruction() //from all child manipulation functions. // -MBool ProcessingInstruction::getLocalName(txAtom** aLocalName) +MBool ProcessingInstruction::getLocalName(nsIAtom** aLocalName) { if (!aLocalName) return MB_FALSE; diff --git a/content/xslt/src/xml/txXMLUtils.cpp b/content/xslt/src/xml/txXMLUtils.cpp index b0a99ec4a44e..94ce2c219654 100644 --- a/content/xslt/src/xml/txXMLUtils.cpp +++ b/content/xslt/src/xml/txXMLUtils.cpp @@ -210,7 +210,7 @@ MBool XMLUtils::getXMLSpacePreserve(Node* aNode) if (parent->getNodeType() == Node::ELEMENT_NODE) { Element* elem = (Element*)parent; if (elem->getAttr(txXMLAtoms::space, kNameSpaceID_XML, value)) { - txAtom* val = TX_GET_ATOM(value); + nsIAtom* val = TX_GET_ATOM(value); if (val == txXMLAtoms::preserve) { TX_IF_RELEASE_ATOM(val); return MB_TRUE; diff --git a/content/xslt/src/xml/txXMLUtils.h b/content/xslt/src/xml/txXMLUtils.h index 454fb91bbb46..5a4804d7f361 100644 --- a/content/xslt/src/xml/txXMLUtils.h +++ b/content/xslt/src/xml/txXMLUtils.h @@ -43,8 +43,8 @@ public: } txExpandedName(PRInt32 aNsID, - txAtom* aLocalName) : mNamespaceID(aNsID), - mLocalName(aLocalName) + nsIAtom* aLocalName) : mNamespaceID(aNsID), + mLocalName(aLocalName) { } @@ -87,9 +87,9 @@ class XMLUtils { public: - static void getPrefix(const nsAString& src, txAtom** dest); + static void getPrefix(const nsAString& src, nsIAtom** dest); static const nsDependentSubstring getLocalPart(const nsAString& src); - static void getLocalPart(const nsAString& src, txAtom** dest); + static void getLocalPart(const nsAString& src, nsIAtom** dest); /** * Returns true if the given string is a valid XML QName diff --git a/content/xslt/src/xpath/nsXPathEvaluator.cpp b/content/xslt/src/xpath/nsXPathEvaluator.cpp index 9f6971115275..4c9d31025c53 100644 --- a/content/xslt/src/xpath/nsXPathEvaluator.cpp +++ b/content/xslt/src/xpath/nsXPathEvaluator.cpp @@ -129,7 +129,7 @@ nsXPathEvaluator::Evaluate(const nsAString & aExpression, */ nsresult nsXPathEvaluator::ParseContextImpl::resolveNamespacePrefix - (txAtom* aPrefix, PRInt32& aID) + (nsIAtom* aPrefix, PRInt32& aID) { nsAutoString prefix; if (aPrefix) { @@ -155,7 +155,7 @@ nsresult nsXPathEvaluator::ParseContextImpl::resolveNamespacePrefix return gTxNameSpaceManager->RegisterNameSpace(ns, aID); } -nsresult nsXPathEvaluator::ParseContextImpl::resolveFunctionCall(txAtom* aName, +nsresult nsXPathEvaluator::ParseContextImpl::resolveFunctionCall(nsIAtom* aName, PRInt32 aID, FunctionCall*& aFn) { diff --git a/content/xslt/src/xpath/nsXPathEvaluator.h b/content/xslt/src/xpath/nsXPathEvaluator.h index 12003de5b849..682ab0d4d35c 100644 --- a/content/xslt/src/xpath/nsXPathEvaluator.h +++ b/content/xslt/src/xpath/nsXPathEvaluator.h @@ -77,8 +77,8 @@ private: return mLastError; } - nsresult resolveNamespacePrefix(txAtom* aPrefix, PRInt32& aID); - nsresult resolveFunctionCall(txAtom* aName, PRInt32 aID, + nsresult resolveNamespacePrefix(nsIAtom* aPrefix, PRInt32& aID); + nsresult resolveFunctionCall(nsIAtom* aName, PRInt32 aID, FunctionCall*& aFunction); void receiveError(const nsAString& aMsg, nsresult aRes); diff --git a/content/xslt/src/xpath/nsXPathExpression.cpp b/content/xslt/src/xpath/nsXPathExpression.cpp index 98ccfd05b6e3..51f436a1f043 100644 --- a/content/xslt/src/xpath/nsXPathExpression.cpp +++ b/content/xslt/src/xpath/nsXPathExpression.cpp @@ -166,7 +166,7 @@ nsXPathExpression::Evaluate(nsIDOMNode *aContextNode, */ nsresult nsXPathExpression::EvalContextImpl::getVariable(PRInt32 aNamespace, - txAtom* aLName, + nsIAtom* aLName, ExprResult*& aResult) { aResult = 0; diff --git a/content/xslt/src/xpath/txBooleanFunctionCall.cpp b/content/xslt/src/xpath/txBooleanFunctionCall.cpp index 3868561cefdc..b6a82a11256a 100644 --- a/content/xslt/src/xpath/txBooleanFunctionCall.cpp +++ b/content/xslt/src/xpath/txBooleanFunctionCall.cpp @@ -120,7 +120,7 @@ ExprResult* BooleanFunctionCall::evaluate(txIEvalContext* aContext) return new StringResult(NS_LITERAL_STRING("error")); } -nsresult BooleanFunctionCall::getNameAtom(txAtom** aAtom) +nsresult BooleanFunctionCall::getNameAtom(nsIAtom** aAtom) { switch (mType) { case TX_BOOLEAN: diff --git a/content/xslt/src/xpath/txExpr.h b/content/xslt/src/xpath/txExpr.h index 593807bb0fe8..6af1886bceda 100644 --- a/content/xslt/src/xpath/txExpr.h +++ b/content/xslt/src/xpath/txExpr.h @@ -97,7 +97,7 @@ public: #define TX_DECL_FUNCTION \ TX_DECL_EVALUATE; \ - nsresult getNameAtom(txAtom** aAtom) + nsresult getNameAtom(nsIAtom** aAtom) /** * This class represents a FunctionCall as defined by the XPath 1.0 @@ -164,7 +164,7 @@ protected: /* * Returns the name of the function as an atom. */ - virtual nsresult getNameAtom(txAtom** aAtom) = 0; + virtual nsresult getNameAtom(nsIAtom** aAtom) = 0; }; //-- FunctionCall @@ -224,7 +224,7 @@ public: * Creates a new txNameTest with the given type and the given * principal node type */ - txNameTest(txAtom* aPrefix, txAtom* aLocalName, PRInt32 aNSID, + txNameTest(nsIAtom* aPrefix, nsIAtom* aLocalName, PRInt32 aNSID, Node::NodeType aNodeType); ~txNameTest(); @@ -232,8 +232,8 @@ public: TX_DECL_NODE_TEST; private: - txAtom* mPrefix; - txAtom* mLocalName; + nsIAtom* mPrefix; + nsIAtom* mLocalName; PRInt32 mNamespace; Node::NodeType mNodeType; }; @@ -267,7 +267,7 @@ public: private: NodeType mNodeType; - txAtom* mNodeName; + nsIAtom* mNodeName; }; /** @@ -554,14 +554,14 @@ class VariableRefExpr : public Expr { public: - VariableRefExpr(txAtom* aPrefix, txAtom* aLocalName, PRInt32 aNSID); + VariableRefExpr(nsIAtom* aPrefix, nsIAtom* aLocalName, PRInt32 aNSID); ~VariableRefExpr(); TX_DECL_EXPR; private: - txAtom* mPrefix; - txAtom* mLocalName; + nsIAtom* mPrefix; + nsIAtom* mLocalName; PRInt32 mNamespace; }; diff --git a/content/xslt/src/xpath/txExprParser.cpp b/content/xslt/src/xpath/txExprParser.cpp index 73bfec2e325f..7a848de88a36 100644 --- a/content/xslt/src/xpath/txExprParser.cpp +++ b/content/xslt/src/xpath/txExprParser.cpp @@ -326,7 +326,7 @@ Expr* ExprParser::createFilterExpr(ExprLexer& lexer, txIParseContext* aContext) break; case Token::VAR_REFERENCE : { - txAtom *prefix, *lName; + nsIAtom *prefix, *lName; PRInt32 nspace; nsresult rv = resolveQName(tok->value, prefix, aContext, lName, nspace); @@ -490,7 +490,7 @@ Expr* ExprParser::createFunctionCall(ExprLexer& lexer, fnCall = new NumberFunctionCall(NumberFunctionCall::FLOOR); } else { - txAtom *prefix, *lName; + nsIAtom *prefix, *lName; PRInt32 namespaceID; rv = resolveQName(tok->value, prefix, aContext, lName, namespaceID); if (NS_FAILED(rv)) { @@ -640,7 +640,7 @@ LocationStep* ExprParser::createLocationStep(ExprLexer& lexer, case Token::CNAME : { // resolve QName - txAtom *prefix, *lName; + nsIAtom *prefix, *lName; PRInt32 nspace; nsresult rv = resolveQName(tok->value, prefix, aContext, lName, nspace); @@ -1013,8 +1013,8 @@ short ExprParser::precedenceLevel(short tokenType) { } nsresult ExprParser::resolveQName(const nsAString& aQName, - txAtom*& aPrefix, txIParseContext* aContext, - txAtom*& aLocalName, PRInt32& aNamespace) + nsIAtom*& aPrefix, txIParseContext* aContext, + nsIAtom*& aLocalName, PRInt32& aNamespace) { aNamespace = kNameSpaceID_None; PRInt32 idx = aQName.FindChar(':'); diff --git a/content/xslt/src/xpath/txExprParser.h b/content/xslt/src/xpath/txExprParser.h index 4715c95e02cb..1986c290e5bb 100644 --- a/content/xslt/src/xpath/txExprParser.h +++ b/content/xslt/src/xpath/txExprParser.h @@ -82,9 +82,9 @@ protected: * Resolve a QName, given the mContext parse context. * Returns prefix and localName as well as namespace ID **/ - static nsresult resolveQName(const nsAString& aQName, txAtom*& aPrefix, + static nsresult resolveQName(const nsAString& aQName, nsIAtom*& aPrefix, txIParseContext* aContext, - txAtom*& aLocalName, PRInt32& aNamespace); + nsIAtom*& aLocalName, PRInt32& aNamespace); /** * Using the given lexer, parses the tokens if they represent a diff --git a/content/xslt/src/xpath/txForwardContext.cpp b/content/xslt/src/xpath/txForwardContext.cpp index 8f6029ecbee2..b16e4c5f5e12 100644 --- a/content/xslt/src/xpath/txForwardContext.cpp +++ b/content/xslt/src/xpath/txForwardContext.cpp @@ -56,7 +56,7 @@ PRUint32 txForwardContext::position() return (PRUint32)(pos+1); } -nsresult txForwardContext::getVariable(PRInt32 aNamespace, txAtom* aLName, +nsresult txForwardContext::getVariable(PRInt32 aNamespace, nsIAtom* aLName, ExprResult*& aResult) { NS_ASSERTION(mInner, "mInner is null!!!"); diff --git a/content/xslt/src/xpath/txFunctionCall.cpp b/content/xslt/src/xpath/txFunctionCall.cpp index 6210705fdea6..62be1fcd8c3d 100644 --- a/content/xslt/src/xpath/txFunctionCall.cpp +++ b/content/xslt/src/xpath/txFunctionCall.cpp @@ -176,7 +176,7 @@ MBool FunctionCall::requireParams(int paramCountMin, txIEvalContext* aContext) **/ void FunctionCall::toString(nsAString& aDest) { - txAtom* functionNameAtom = 0; + nsIAtom* functionNameAtom = 0; nsAutoString functionName; if (!NS_SUCCEEDED(getNameAtom(&functionNameAtom)) || !TX_GET_ATOM_STRING(functionNameAtom, functionName)) { diff --git a/content/xslt/src/xpath/txIXPathContext.h b/content/xslt/src/xpath/txIXPathContext.h index 5133e06ec28e..f3e2474c2b6a 100644 --- a/content/xslt/src/xpath/txIXPathContext.h +++ b/content/xslt/src/xpath/txIXPathContext.h @@ -66,13 +66,13 @@ public: /* * Return a namespaceID for a given prefix. */ - virtual nsresult resolveNamespacePrefix(txAtom* aPrefix, PRInt32& aID) = 0; + virtual nsresult resolveNamespacePrefix(nsIAtom* aPrefix, PRInt32& aID) = 0; /* * Create a FunctionCall, needed for extension function calls and * XSLT. XPath function calls are resolved by the Parser. */ - virtual nsresult resolveFunctionCall(txAtom* aName, PRInt32 aID, + virtual nsresult resolveFunctionCall(nsIAtom* aName, PRInt32 aID, FunctionCall*& aFunction) = 0; /* @@ -101,7 +101,7 @@ public: * Return the ExprResult associated with the variable with the * given namespace and local name. */ - virtual nsresult getVariable(PRInt32 aNamespace, txAtom* aLName, + virtual nsresult getVariable(PRInt32 aNamespace, nsIAtom* aLName, ExprResult*& aResult) = 0; /* @@ -117,7 +117,7 @@ public: }; #define TX_DECL_MATCH_CONTEXT \ - nsresult getVariable(PRInt32 aNamespace, txAtom* aLName, \ + nsresult getVariable(PRInt32 aNamespace, nsIAtom* aLName, \ ExprResult*& aResult); \ MBool isStripSpaceAllowed(Node* aNode); \ void receiveError(const nsAString& aMsg, nsresult aRes) diff --git a/content/xslt/src/xpath/txNameTest.cpp b/content/xslt/src/xpath/txNameTest.cpp index 978767940c88..44a8193011d7 100644 --- a/content/xslt/src/xpath/txNameTest.cpp +++ b/content/xslt/src/xpath/txNameTest.cpp @@ -27,7 +27,7 @@ #include "txAtoms.h" #include "txIXPathContext.h" -txNameTest::txNameTest(txAtom* aPrefix, txAtom* aLocalName, PRInt32 aNSID, +txNameTest::txNameTest(nsIAtom* aPrefix, nsIAtom* aLocalName, PRInt32 aNSID, Node::NodeType aNodeType) :mPrefix(aPrefix), mLocalName(aLocalName), mNamespace(aNSID), mNodeType(aNodeType) @@ -66,7 +66,7 @@ MBool txNameTest::matches(Node* aNode, txIMatchContext* aContext) return MB_TRUE; // Compare local-names - txAtom* localName; + nsIAtom* localName; aNode->getLocalName(&localName); MBool result = localName == mLocalName; TX_IF_RELEASE_ATOM(localName); diff --git a/content/xslt/src/xpath/txNodeSetContext.cpp b/content/xslt/src/xpath/txNodeSetContext.cpp index a4b42ac22ae6..e28eedc4a7ae 100644 --- a/content/xslt/src/xpath/txNodeSetContext.cpp +++ b/content/xslt/src/xpath/txNodeSetContext.cpp @@ -55,7 +55,7 @@ PRUint32 txNodeSetContext::position() return mPosition; } -nsresult txNodeSetContext::getVariable(PRInt32 aNamespace, txAtom* aLName, +nsresult txNodeSetContext::getVariable(PRInt32 aNamespace, nsIAtom* aLName, ExprResult*& aResult) { NS_ASSERTION(mInner, "mInner is null!!!"); diff --git a/content/xslt/src/xpath/txNodeSetFunctionCall.cpp b/content/xslt/src/xpath/txNodeSetFunctionCall.cpp index b4b359e28267..1c693a32ba5c 100644 --- a/content/xslt/src/xpath/txNodeSetFunctionCall.cpp +++ b/content/xslt/src/xpath/txNodeSetFunctionCall.cpp @@ -161,7 +161,7 @@ ExprResult* NodeSetFunctionCall::evaluate(txIEvalContext* aContext) { case LOCAL_NAME: { nsAutoString localName; - txAtom* localNameAtom; + nsIAtom* localNameAtom; node->getLocalName(&localNameAtom); if (localNameAtom) { // Node has a localName @@ -220,7 +220,7 @@ ExprResult* NodeSetFunctionCall::evaluate(txIEvalContext* aContext) { return new StringResult(NS_LITERAL_STRING("error")); } -nsresult NodeSetFunctionCall::getNameAtom(txAtom** aAtom) +nsresult NodeSetFunctionCall::getNameAtom(nsIAtom** aAtom) { switch (mType) { case COUNT: diff --git a/content/xslt/src/xpath/txNodeTypeTest.cpp b/content/xslt/src/xpath/txNodeTypeTest.cpp index f29055383f60..7ff1f4b98425 100644 --- a/content/xslt/src/xpath/txNodeTypeTest.cpp +++ b/content/xslt/src/xpath/txNodeTypeTest.cpp @@ -64,7 +64,7 @@ MBool txNodeTypeTest::matches(Node* aNode, txIMatchContext* aContext) !aContext->isStripSpaceAllowed(aNode); case PI_TYPE: if (type == Node::PROCESSING_INSTRUCTION_NODE) { - txAtom* localName = 0; + nsIAtom* localName = 0; MBool result; result = !mNodeName || (aNode->getLocalName(&localName) && diff --git a/content/xslt/src/xpath/txNumberFunctionCall.cpp b/content/xslt/src/xpath/txNumberFunctionCall.cpp index 8f8b0f088d93..d229ecf5480c 100644 --- a/content/xslt/src/xpath/txNumberFunctionCall.cpp +++ b/content/xslt/src/xpath/txNumberFunctionCall.cpp @@ -138,7 +138,7 @@ ExprResult* NumberFunctionCall::evaluate(txIEvalContext* aContext) return new StringResult(NS_LITERAL_STRING("error")); } -nsresult NumberFunctionCall::getNameAtom(txAtom** aAtom) +nsresult NumberFunctionCall::getNameAtom(nsIAtom** aAtom) { switch (mType) { case NUMBER: diff --git a/content/xslt/src/xpath/txSingleNodeContext.h b/content/xslt/src/xpath/txSingleNodeContext.h index 9442dfa0c2ad..8fca6b210545 100644 --- a/content/xslt/src/xpath/txSingleNodeContext.h +++ b/content/xslt/src/xpath/txSingleNodeContext.h @@ -53,7 +53,7 @@ public: ~txSingleNodeContext() {} - nsresult getVariable(PRInt32 aNamespace, txAtom* aLName, + nsresult getVariable(PRInt32 aNamespace, nsIAtom* aLName, ExprResult*& aResult) { NS_ASSERTION(mInner, "mInner is null!!!"); diff --git a/content/xslt/src/xpath/txStringFunctionCall.cpp b/content/xslt/src/xpath/txStringFunctionCall.cpp index 5bd85dcaac9e..15783de60bce 100644 --- a/content/xslt/src/xpath/txStringFunctionCall.cpp +++ b/content/xslt/src/xpath/txStringFunctionCall.cpp @@ -251,7 +251,7 @@ ExprResult* StringFunctionCall::evaluate(txIEvalContext* aContext) return new StringResult(NS_LITERAL_STRING("error")); } -nsresult StringFunctionCall::getNameAtom(txAtom** aAtom) +nsresult StringFunctionCall::getNameAtom(nsIAtom** aAtom) { switch (mType) { case CONCAT: diff --git a/content/xslt/src/xpath/txVariableRefExpr.cpp b/content/xslt/src/xpath/txVariableRefExpr.cpp index 63dbecc73f5a..077998aafb69 100644 --- a/content/xslt/src/xpath/txVariableRefExpr.cpp +++ b/content/xslt/src/xpath/txVariableRefExpr.cpp @@ -35,7 +35,7 @@ /** * Creates a VariableRefExpr with the given variable name **/ -VariableRefExpr::VariableRefExpr(txAtom* aPrefix, txAtom* aLocalName, +VariableRefExpr::VariableRefExpr(nsIAtom* aPrefix, nsIAtom* aLocalName, PRInt32 aNSID) : mPrefix(aPrefix), mLocalName(aLocalName), mNamespace(aNSID) { diff --git a/content/xslt/src/xslt/txCurrentFunctionCall.cpp b/content/xslt/src/xslt/txCurrentFunctionCall.cpp index f7416d8e2362..9e0ce71a5dc9 100644 --- a/content/xslt/src/xslt/txCurrentFunctionCall.cpp +++ b/content/xslt/src/xslt/txCurrentFunctionCall.cpp @@ -25,7 +25,7 @@ ExprResult* CurrentFunctionCall::evaluate(txIEvalContext* aContext) return new NodeSet(mPs->getEvalContext()->getContextNode()); } -nsresult CurrentFunctionCall::getNameAtom(txAtom** aAtom) +nsresult CurrentFunctionCall::getNameAtom(nsIAtom** aAtom) { *aAtom = txXSLTAtoms::current; TX_ADDREF_ATOM(*aAtom); diff --git a/content/xslt/src/xslt/txDocumentFunctionCall.cpp b/content/xslt/src/xslt/txDocumentFunctionCall.cpp index dc08884bdfd7..6418abf6dc86 100644 --- a/content/xslt/src/xslt/txDocumentFunctionCall.cpp +++ b/content/xslt/src/xslt/txDocumentFunctionCall.cpp @@ -128,7 +128,7 @@ ExprResult* DocumentFunctionCall::evaluate(txIEvalContext* aContext) return nodeSet; } -nsresult DocumentFunctionCall::getNameAtom(txAtom** aAtom) +nsresult DocumentFunctionCall::getNameAtom(nsIAtom** aAtom) { *aAtom = txXSLTAtoms::document; TX_ADDREF_ATOM(*aAtom); diff --git a/content/xslt/src/xslt/txElementAvailableFnCall.cpp b/content/xslt/src/xslt/txElementAvailableFnCall.cpp index 2c7fe968e053..ae117f9786a9 100644 --- a/content/xslt/src/xslt/txElementAvailableFnCall.cpp +++ b/content/xslt/src/xslt/txElementAvailableFnCall.cpp @@ -133,7 +133,7 @@ ExprResult* ElementAvailableFunctionCall::evaluate(txIEvalContext* aContext) return result; } -nsresult ElementAvailableFunctionCall::getNameAtom(txAtom** aAtom) +nsresult ElementAvailableFunctionCall::getNameAtom(nsIAtom** aAtom) { *aAtom = txXSLTAtoms::elementAvailable; TX_ADDREF_ATOM(*aAtom); diff --git a/content/xslt/src/xslt/txFormatNumberFunctionCall.cpp b/content/xslt/src/xslt/txFormatNumberFunctionCall.cpp index ae515e2f0836..b280d9a86804 100644 --- a/content/xslt/src/xslt/txFormatNumberFunctionCall.cpp +++ b/content/xslt/src/xslt/txFormatNumberFunctionCall.cpp @@ -476,7 +476,7 @@ ExprResult* txFormatNumberFunctionCall::evaluate(txIEvalContext* aContext) return new StringResult(res); } //-- evaluate -nsresult txFormatNumberFunctionCall::getNameAtom(txAtom** aAtom) +nsresult txFormatNumberFunctionCall::getNameAtom(nsIAtom** aAtom) { *aAtom = txXSLTAtoms::formatNumber; TX_ADDREF_ATOM(*aAtom); diff --git a/content/xslt/src/xslt/txFunctionAvailableFnCall.cpp b/content/xslt/src/xslt/txFunctionAvailableFnCall.cpp index 7776d0b72f0f..a40822d547b5 100644 --- a/content/xslt/src/xslt/txFunctionAvailableFnCall.cpp +++ b/content/xslt/src/xslt/txFunctionAvailableFnCall.cpp @@ -132,7 +132,7 @@ ExprResult* FunctionAvailableFunctionCall::evaluate(txIEvalContext* aContext) return result; } -nsresult FunctionAvailableFunctionCall::getNameAtom(txAtom** aAtom) +nsresult FunctionAvailableFunctionCall::getNameAtom(nsIAtom** aAtom) { *aAtom = txXSLTAtoms::functionAvailable; TX_ADDREF_ATOM(*aAtom); diff --git a/content/xslt/src/xslt/txGenerateIdFunctionCall.cpp b/content/xslt/src/xslt/txGenerateIdFunctionCall.cpp index 68bd0b3344d3..5e66b8851cf0 100644 --- a/content/xslt/src/xslt/txGenerateIdFunctionCall.cpp +++ b/content/xslt/src/xslt/txGenerateIdFunctionCall.cpp @@ -101,7 +101,7 @@ ExprResult* GenerateIdFunctionCall::evaluate(txIEvalContext* aContext) return new StringResult(NS_ConvertASCIItoUCS2(buf)); } -nsresult GenerateIdFunctionCall::getNameAtom(txAtom** aAtom) +nsresult GenerateIdFunctionCall::getNameAtom(nsIAtom** aAtom) { *aAtom = txXSLTAtoms::generateId; TX_ADDREF_ATOM(*aAtom); diff --git a/content/xslt/src/xslt/txHTMLOutput.cpp b/content/xslt/src/xslt/txHTMLOutput.cpp index 698be94c330d..b606644f0a24 100644 --- a/content/xslt/src/xslt/txHTMLOutput.cpp +++ b/content/xslt/src/xslt/txHTMLOutput.cpp @@ -216,7 +216,7 @@ void txHTMLOutput::attribute(const nsAString& aName, localPart.Equals(aValue, txCaseInsensitiveStringComparator())) { txListIterator iter(&mAttributes); txAttribute* setAtt = 0; - txAtom* localName = TX_GET_ATOM(localPart); + nsIAtom* localName = TX_GET_ATOM(localPart); txExpandedName att(aNsID, localName); while ((setAtt = (txAttribute*)iter.next())) { if (setAtt->mName == att) { @@ -304,7 +304,7 @@ void txHTMLOutput::startElement(const nsAString& aName, { txXMLOutput::startElement(aName, aNsID); - txAtom* localAtom; + nsIAtom* localAtom; if (aNsID == kNameSpaceID_None) { nsAutoString localName; TX_ToLowerCase(aName, localName); diff --git a/content/xslt/src/xslt/txKeyFunctionCall.cpp b/content/xslt/src/xslt/txKeyFunctionCall.cpp index e0091bfd5c9e..4c6cc880183f 100644 --- a/content/xslt/src/xslt/txKeyFunctionCall.cpp +++ b/content/xslt/src/xslt/txKeyFunctionCall.cpp @@ -106,7 +106,7 @@ ExprResult* txKeyFunctionCall::evaluate(txIEvalContext* aContext) } // evaluate -nsresult txKeyFunctionCall::getNameAtom(txAtom** aAtom) +nsresult txKeyFunctionCall::getNameAtom(nsIAtom** aAtom) { *aAtom = txXSLTAtoms::key; TX_ADDREF_ATOM(*aAtom); diff --git a/content/xslt/src/xslt/txNodeSorter.cpp b/content/xslt/src/xslt/txNodeSorter.cpp index 568431dab2bb..a1975af9a372 100644 --- a/content/xslt/src/xslt/txNodeSorter.cpp +++ b/content/xslt/src/xslt/txNodeSorter.cpp @@ -264,7 +264,7 @@ int txNodeSorter::compareNodes(SortableNode* aSNode1, } MBool txNodeSorter::getAttrAsAVT(Element* aSortElement, - txAtom* aAttrName, + nsIAtom* aAttrName, nsAString& aResult) { aResult.Truncate(); diff --git a/content/xslt/src/xslt/txNodeSorter.h b/content/xslt/src/xslt/txNodeSorter.h index 4e451d29106a..2b1ca5eeec7e 100644 --- a/content/xslt/src/xslt/txNodeSorter.h +++ b/content/xslt/src/xslt/txNodeSorter.h @@ -85,7 +85,7 @@ private: NodeSet* aNodes); MBool getAttrAsAVT(Element* aSortElement, - txAtom* aAttrName, + nsIAtom* aAttrName, nsAString& aResult); txList mSortKeys; diff --git a/content/xslt/src/xslt/txPatternParser.cpp b/content/xslt/src/xslt/txPatternParser.cpp index 12005f3e3696..5828e956e319 100644 --- a/content/xslt/src/xslt/txPatternParser.cpp +++ b/content/xslt/src/xslt/txPatternParser.cpp @@ -262,7 +262,7 @@ nsresult txPatternParser::createKeyPattern(ExprLexer& aLexer, if (!XMLUtils::isValidQName(key)) return NS_ERROR_XPATH_PARSE_FAILED; - txAtom *prefix = 0, *localName = 0; + nsIAtom *prefix = 0, *localName = 0; PRInt32 namespaceID; nsresult rv = resolveQName(key, prefix, aContext, localName, namespaceID); if (NS_FAILED(rv)) @@ -302,7 +302,7 @@ nsresult txPatternParser::createStepPattern(ExprLexer& aLexer, txNodeTest* nodeTest = 0; if (tok->type == Token::CNAME) { // resolve QName - txAtom *prefix, *lName; + nsIAtom *prefix, *lName; PRInt32 nspace; rv = resolveQName(tok->value, prefix, aContext, lName, nspace); if (NS_FAILED(rv)) { diff --git a/content/xslt/src/xslt/txSystemPropertyFunctionCall.cpp b/content/xslt/src/xslt/txSystemPropertyFunctionCall.cpp index 37710322e89a..6e8298890497 100644 --- a/content/xslt/src/xslt/txSystemPropertyFunctionCall.cpp +++ b/content/xslt/src/xslt/txSystemPropertyFunctionCall.cpp @@ -64,7 +64,7 @@ ExprResult* SystemPropertyFunctionCall::evaluate(txIEvalContext* aContext) return result; } -nsresult SystemPropertyFunctionCall::getNameAtom(txAtom** aAtom) +nsresult SystemPropertyFunctionCall::getNameAtom(nsIAtom** aAtom) { *aAtom = txXSLTAtoms::systemProperty; TX_ADDREF_ATOM(*aAtom); diff --git a/content/xslt/src/xslt/txXMLOutput.cpp b/content/xslt/src/xslt/txXMLOutput.cpp index c2288c01708c..1e85a93d9df5 100644 --- a/content/xslt/src/xslt/txXMLOutput.cpp +++ b/content/xslt/src/xslt/txXMLOutput.cpp @@ -40,7 +40,7 @@ const int txXMLOutput::DEFAULT_INDENT = 2; -txAttribute::txAttribute(PRInt32 aNsID, txAtom* aLocalName, +txAttribute::txAttribute(PRInt32 aNsID, nsIAtom* aLocalName, const nsAString& aValue) : mName(aNsID, aLocalName), mValue(aValue), @@ -246,7 +246,7 @@ void txXMLOutput::startElement(const nsAString& aName, mCDATASections.push((void*)mInCDATASection); mInCDATASection = MB_FALSE; - txAtom* localName = TX_GET_ATOM(aName); + nsIAtom* localName = TX_GET_ATOM(aName); txExpandedName currentElement(aNsID, localName); TX_IF_RELEASE_ATOM(localName); txListIterator iter(&(mOutputFormat.mCDATASectionElements)); diff --git a/content/xslt/src/xslt/txXMLOutput.h b/content/xslt/src/xslt/txXMLOutput.h index 8c259e197834..382d9357fd72 100644 --- a/content/xslt/src/xslt/txXMLOutput.h +++ b/content/xslt/src/xslt/txXMLOutput.h @@ -85,7 +85,7 @@ class txAttribute { public: - txAttribute(PRInt32 aNsID, txAtom* aLocalName, const nsAString& aValue); + txAttribute(PRInt32 aNsID, nsIAtom* aLocalName, const nsAString& aValue); txExpandedName mName; nsString mValue; MBool mShorthand; diff --git a/content/xslt/src/xslt/txXSLTNumber.cpp b/content/xslt/src/xslt/txXSLTNumber.cpp index dea98aea852d..03b3dac0ad84 100644 --- a/content/xslt/src/xslt/txXSLTNumber.cpp +++ b/content/xslt/src/xslt/txXSLTNumber.cpp @@ -150,7 +150,7 @@ nsresult txXSLTNumber::getValueList(Element* aNumberElement, switch (currNode->getNodeType()) { case Node::ELEMENT_NODE: { - txAtom* localName = 0; + nsIAtom* localName = 0; currNode->getLocalName(&localName); nodeTest = new txNameTest(0, localName, currNode->getNamespaceID(), @@ -218,7 +218,7 @@ nsresult txXSLTNumber::getValueList(Element* aNumberElement, // Generate list of values depending on the value of the level-attribute nsAutoString levelStr; - txAtom* level = 0; + nsIAtom* level = 0; if (aNumberElement->getAttr(txXSLTAtoms::level, kNameSpaceID_None, levelStr)) { level = TX_GET_ATOM(levelStr); } diff --git a/content/xslt/src/xslt/txXSLTPatterns.h b/content/xslt/src/xslt/txXSLTPatterns.h index 6267ac38b177..713f4598306f 100644 --- a/content/xslt/src/xslt/txXSLTPatterns.h +++ b/content/xslt/src/xslt/txXSLTPatterns.h @@ -172,7 +172,7 @@ private: class txKeyPattern : public txPattern { public: - txKeyPattern(ProcessorState* aPs, txAtom* aPrefix, txAtom* aLocalName, + txKeyPattern(ProcessorState* aPs, nsIAtom* aPrefix, nsIAtom* aLocalName, PRInt32 aNSID, const nsAString& aValue) : mProcessorState(aPs), mName(aNSID, aLocalName), mPrefix(aPrefix), mValue(aValue) @@ -186,7 +186,7 @@ public: private: ProcessorState* mProcessorState; txExpandedName mName; - txAtom* mPrefix; + nsIAtom* mPrefix; nsString mValue; };