diff --git a/mozilla/extensions/transformiix/source/base/List.cpp b/mozilla/extensions/transformiix/source/base/List.cpp index 80c8b0f7066..e32e42b6d12 100644 --- a/mozilla/extensions/transformiix/source/base/List.cpp +++ b/mozilla/extensions/transformiix/source/base/List.cpp @@ -31,9 +31,6 @@ */ #include "List.h" -#ifdef TX_EXE -#include -#endif //----------------------------/ //- Implementation of txList -/ @@ -181,13 +178,6 @@ void txList::insertBefore(void* objPtr, ListItem* refItem) { ++itemCount; } //-- insertBefore -/** - * Returns a txListIterator for this txList -**/ -txListIterator* txList::iterator() { - return new txListIterator(this); -} - void* txList::remove(void* objPtr) { ListItem* item = firstItem; while (item) { diff --git a/mozilla/extensions/transformiix/source/base/List.h b/mozilla/extensions/transformiix/source/base/List.h index d9fa47bd890..4912225916d 100644 --- a/mozilla/extensions/transformiix/source/base/List.h +++ b/mozilla/extensions/transformiix/source/base/List.h @@ -66,11 +66,6 @@ public: **/ PRInt32 getLength(); - /** - * Returns a txListIterator for this txList - **/ - txListIterator* iterator(); - /** * Adds the given Object to the specified position in the list **/ @@ -122,8 +117,6 @@ private: class txListIterator { public: - - /** * Creates a new txListIterator for the given txList * @param list, the txList to create an Iterator for @@ -133,7 +126,7 @@ public: /** * Destructor, destroys a given instance of a txListIterator **/ - virtual ~txListIterator(); + ~txListIterator(); /** * Adds the Object pointer to the txList pointed to by this txListIterator. @@ -141,8 +134,7 @@ public: * based on the current position within the txList * @param objPtr the Object pointer to add to the list **/ - - virtual void addAfter(void* objPtr); + void addAfter(void* objPtr); /** * Adds the Object pointer to the txList pointed to by this txListIterator. @@ -150,58 +142,57 @@ public: * based on the current position within the txList * @param objPtr the Object pointer to add to the list **/ - - virtual void addBefore(void* objPtr); + void addBefore(void* objPtr); /** * Returns true if a sucessful call to the next() method can be made * @return MB_TRUE if a sucessful call to the next() method can be made, * otherwise MB_FALSE **/ - virtual MBool hasNext(); + MBool hasNext(); /** * Returns true if a sucessful call to the previous() method can be made * @return MB_TRUE if a sucessful call to the previous() method can be made, * otherwise MB_FALSE **/ - virtual MBool hasPrevious(); + MBool hasPrevious(); /** * Returns the next Object pointer from the list **/ - virtual void* next(); + void* next(); /** * Returns the previous Object pointer from the list **/ - virtual void* previous(); + void* previous(); /** * Returns the current Object **/ - virtual void* current(); + void* current(); /** * Moves the specified number of steps **/ - virtual void* advance(int i); + void* advance(int i); /** * Removes the Object last returned by the next() or previous() methods; * @return the removed Object pointer **/ - virtual void* remove(); + void* remove(); /** * Resets the current location within the txList to the beginning of the txList **/ - virtual void reset(); + void reset(); /** * Resets the current location within the txList to the end of the txList **/ - virtual void resetToEnd(); + void resetToEnd(); private: @@ -216,6 +207,5 @@ private: }; typedef txList List; -typedef txListIterator ListIterator; #endif diff --git a/mozilla/extensions/transformiix/source/base/MozillaString.cpp b/mozilla/extensions/transformiix/source/base/MozillaString.cpp index f692dba9d5b..537560bf47d 100644 --- a/mozilla/extensions/transformiix/source/base/MozillaString.cpp +++ b/mozilla/extensions/transformiix/source/base/MozillaString.cpp @@ -36,9 +36,6 @@ #include #include "TxString.h" #include "nsUnicharUtils.h" -#ifdef TX_EXE -#include -#endif // //Default constructor ( nsString() ) diff --git a/mozilla/extensions/transformiix/source/base/Stack.cpp b/mozilla/extensions/transformiix/source/base/Stack.cpp index ea8e3d56289..b83263c288e 100644 --- a/mozilla/extensions/transformiix/source/base/Stack.cpp +++ b/mozilla/extensions/transformiix/source/base/Stack.cpp @@ -50,15 +50,6 @@ Stack::~Stack() { //-- the base destructor for List will do all clean up } -/** - * Returns an iterator that will iterator over the Stack, from the topmost - * element to the bottom element. - * You will need to delete this Iterator when you are done -**/ -StackIterator* Stack::iterator() { - return (StackIterator*)List::iterator(); -} //-- iterator - /** * Returns the specified Object from the top of this Stack, * without removing it from the stack. @@ -109,4 +100,3 @@ MBool Stack::empty() { int Stack::size() { return getLength(); } //-- size - diff --git a/mozilla/extensions/transformiix/source/base/Stack.h b/mozilla/extensions/transformiix/source/base/Stack.h index 6975f9e61df..126842fe659 100644 --- a/mozilla/extensions/transformiix/source/base/Stack.h +++ b/mozilla/extensions/transformiix/source/base/Stack.h @@ -33,12 +33,12 @@ #include "List.h" #include "baseutils.h" -typedef ListIterator StackIterator; - class Stack : private List { public: + friend class txStackIterator; + //----------------/ //- Constructors -/ //----------------/ @@ -54,8 +54,6 @@ public: **/ virtual ~Stack(); - StackIterator* iterator(); - /** * Returns the specified Object from the top of this Stack, * without removing it from the stack. @@ -92,5 +90,35 @@ private: }; //-- Stack +class txStackIterator { + +public: + + /* + * Creates a new txListIterator for the given txList + * @param list, the txList to create an Iterator for + */ + txStackIterator(Stack* aStack) : mIter(aStack) + {} + + /* + * Returns true if there is more objects on the stack + */ + MBool hasNext() + { + return mIter.hasNext(); + } + + /* + * Returns the next Object pointer from the stack + */ + void* next() + { + return mIter.next(); + } + +private: + txListIterator mIter; +}; #endif diff --git a/mozilla/extensions/transformiix/source/base/StringList.cpp b/mozilla/extensions/transformiix/source/base/StringList.cpp index d429075bca3..7b739bd1dd2 100644 --- a/mozilla/extensions/transformiix/source/base/StringList.cpp +++ b/mozilla/extensions/transformiix/source/base/StringList.cpp @@ -29,9 +29,6 @@ * StringList **/ -#ifdef TX_EXE -#include -#endif #include "StringList.h" /** diff --git a/mozilla/extensions/transformiix/source/xpath/AttributeValueTemplate.cpp b/mozilla/extensions/transformiix/source/xpath/AttributeValueTemplate.cpp index 16d78c60ef5..af52962c3b5 100644 --- a/mozilla/extensions/transformiix/source/xpath/AttributeValueTemplate.cpp +++ b/mozilla/extensions/transformiix/source/xpath/AttributeValueTemplate.cpp @@ -38,14 +38,10 @@ AttributeValueTemplate::AttributeValueTemplate() {}; * Default destructor **/ AttributeValueTemplate::~AttributeValueTemplate() { - ListIterator* iter = expressions.iterator(); - while ( iter->hasNext() ) { - iter->next(); //advance iterator to allow remove - Expr* expr = (Expr*)iter->remove(); - delete expr; + txListIterator iter(&expressions); + while (iter.hasNext()) { + delete (Expr*)iter.next(); } - delete iter; - } //-- ~AttributeValueTemplate /** @@ -64,15 +60,14 @@ void AttributeValueTemplate::addExpr(Expr* expr) { **/ ExprResult* AttributeValueTemplate::evaluate(txIEvalContext* aContext) { - ListIterator* iter = expressions.iterator(); + txListIterator iter(&expressions); String result; - while ( iter->hasNext() ) { - Expr* expr = (Expr*)iter->next(); + while (iter.hasNext()) { + Expr* expr = (Expr*)iter.next(); ExprResult* exprResult = expr->evaluate(aContext); exprResult->stringValue(result); delete exprResult; } - delete iter; return new StringResult(result); } //-- evaluate @@ -85,13 +80,12 @@ ExprResult* AttributeValueTemplate::evaluate(txIEvalContext* aContext) * @return the String representation of this Expr. **/ void AttributeValueTemplate::toString(String& str) { - ListIterator* iter = expressions.iterator(); - while ( iter->hasNext() ) { + txListIterator iter(&expressions); + while (iter.hasNext()) { str.append('{'); - Expr* expr = (Expr*)iter->next(); + Expr* expr = (Expr*)iter.next(); expr->toString(str); str.append('}'); } - delete iter; } //-- toString diff --git a/mozilla/extensions/transformiix/source/xpath/BooleanFunctionCall.cpp b/mozilla/extensions/transformiix/source/xpath/BooleanFunctionCall.cpp index 761ffa31b13..fdebbfd4eee 100644 --- a/mozilla/extensions/transformiix/source/xpath/BooleanFunctionCall.cpp +++ b/mozilla/extensions/transformiix/source/xpath/BooleanFunctionCall.cpp @@ -65,7 +65,7 @@ BooleanFunctionCall::BooleanFunctionCall(BooleanFunctions aType) **/ ExprResult* BooleanFunctionCall::evaluate(txIEvalContext* aContext) { - ListIterator iter(¶ms); + txListIterator iter(¶ms); switch (mType) { case TX_BOOLEAN: diff --git a/mozilla/extensions/transformiix/source/xpath/FunctionCall.cpp b/mozilla/extensions/transformiix/source/xpath/FunctionCall.cpp index e6c9f0a8b68..30eb1280f71 100644 --- a/mozilla/extensions/transformiix/source/xpath/FunctionCall.cpp +++ b/mozilla/extensions/transformiix/source/xpath/FunctionCall.cpp @@ -61,13 +61,10 @@ FunctionCall::FunctionCall(const String& name) **/ FunctionCall::~FunctionCall() { - ListIterator* iter = params.iterator(); - while (iter->hasNext()) { - iter->next(); - Expr* expr = (Expr*) iter->remove(); - delete expr; + txListIterator iter(¶ms); + while (iter.hasNext()) { + delete (Expr*)iter.next(); } - delete iter; } //-- ~FunctionCall //------------------/ @@ -197,16 +194,15 @@ void FunctionCall::toString(String& dest) dest.append(this->name); dest.append('('); //-- add parameters - ListIterator* iterator = params.iterator(); + txListIterator iter(¶ms); int argc = 0; - while (iterator->hasNext()) { + while (iter.hasNext()) { if (argc > 0) dest.append(','); - Expr* expr = (Expr*)iterator->next(); + Expr* expr = (Expr*)iter.next(); expr->toString(dest); ++argc; } - delete iterator; dest.append(')'); } //-- toString diff --git a/mozilla/extensions/transformiix/source/xpath/NodeSetFunctionCall.cpp b/mozilla/extensions/transformiix/source/xpath/NodeSetFunctionCall.cpp index 33d55660e32..b5c9f323f98 100644 --- a/mozilla/extensions/transformiix/source/xpath/NodeSetFunctionCall.cpp +++ b/mozilla/extensions/transformiix/source/xpath/NodeSetFunctionCall.cpp @@ -77,7 +77,7 @@ NodeSetFunctionCall::NodeSetFunctionCall(NodeSetFunctions aType) * @return the result of the evaluation */ ExprResult* NodeSetFunctionCall::evaluate(txIEvalContext* aContext) { - ListIterator iter(¶ms); + txListIterator iter(¶ms); switch (mType) { case COUNT: { diff --git a/mozilla/extensions/transformiix/source/xpath/NumberFunctionCall.cpp b/mozilla/extensions/transformiix/source/xpath/NumberFunctionCall.cpp index 23ad0a8d3d7..ebd471aecb5 100644 --- a/mozilla/extensions/transformiix/source/xpath/NumberFunctionCall.cpp +++ b/mozilla/extensions/transformiix/source/xpath/NumberFunctionCall.cpp @@ -71,7 +71,7 @@ NumberFunctionCall::NumberFunctionCall(NumberFunctions aType) { */ ExprResult* NumberFunctionCall::evaluate(txIEvalContext* aContext) { - ListIterator iter(¶ms); + txListIterator iter(¶ms); if (mType == NUMBER) { if (!requireParams(0, 1, aContext)) diff --git a/mozilla/extensions/transformiix/source/xpath/PathExpr.cpp b/mozilla/extensions/transformiix/source/xpath/PathExpr.cpp index 350fc6805e0..79a5781dda4 100644 --- a/mozilla/extensions/transformiix/source/xpath/PathExpr.cpp +++ b/mozilla/extensions/transformiix/source/xpath/PathExpr.cpp @@ -58,14 +58,12 @@ PathExpr::PathExpr() **/ PathExpr::~PathExpr() { - ListIterator* iter = expressions.iterator(); - while (iter->hasNext()) { - iter->next(); - PathExprItem* pxi = (PathExprItem*)iter->remove(); + txListIterator iter(&expressions); + while (iter.hasNext()) { + PathExprItem* pxi = (PathExprItem*)iter.next(); delete pxi->expr; delete pxi; } - delete iter; } //-- ~PathExpr /** @@ -114,7 +112,7 @@ ExprResult* PathExpr::evaluate(txIEvalContext* aContext) return 0; } - ListIterator iter(&expressions); + txListIterator iter(&expressions); PathExprItem* pxi; while ((pxi = (PathExprItem*)iter.next())) { @@ -195,7 +193,7 @@ void PathExpr::evalDescendants (Expr* aStep, Node* aNode, **/ void PathExpr::toString(String& dest) { - ListIterator iter(&expressions); + txListIterator iter(&expressions); PathExprItem* pxi = (PathExprItem*)iter.next(); if (pxi) { diff --git a/mozilla/extensions/transformiix/source/xpath/PredicateList.cpp b/mozilla/extensions/transformiix/source/xpath/PredicateList.cpp index 8fcfdb73147..ddcc8c84b4a 100644 --- a/mozilla/extensions/transformiix/source/xpath/PredicateList.cpp +++ b/mozilla/extensions/transformiix/source/xpath/PredicateList.cpp @@ -42,9 +42,7 @@ PredicateList::~PredicateList() { txListIterator iter(&predicates); while (iter.hasNext()) { - iter.next(); - Expr* expr = (Expr*)iter.remove(); - delete expr; + delete (Expr*)iter.next(); } } // ~PredicateList diff --git a/mozilla/extensions/transformiix/source/xpath/StringFunctionCall.cpp b/mozilla/extensions/transformiix/source/xpath/StringFunctionCall.cpp index 190eaabe171..1053b2eb22a 100644 --- a/mozilla/extensions/transformiix/source/xpath/StringFunctionCall.cpp +++ b/mozilla/extensions/transformiix/source/xpath/StringFunctionCall.cpp @@ -79,7 +79,7 @@ StringFunctionCall::StringFunctionCall(StringFunctions aType) : mType(aType) **/ ExprResult* StringFunctionCall::evaluate(txIEvalContext* aContext) { - ListIterator iter(¶ms); + txListIterator iter(¶ms); switch (mType) { case CONCAT: { diff --git a/mozilla/extensions/transformiix/source/xpath/UnionExpr.cpp b/mozilla/extensions/transformiix/source/xpath/UnionExpr.cpp index 2b13a8b4131..32074ec3bef 100644 --- a/mozilla/extensions/transformiix/source/xpath/UnionExpr.cpp +++ b/mozilla/extensions/transformiix/source/xpath/UnionExpr.cpp @@ -41,12 +41,10 @@ UnionExpr::UnionExpr() { * Destructor, will delete all Path Expressions **/ UnionExpr::~UnionExpr() { - ListIterator* iter = expressions.iterator(); - while (iter->hasNext()) { - iter->next(); - delete (Expr*)iter->remove(); + txListIterator iter(&expressions); + while (iter.hasNext()) { + delete (Expr*)iter.next(); } - delete iter; } //-- ~UnionExpr /** @@ -103,16 +101,15 @@ ExprResult* UnionExpr::evaluate(txIEvalContext* aContext) * @return the String representation of this Expr. **/ void UnionExpr::toString(String& dest) { - ListIterator* iter = expressions.iterator(); + txListIterator iter(&expressions); short count = 0; - while (iter->hasNext()) { + while (iter.hasNext()) { //-- set operator if (count > 0) dest.append(" | "); - ((Expr*)iter->next())->toString(dest); + ((Expr*)iter.next())->toString(dest); ++count; } - delete iter; } //-- toString diff --git a/mozilla/extensions/transformiix/source/xslt/ProcessorState.cpp b/mozilla/extensions/transformiix/source/xslt/ProcessorState.cpp index 5b00dbba695..dfcc1146e64 100644 --- a/mozilla/extensions/transformiix/source/xslt/ProcessorState.cpp +++ b/mozilla/extensions/transformiix/source/xslt/ProcessorState.cpp @@ -901,16 +901,15 @@ nsresult ProcessorState::getVariable(PRInt32 aNamespace, txAtom* aLName, String name; // XXX TODO, bug 117658 TX_GET_ATOM_STRING(aLName, name); - StackIterator* iter = variableSets.iterator(); + txStackIterator iter(&variableSets); ExprResult* exprResult = 0; - while (iter->hasNext()) { - NamedMap* map = (NamedMap*) iter->next(); + while (iter.hasNext()) { + NamedMap* map = (NamedMap*)iter.next(); if (map->get(name)) { exprResult = ((VariableBinding*)map->get(name))->getValue(); break; } } - delete iter; aResult = exprResult; return aResult ? NS_OK : NS_ERROR_INVALID_ARG; } //-- getVariable @@ -970,7 +969,7 @@ MBool ProcessorState::isStripSpaceAllowed(Node* node) **/ void ProcessorState::receiveError(const String& errorMessage, nsresult aRes) { - ListIterator iter(&errorObservers); + txListIterator iter(&errorObservers); while (iter.hasNext()) { ErrorObserver* observer = (ErrorObserver*)iter.next(); observer->receiveError(errorMessage, aRes); diff --git a/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.cpp b/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.cpp index 191d126af37..1ae9cc816f5 100644 --- a/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.cpp +++ b/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.cpp @@ -392,7 +392,7 @@ Document* XSLTProcessor::process(istream& xmlInput, String& xmlFilename) { **/ void XSLTProcessor::processStylesheet(Document* aSource, Document* aStylesheet, - ListIterator* aImportFrame, + txListIterator* aImportFrame, ProcessorState* aPs) { NS_ASSERTION(aStylesheet, "processTopLevel called without stylesheet"); @@ -427,7 +427,7 @@ void XSLTProcessor::processStylesheet(Document* aSource, **/ void XSLTProcessor::processTopLevel(Document* aSource, Element* aStylesheet, - ListIterator* importFrame, + txListIterator* importFrame, ProcessorState* aPs) { // Index templates and process top level xsl elements @@ -717,27 +717,20 @@ void XSLTProcessor::processTopLevel(Document* aSource, */ void XSLTProcessor::processInclude(String& aHref, Document* aSource, - ListIterator* aImportFrame, + txListIterator* aImportFrame, ProcessorState* aPs) { // make sure the include isn't included yet - StackIterator* iter = aPs->getEnteredStylesheets()->iterator(); - if (!iter) { - // XXX report out of memory - return; - } - - while (iter->hasNext()) { - if (((String*)iter->next())->isEqual(aHref)) { + txStackIterator iter(aPs->getEnteredStylesheets()); + while (iter.hasNext()) { + if (((String*)iter.next())->isEqual(aHref)) { String err("Stylesheet includes itself. URI: "); err.append(aHref); aPs->receiveError(err, NS_ERROR_FAILURE); - delete iter; return; } } aPs->getEnteredStylesheets()->push(&aHref); - delete iter; // Load XSL document Node* stylesheet = aPs->retrieveDocument(aHref, NULL_STRING); @@ -1661,16 +1654,12 @@ void XSLTProcessor::processAttributeSets(Element* aElement, Node* aNode, Process String name; while (tokenizer.hasMoreTokens()) { tokenizer.nextToken(name); - StackIterator *attributeSets = mAttributeSetStack.iterator(); - NS_ASSERTION(attributeSets, "Out of memory"); - if (!attributeSets) - return; - while (attributeSets->hasNext()) { - String* test = (String*)attributeSets->next(); + txStackIterator attributeSets(&mAttributeSetStack); + while (attributeSets.hasNext()) { + String* test = (String*)attributeSets.next(); if (test->isEqual(name)) return; } - delete attributeSets; NodeSet* attSet = aPs->getAttributeSet(name); if (attSet) { @@ -2396,7 +2385,7 @@ XSLTProcessor::TransformDocument(nsIDOMNode* aSourceDOM, ps.setEvalContext(&evalContext); // Index templates and process top level xsl elements - ListIterator importFrame(ps.getImportFrames()); + txListIterator importFrame(ps.getImportFrames()); importFrame.addAfter(new ProcessorState::ImportFrame(0)); if (!importFrame.next()) return NS_ERROR_OUT_OF_MEMORY; diff --git a/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.h b/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.h index e9c04615556..13d0ea0c7c0 100644 --- a/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.h +++ b/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.h @@ -313,12 +313,12 @@ private: void processStylesheet(Document* aSource, Document* aStylesheet, - ListIterator* aImportFrame, + txListIterator* aImportFrame, ProcessorState* aPs); void processTopLevel(Document* aSource, Element* aStylesheet, - ListIterator* importFrame, + txListIterator* importFrame, ProcessorState* aPs); /* @@ -330,7 +330,7 @@ private: */ void processInclude(String& aHref, Document* aSource, - ListIterator* aImportFrame, + txListIterator* aImportFrame, ProcessorState* aPs); ExprResult* processVariable(Node* node, Element* xslVariable, ProcessorState* ps); diff --git a/mozilla/extensions/transformiix/source/xslt/functions/DocumentFunctionCall.cpp b/mozilla/extensions/transformiix/source/xslt/functions/DocumentFunctionCall.cpp index 28b3487e322..c865c2c09da 100644 --- a/mozilla/extensions/transformiix/source/xslt/functions/DocumentFunctionCall.cpp +++ b/mozilla/extensions/transformiix/source/xslt/functions/DocumentFunctionCall.cpp @@ -65,16 +65,16 @@ ExprResult* DocumentFunctionCall::evaluate(txIEvalContext* aContext) // document(object, node-set?) if (requireParams(1, 2, aContext)) { - ListIterator* iter = params.iterator(); - Expr* param1 = (Expr*) iter->next(); + txListIterator iter(¶ms); + Expr* param1 = (Expr*)iter.next(); ExprResult* exprResult1 = param1->evaluate(aContext); String baseURI; MBool baseURISet = MB_FALSE; - if (iter->hasNext()) { + if (iter.hasNext()) { // We have 2 arguments, get baseURI from the first node // in the resulting nodeset - Expr* param2 = (Expr*) iter->next(); + Expr* param2 = (Expr*)iter.next(); ExprResult* exprResult2 = param2->evaluate(aContext); if (exprResult2->getResultType() != ExprResult::NODESET) { String err("node-set expected as second argument to document(): "); @@ -128,7 +128,6 @@ ExprResult* DocumentFunctionCall::evaluate(txIEvalContext* aContext) } } delete exprResult1; - delete iter; } return nodeSet; diff --git a/mozilla/extensions/transformiix/source/xslt/functions/ElementAvailableFnCall.cpp b/mozilla/extensions/transformiix/source/xslt/functions/ElementAvailableFnCall.cpp index 2808637066f..7cc63432587 100644 --- a/mozilla/extensions/transformiix/source/xslt/functions/ElementAvailableFnCall.cpp +++ b/mozilla/extensions/transformiix/source/xslt/functions/ElementAvailableFnCall.cpp @@ -69,7 +69,7 @@ ExprResult* ElementAvailableFunctionCall::evaluate(txIEvalContext* aContext) ExprResult* result = NULL; if (requireParams(1, 1, aContext)) { - ListIterator iter(¶ms); + txListIterator iter(¶ms); Expr* param = (Expr*) iter.next(); ExprResult* exprResult = param->evaluate(aContext); if (exprResult && diff --git a/mozilla/extensions/transformiix/source/xslt/functions/FunctionAvailableFnCall.cpp b/mozilla/extensions/transformiix/source/xslt/functions/FunctionAvailableFnCall.cpp index 7258c6268d6..07c5c09ecdb 100644 --- a/mozilla/extensions/transformiix/source/xslt/functions/FunctionAvailableFnCall.cpp +++ b/mozilla/extensions/transformiix/source/xslt/functions/FunctionAvailableFnCall.cpp @@ -68,7 +68,7 @@ ExprResult* FunctionAvailableFunctionCall::evaluate(txIEvalContext* aContext) ExprResult* result = NULL; if (requireParams(1, 1, aContext)) { - ListIterator iter(¶ms); + txListIterator iter(¶ms); Expr* param = (Expr*)iter.next(); ExprResult* exprResult = param->evaluate(aContext); if (exprResult && diff --git a/mozilla/extensions/transformiix/source/xslt/functions/SystemPropertyFunctionCall.cpp b/mozilla/extensions/transformiix/source/xslt/functions/SystemPropertyFunctionCall.cpp index 79cc50a2472..50ab9847880 100644 --- a/mozilla/extensions/transformiix/source/xslt/functions/SystemPropertyFunctionCall.cpp +++ b/mozilla/extensions/transformiix/source/xslt/functions/SystemPropertyFunctionCall.cpp @@ -34,9 +34,8 @@ ExprResult* SystemPropertyFunctionCall::evaluate(txIEvalContext* aContext) ExprResult* result = NULL; if (requireParams(1, 1, aContext)) { - ListIterator* iter = params.iterator(); - Expr* param = (Expr*) iter->next(); - delete iter; + txListIterator iter(¶ms); + Expr* param = (Expr*)iter.next(); ExprResult* exprResult = param->evaluate(aContext); if (exprResult->getResultType() == ExprResult::STRING) { String property; diff --git a/mozilla/extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp b/mozilla/extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp index b71ed2b97bf..c8a3e313152 100644 --- a/mozilla/extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp +++ b/mozilla/extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp @@ -77,7 +77,7 @@ ExprResult* txFormatNumberFunctionCall::evaluate(txIEvalContext* aContext) return new StringResult(); // Get number and format - ListIterator iter(¶ms); + txListIterator iter(¶ms); double value; String formatStr; diff --git a/mozilla/extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp b/mozilla/extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp index 050cbe08640..b2db472b14a 100644 --- a/mozilla/extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp +++ b/mozilla/extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp @@ -56,7 +56,7 @@ ExprResult* txKeyFunctionCall::evaluate(txIEvalContext* aContext) return 0; } - ListIterator iter(¶ms); + txListIterator iter(¶ms); String keyName; evaluateToString((Expr*)iter.next(), aContext, keyName); Expr* param = (Expr*) iter.next(); @@ -111,7 +111,7 @@ txXSLKey::txXSLKey(ProcessorState* aPs) txXSLKey::~txXSLKey() { - ListIterator iter(&mKeys); + txListIterator iter(&mKeys); Key* key; while ((key = (Key*)iter.next())) { delete key->matchPattern; @@ -224,7 +224,7 @@ void txXSLKey::testNode(Node* aNode, NamedMap* aMap) String val; NodeSet *nodeSet; - ListIterator iter(&mKeys); + txListIterator iter(&mKeys); while (iter.hasNext()) { Key* key=(Key*)iter.next(); diff --git a/mozilla/extensions/transformiix/source/xslt/txXSLTPatterns.cpp b/mozilla/extensions/transformiix/source/xslt/txXSLTPatterns.cpp index 59a60f8e94d..a5bce198cc5 100644 --- a/mozilla/extensions/transformiix/source/xslt/txXSLTPatterns.cpp +++ b/mozilla/extensions/transformiix/source/xslt/txXSLTPatterns.cpp @@ -75,7 +75,7 @@ txPattern::~txPattern() */ txUnionPattern::~txUnionPattern() { - ListIterator iter(&mLocPathPatterns); + txListIterator iter(&mLocPathPatterns); while (iter.hasNext()) { delete (txPattern*)iter.next(); } @@ -108,7 +108,7 @@ double txUnionPattern::getDefaultPriority() */ MBool txUnionPattern::matches(Node* aNode, txIMatchContext* aContext) { - ListIterator iter(&mLocPathPatterns); + txListIterator iter(&mLocPathPatterns); while (iter.hasNext()) { txPattern* p = (txPattern*)iter.next(); if (p->matches(aNode, aContext)) { @@ -120,7 +120,7 @@ MBool txUnionPattern::matches(Node* aNode, txIMatchContext* aContext) nsresult txUnionPattern::getSimplePatterns(txList& aList) { - ListIterator iter(&mLocPathPatterns); + txListIterator iter(&mLocPathPatterns); while (iter.hasNext()) { aList.add(iter.next()); iter.remove(); @@ -163,7 +163,7 @@ void txUnionPattern::toString(String& aDest) */ txLocPathPattern::~txLocPathPattern() { - ListIterator iter(&mSteps); + txListIterator iter(&mSteps); while (iter.hasNext()) { delete (Step*)iter.next(); } @@ -196,7 +196,7 @@ MBool txLocPathPattern::matches(Node* aNode, txIMatchContext* aContext) * tree. */ - ListIterator iter(&mSteps); + txListIterator iter(&mSteps); iter.resetToEnd(); Step* step; @@ -255,7 +255,7 @@ double txLocPathPattern::getDefaultPriority() void txLocPathPattern::toString(String& aDest) { - ListIterator iter(&mSteps); + txListIterator iter(&mSteps); #ifdef DEBUG aDest.append("txLocPathPattern{"); #endif diff --git a/mozilla/extensions/transformiix/source/xslt/util/NodeStack.cpp b/mozilla/extensions/transformiix/source/xslt/util/NodeStack.cpp index 34aa90dcff7..03ccdbe469d 100644 --- a/mozilla/extensions/transformiix/source/xslt/util/NodeStack.cpp +++ b/mozilla/extensions/transformiix/source/xslt/util/NodeStack.cpp @@ -27,9 +27,6 @@ */ #include "NodeStack.h" -#ifdef TX_EXE -#include -#endif //-------------/ //- Constants -/