From 05ca9a5742c30bdd76ff2403b4f80bd25aa9e8ed Mon Sep 17 00:00:00 2001 From: "peterv%netscape.com" Date: Thu, 22 Aug 2002 12:22:47 +0000 Subject: [PATCH] Fix for bug 163955 (Header cleanup for transformiix). r=sicking, rs=jst. git-svn-id: svn://10.0.0.236/trunk@127853 18797224-902f-48f8-a5cc-f745e15eee43 --- .../transformiix/source/base/ErrorObserver.h | 3 ++- .../transformiix/source/base/Map.cpp | 1 + .../extensions/transformiix/source/base/Map.h | 5 +++-- .../transformiix/source/base/NamedMap.cpp | 1 + .../transformiix/source/base/NamedMap.h | 4 +++- .../source/base/SimpleErrorObserver.cpp | 1 + .../transformiix/source/base/StringList.h | 2 +- .../transformiix/source/base/TxString.h | 2 +- .../transformiix/source/base/primitives.h | 3 ++- .../source/base/txExpandedNameMap.h | 5 +++-- .../transformiix/source/xml/XMLDOMUtils.cpp | 2 ++ .../transformiix/source/xml/XMLDOMUtils.h | 4 +++- .../transformiix/source/xml/XMLUtils.h | 2 +- .../source/xml/dom/mozImpl/mozilladom.h | 1 + .../transformiix/source/xpath/AdditiveExpr.cpp | 2 ++ .../source/xpath/AttributeValueTemplate.cpp | 1 + .../transformiix/source/xpath/BooleanExpr.cpp | 1 + .../source/xpath/BooleanFunctionCall.cpp | 1 + .../transformiix/source/xpath/Expr.h | 18 +++++++----------- .../transformiix/source/xpath/ExprParser.cpp | 2 ++ .../transformiix/source/xpath/ExprParser.h | 17 +++++++++++++---- .../transformiix/source/xpath/ExprResult.h | 3 ++- .../transformiix/source/xpath/FilterExpr.cpp | 1 + .../transformiix/source/xpath/FunctionCall.cpp | 1 + .../transformiix/source/xpath/FunctionLib.h | 4 +--- .../transformiix/source/xpath/LocationStep.cpp | 1 + .../source/xpath/MultiplicativeExpr.cpp | 2 ++ .../transformiix/source/xpath/NodeSet.cpp | 4 ++-- .../transformiix/source/xpath/NodeSet.h | 3 ++- .../source/xpath/NodeSetFunctionCall.cpp | 3 ++- .../transformiix/source/xpath/NumberExpr.cpp | 2 ++ .../source/xpath/NumberFunctionCall.cpp | 1 + .../transformiix/source/xpath/PathExpr.cpp | 3 ++- .../source/xpath/PredicateList.cpp | 1 + .../source/xpath/RelationalExpr.cpp | 2 ++ .../transformiix/source/xpath/RootExpr.cpp | 1 + .../transformiix/source/xpath/StringExpr.cpp | 1 + .../source/xpath/StringFunctionCall.cpp | 5 +++-- .../transformiix/source/xpath/UnaryExpr.cpp | 1 + .../transformiix/source/xpath/UnionExpr.cpp | 1 + .../source/xpath/VariableRefExpr.cpp | 1 + .../source/xpath/nsXPathEvaluator.cpp | 1 + .../source/xpath/nsXPathExpression.cpp | 1 + .../source/xpath/nsXPathResult.cpp | 1 + .../source/xpath/txForwardContext.cpp | 1 + .../source/xpath/txForwardContext.h | 2 ++ .../source/xpath/txIXPathContext.h | 8 +++++++- .../source/xpath/txNodeSetContext.cpp | 1 + .../source/xpath/txNodeSetContext.h | 2 ++ .../source/xslt/functions/XSLTFunctions.h | 3 +-- .../source/xslt/txPatternParser.cpp | 3 ++- .../transformiix/source/xslt/txRtfHandler.cpp | 1 + .../transformiix/source/xslt/txRtfHandler.h | 3 +++ .../xslt/util/txXPathResultComparator.cpp | 3 ++- 54 files changed, 107 insertions(+), 42 deletions(-) diff --git a/mozilla/extensions/transformiix/source/base/ErrorObserver.h b/mozilla/extensions/transformiix/source/base/ErrorObserver.h index ceb95dae458..563c80f7953 100644 --- a/mozilla/extensions/transformiix/source/base/ErrorObserver.h +++ b/mozilla/extensions/transformiix/source/base/ErrorObserver.h @@ -27,10 +27,11 @@ #define MITRE_ERROROBSERVER_H #include "baseutils.h" -#include "TxString.h" #include "txError.h" #include +class String; + /** * A simple interface for observing errors **/ diff --git a/mozilla/extensions/transformiix/source/base/Map.cpp b/mozilla/extensions/transformiix/source/base/Map.cpp index 799d50fe6e4..9c4e6472d67 100644 --- a/mozilla/extensions/transformiix/source/base/Map.cpp +++ b/mozilla/extensions/transformiix/source/base/Map.cpp @@ -28,6 +28,7 @@ #include "Map.h" +#include "List.h" //-------------/ //- Constants -/ diff --git a/mozilla/extensions/transformiix/source/base/Map.h b/mozilla/extensions/transformiix/source/base/Map.h index dc8b473a3cc..c2b30c244db 100644 --- a/mozilla/extensions/transformiix/source/base/Map.h +++ b/mozilla/extensions/transformiix/source/base/Map.h @@ -31,7 +31,8 @@ #include "baseutils.h" #include "TxObject.h" -#include "List.h" + +class txList; class Map : public TxObject { @@ -64,7 +65,7 @@ public: * * You will need to delete this List when you are done with it. **/ - List* keys(); + txList* keys(); /** * Returns the object reference in this Map associated with the given name diff --git a/mozilla/extensions/transformiix/source/base/NamedMap.cpp b/mozilla/extensions/transformiix/source/base/NamedMap.cpp index d71bcea14d9..890af5aebe0 100644 --- a/mozilla/extensions/transformiix/source/base/NamedMap.cpp +++ b/mozilla/extensions/transformiix/source/base/NamedMap.cpp @@ -32,6 +32,7 @@ **/ #include "NamedMap.h" +#include "StringList.h" //-------------/ //- Constants -/ diff --git a/mozilla/extensions/transformiix/source/base/NamedMap.h b/mozilla/extensions/transformiix/source/base/NamedMap.h index 6e208472c43..7373a51fd1c 100644 --- a/mozilla/extensions/transformiix/source/base/NamedMap.h +++ b/mozilla/extensions/transformiix/source/base/NamedMap.h @@ -32,7 +32,9 @@ #include "baseutils.h" #include "TxObject.h" -#include "StringList.h" +#include "TxString.h" + +class StringList; class NamedMap : public TxObject { diff --git a/mozilla/extensions/transformiix/source/base/SimpleErrorObserver.cpp b/mozilla/extensions/transformiix/source/base/SimpleErrorObserver.cpp index f9d4716ca4e..917e0d72296 100644 --- a/mozilla/extensions/transformiix/source/base/SimpleErrorObserver.cpp +++ b/mozilla/extensions/transformiix/source/base/SimpleErrorObserver.cpp @@ -24,6 +24,7 @@ */ #include "ErrorObserver.h" +#include "TxString.h" /** * Creates a new SimpleErrorObserver. diff --git a/mozilla/extensions/transformiix/source/base/StringList.h b/mozilla/extensions/transformiix/source/base/StringList.h index 91ee1d926aa..8d34cea0bf4 100644 --- a/mozilla/extensions/transformiix/source/base/StringList.h +++ b/mozilla/extensions/transformiix/source/base/StringList.h @@ -32,8 +32,8 @@ #ifndef TRANSFRMX_STRINGLIST_H #define TRANSFRMX_STRINGLIST_H -#include "TxString.h" #include "baseutils.h" +#include "TxString.h" class StringListIterator; diff --git a/mozilla/extensions/transformiix/source/base/TxString.h b/mozilla/extensions/transformiix/source/base/TxString.h index 628142003ee..b26daefea9f 100644 --- a/mozilla/extensions/transformiix/source/base/TxString.h +++ b/mozilla/extensions/transformiix/source/base/TxString.h @@ -28,10 +28,10 @@ #ifndef txString_h__ #define txString_h__ -#include "TxObject.h" #include "baseutils.h" #ifdef TX_EXE +#include "TxObject.h" #include typedef unsigned short UNICODE_CHAR; const PRInt32 kNotFound = -1; diff --git a/mozilla/extensions/transformiix/source/base/primitives.h b/mozilla/extensions/transformiix/source/base/primitives.h index 378d32c13dd..e7736b69895 100644 --- a/mozilla/extensions/transformiix/source/base/primitives.h +++ b/mozilla/extensions/transformiix/source/base/primitives.h @@ -40,7 +40,8 @@ #define MITRE_PRIMITIVES_H #include "baseutils.h" -#include "TxString.h" + +class String; /* * Utility class for doubles diff --git a/mozilla/extensions/transformiix/source/base/txExpandedNameMap.h b/mozilla/extensions/transformiix/source/base/txExpandedNameMap.h index 670a7033e53..2d597bdd6e2 100644 --- a/mozilla/extensions/transformiix/source/base/txExpandedNameMap.h +++ b/mozilla/extensions/transformiix/source/base/txExpandedNameMap.h @@ -39,9 +39,10 @@ #ifndef TRANSFRMX_EXPANDEDNAMEMAP_H #define TRANSFRMX_EXPANDEDNAMEMAP_H -#include "XMLUtils.h" -#include "TxObject.h" #include "txError.h" +#include "XMLUtils.h" + +class TxObject; class txExpandedNameMap { public: diff --git a/mozilla/extensions/transformiix/source/xml/XMLDOMUtils.cpp b/mozilla/extensions/transformiix/source/xml/XMLDOMUtils.cpp index 06115ca6d8b..50396209401 100644 --- a/mozilla/extensions/transformiix/source/xml/XMLDOMUtils.cpp +++ b/mozilla/extensions/transformiix/source/xml/XMLDOMUtils.cpp @@ -24,6 +24,8 @@ */ #include "XMLDOMUtils.h" +#include "dom.h" +#include "TxString.h" void XMLDOMUtils::getNodeValue(Node* aNode, String& aResult) { diff --git a/mozilla/extensions/transformiix/source/xml/XMLDOMUtils.h b/mozilla/extensions/transformiix/source/xml/XMLDOMUtils.h index 7890a12dae0..d81940741ee 100644 --- a/mozilla/extensions/transformiix/source/xml/XMLDOMUtils.h +++ b/mozilla/extensions/transformiix/source/xml/XMLDOMUtils.h @@ -26,9 +26,11 @@ #ifndef TRANSFRMX_XMLDOMUTILS_H #define TRANSFRMX_XMLDOMUTILS_H -#include "dom.h" #include "baseutils.h" +class Node; +class String; + /* * A utility class for use with XML DOM implementations */ diff --git a/mozilla/extensions/transformiix/source/xml/XMLUtils.h b/mozilla/extensions/transformiix/source/xml/XMLUtils.h index 95dd15d4815..f3029abadf5 100644 --- a/mozilla/extensions/transformiix/source/xml/XMLUtils.h +++ b/mozilla/extensions/transformiix/source/xml/XMLUtils.h @@ -31,8 +31,8 @@ #define MITRE_XMLUTILS_H #include "baseutils.h" -#include "txAtom.h" #include "dom.h" +#include "txAtom.h" #include "txError.h" class String; diff --git a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/mozilladom.h b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/mozilladom.h index 3b4fe94e98b..dd59c736f73 100644 --- a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/mozilladom.h +++ b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/mozilladom.h @@ -48,6 +48,7 @@ #include "nsINameSpaceManager.h" #include "pldhash.h" #include "txAtom.h" +#include "TxObject.h" #include "TxString.h" #ifndef NULL diff --git a/mozilla/extensions/transformiix/source/xpath/AdditiveExpr.cpp b/mozilla/extensions/transformiix/source/xpath/AdditiveExpr.cpp index 1088c38aa3b..43b6fa7ba67 100644 --- a/mozilla/extensions/transformiix/source/xpath/AdditiveExpr.cpp +++ b/mozilla/extensions/transformiix/source/xpath/AdditiveExpr.cpp @@ -31,6 +31,8 @@ **/ #include "Expr.h" +#include "ExprResult.h" +#include "primitives.h" /** * Creates a new AdditiveExpr using the given operator diff --git a/mozilla/extensions/transformiix/source/xpath/AttributeValueTemplate.cpp b/mozilla/extensions/transformiix/source/xpath/AttributeValueTemplate.cpp index af52962c3b5..f091f41e5d0 100644 --- a/mozilla/extensions/transformiix/source/xpath/AttributeValueTemplate.cpp +++ b/mozilla/extensions/transformiix/source/xpath/AttributeValueTemplate.cpp @@ -28,6 +28,7 @@ **/ #include "Expr.h" +#include "ExprResult.h" /** * Create a new AttributeValueTemplate diff --git a/mozilla/extensions/transformiix/source/xpath/BooleanExpr.cpp b/mozilla/extensions/transformiix/source/xpath/BooleanExpr.cpp index acc91961dc6..dca4045fba5 100644 --- a/mozilla/extensions/transformiix/source/xpath/BooleanExpr.cpp +++ b/mozilla/extensions/transformiix/source/xpath/BooleanExpr.cpp @@ -35,6 +35,7 @@ **/ #include "Expr.h" +#include "ExprResult.h" /** * Creates a new BooleanExpr using the given operator diff --git a/mozilla/extensions/transformiix/source/xpath/BooleanFunctionCall.cpp b/mozilla/extensions/transformiix/source/xpath/BooleanFunctionCall.cpp index 65304fc79f4..116a55e091e 100644 --- a/mozilla/extensions/transformiix/source/xpath/BooleanFunctionCall.cpp +++ b/mozilla/extensions/transformiix/source/xpath/BooleanFunctionCall.cpp @@ -27,6 +27,7 @@ * */ +#include "ExprResult.h" #include "FunctionLib.h" #include "txAtoms.h" #include "txIXPathContext.h" diff --git a/mozilla/extensions/transformiix/source/xpath/Expr.h b/mozilla/extensions/transformiix/source/xpath/Expr.h index aa7bde5638f..ce3bfc1cf84 100644 --- a/mozilla/extensions/transformiix/source/xpath/Expr.h +++ b/mozilla/extensions/transformiix/source/xpath/Expr.h @@ -35,24 +35,20 @@ #ifndef TRANSFRMX_EXPR_H #define TRANSFRMX_EXPR_H -#include "txError.h" -#include "TxString.h" -#include "ErrorObserver.h" -#include "NodeSet.h" -#include "Stack.h" -#include "ExprResult.h" #include "baseutils.h" +#include "dom.h" +#include "List.h" +#include "txAtom.h" #include "TxObject.h" -#include "primitives.h" +#include "TxString.h" /* XPath class definitions. Much of this code was ported from XSL:P. */ -/* - * necessary prototypes - */ +class ExprResult; +class NodeSet; class txIParseContext; class txIMatchContext; class txIEvalContext; @@ -138,7 +134,7 @@ public: protected: - List params; + txList params; FunctionCall(); diff --git a/mozilla/extensions/transformiix/source/xpath/ExprParser.cpp b/mozilla/extensions/transformiix/source/xpath/ExprParser.cpp index dfcc4ed4748..8bcbf7a3a4f 100644 --- a/mozilla/extensions/transformiix/source/xpath/ExprParser.cpp +++ b/mozilla/extensions/transformiix/source/xpath/ExprParser.cpp @@ -39,8 +39,10 @@ **/ #include "ExprParser.h" +#include "ExprLexer.h" #include "FunctionLib.h" #include "Names.h" +#include "Stack.h" #include "txAtoms.h" #include "txIXPathContext.h" diff --git a/mozilla/extensions/transformiix/source/xpath/ExprParser.h b/mozilla/extensions/transformiix/source/xpath/ExprParser.h index a0187df216c..ac3072aa642 100644 --- a/mozilla/extensions/transformiix/source/xpath/ExprParser.h +++ b/mozilla/extensions/transformiix/source/xpath/ExprParser.h @@ -32,11 +32,20 @@ #ifndef MITREXSL_EXPRPARSER_H #define MITREXSL_EXPRPARSER_H -#include "TxString.h" -#include "ExprLexer.h" -#include "Expr.h" -#include "List.h" +#include "baseutils.h" +#include "txAtom.h" +#include "txError.h" + +class AttributeValueTemplate; +class Expr; +class ExprLexer; +class FunctionCall; +class LocationStep; +class PredicateList; +class String; +class Token; class txIParseContext; +class txNodeTypeTest; class ExprParser { diff --git a/mozilla/extensions/transformiix/source/xpath/ExprResult.h b/mozilla/extensions/transformiix/source/xpath/ExprResult.h index ecfd98b8cb5..23374892e93 100644 --- a/mozilla/extensions/transformiix/source/xpath/ExprResult.h +++ b/mozilla/extensions/transformiix/source/xpath/ExprResult.h @@ -28,8 +28,9 @@ #ifndef TRANSFRMX_EXPRRESULT_H #define TRANSFRMX_EXPRRESULT_H -#include "TxObject.h" #include "primitives.h" +#include "TxObject.h" +#include "TxString.h" /* * ExprResult diff --git a/mozilla/extensions/transformiix/source/xpath/FilterExpr.cpp b/mozilla/extensions/transformiix/source/xpath/FilterExpr.cpp index 3c56737e472..d5907adeff9 100644 --- a/mozilla/extensions/transformiix/source/xpath/FilterExpr.cpp +++ b/mozilla/extensions/transformiix/source/xpath/FilterExpr.cpp @@ -26,6 +26,7 @@ */ #include "Expr.h" +#include "NodeSet.h" #include "txIXPathContext.h" //-- Implementation of FilterExpr --/ diff --git a/mozilla/extensions/transformiix/source/xpath/FunctionCall.cpp b/mozilla/extensions/transformiix/source/xpath/FunctionCall.cpp index b86ec4b221c..6eb84eea769 100644 --- a/mozilla/extensions/transformiix/source/xpath/FunctionCall.cpp +++ b/mozilla/extensions/transformiix/source/xpath/FunctionCall.cpp @@ -24,6 +24,7 @@ */ #include "Expr.h" +#include "ExprResult.h" #include "txAtom.h" #include "txIXPathContext.h" diff --git a/mozilla/extensions/transformiix/source/xpath/FunctionLib.h b/mozilla/extensions/transformiix/source/xpath/FunctionLib.h index 7b9cd30505e..5c70fbdc581 100644 --- a/mozilla/extensions/transformiix/source/xpath/FunctionLib.h +++ b/mozilla/extensions/transformiix/source/xpath/FunctionLib.h @@ -33,11 +33,9 @@ #ifndef TRANSFRMX_FUNCTIONLIB_H #define TRANSFRMX_FUNCTIONLIB_H - -#include "TxString.h" #include "primitives.h" -#include "ExprResult.h" #include "Expr.h" +#include "TxString.h" /** * The following are definitions for the XPath functions diff --git a/mozilla/extensions/transformiix/source/xpath/LocationStep.cpp b/mozilla/extensions/transformiix/source/xpath/LocationStep.cpp index ca2571c736a..1922d5440a3 100644 --- a/mozilla/extensions/transformiix/source/xpath/LocationStep.cpp +++ b/mozilla/extensions/transformiix/source/xpath/LocationStep.cpp @@ -28,6 +28,7 @@ */ #include "Expr.h" +#include "NodeSet.h" #include "txIXPathContext.h" /** diff --git a/mozilla/extensions/transformiix/source/xpath/MultiplicativeExpr.cpp b/mozilla/extensions/transformiix/source/xpath/MultiplicativeExpr.cpp index e5605f26cb5..2bba2b8b27c 100644 --- a/mozilla/extensions/transformiix/source/xpath/MultiplicativeExpr.cpp +++ b/mozilla/extensions/transformiix/source/xpath/MultiplicativeExpr.cpp @@ -36,7 +36,9 @@ **/ #include "Expr.h" +#include "ExprResult.h" #include +#include "primitives.h" /** * Creates a new MultiplicativeExpr using the given operator diff --git a/mozilla/extensions/transformiix/source/xpath/NodeSet.cpp b/mozilla/extensions/transformiix/source/xpath/NodeSet.cpp index a2fd6419230..080fc6ef8da 100644 --- a/mozilla/extensions/transformiix/source/xpath/NodeSet.cpp +++ b/mozilla/extensions/transformiix/source/xpath/NodeSet.cpp @@ -31,9 +31,9 @@ */ #include "NodeSet.h" +#include "dom.h" #include "XMLDOMUtils.h" -#include "string.h" -#include "stdio.h" +#include static const int kTxNodeSetMinSize = 4; static const int kTxNodeSetGrowFactor = 2; diff --git a/mozilla/extensions/transformiix/source/xpath/NodeSet.h b/mozilla/extensions/transformiix/source/xpath/NodeSet.h index 80e2d838ac1..da7b7b4c87e 100644 --- a/mozilla/extensions/transformiix/source/xpath/NodeSet.h +++ b/mozilla/extensions/transformiix/source/xpath/NodeSet.h @@ -34,10 +34,11 @@ #ifndef TRANSFRMX_NODESET_H #define TRANSFRMX_NODESET_H -#include "dom.h" #include "ExprResult.h" #include "txError.h" +class Node; + class NodeSet : public ExprResult { diff --git a/mozilla/extensions/transformiix/source/xpath/NodeSetFunctionCall.cpp b/mozilla/extensions/transformiix/source/xpath/NodeSetFunctionCall.cpp index 307f799401a..24583db1fbe 100644 --- a/mozilla/extensions/transformiix/source/xpath/NodeSetFunctionCall.cpp +++ b/mozilla/extensions/transformiix/source/xpath/NodeSetFunctionCall.cpp @@ -33,9 +33,10 @@ */ #include "FunctionLib.h" +#include "NodeSet.h" +#include "Tokenizer.h" #include "txAtoms.h" #include "txIXPathContext.h" -#include "Tokenizer.h" #include "XMLDOMUtils.h" /* diff --git a/mozilla/extensions/transformiix/source/xpath/NumberExpr.cpp b/mozilla/extensions/transformiix/source/xpath/NumberExpr.cpp index 14abfb02d85..e325cd93d0d 100644 --- a/mozilla/extensions/transformiix/source/xpath/NumberExpr.cpp +++ b/mozilla/extensions/transformiix/source/xpath/NumberExpr.cpp @@ -25,6 +25,8 @@ */ #include "Expr.h" +#include "ExprResult.h" +#include "primitives.h" //--------------/ //- NumberExpr -/ diff --git a/mozilla/extensions/transformiix/source/xpath/NumberFunctionCall.cpp b/mozilla/extensions/transformiix/source/xpath/NumberFunctionCall.cpp index f6bed476e7c..1021c928e80 100644 --- a/mozilla/extensions/transformiix/source/xpath/NumberFunctionCall.cpp +++ b/mozilla/extensions/transformiix/source/xpath/NumberFunctionCall.cpp @@ -35,6 +35,7 @@ #include "FunctionLib.h" #include +#include "NodeSet.h" #include "txAtoms.h" #include "txIXPathContext.h" #include "XMLDOMUtils.h" diff --git a/mozilla/extensions/transformiix/source/xpath/PathExpr.cpp b/mozilla/extensions/transformiix/source/xpath/PathExpr.cpp index fe907eedf59..0a0d0e8d0de 100644 --- a/mozilla/extensions/transformiix/source/xpath/PathExpr.cpp +++ b/mozilla/extensions/transformiix/source/xpath/PathExpr.cpp @@ -32,9 +32,10 @@ */ #include "Expr.h" -#include "XMLUtils.h" +#include "Nodeset.h" #include "txNodeSetContext.h" #include "txSingleNodeContext.h" +#include "XMLUtils.h" //------------/ //- PathExpr -/ diff --git a/mozilla/extensions/transformiix/source/xpath/PredicateList.cpp b/mozilla/extensions/transformiix/source/xpath/PredicateList.cpp index ddcc8c84b4a..6cc8064057e 100644 --- a/mozilla/extensions/transformiix/source/xpath/PredicateList.cpp +++ b/mozilla/extensions/transformiix/source/xpath/PredicateList.cpp @@ -24,6 +24,7 @@ */ #include "Expr.h" +#include "NodeSet.h" #include "txNodeSetContext.h" /* diff --git a/mozilla/extensions/transformiix/source/xpath/RelationalExpr.cpp b/mozilla/extensions/transformiix/source/xpath/RelationalExpr.cpp index f3fdd5a8fcb..8d5319e917d 100644 --- a/mozilla/extensions/transformiix/source/xpath/RelationalExpr.cpp +++ b/mozilla/extensions/transformiix/source/xpath/RelationalExpr.cpp @@ -28,6 +28,8 @@ */ #include "Expr.h" +#include "NodeSet.h" +#include "TxString.h" #include "XMLDOMUtils.h" //------------------/ diff --git a/mozilla/extensions/transformiix/source/xpath/RootExpr.cpp b/mozilla/extensions/transformiix/source/xpath/RootExpr.cpp index 948b0c65eac..f847aeee251 100644 --- a/mozilla/extensions/transformiix/source/xpath/RootExpr.cpp +++ b/mozilla/extensions/transformiix/source/xpath/RootExpr.cpp @@ -24,6 +24,7 @@ */ #include "Expr.h" +#include "NodeSet.h" #include "txIXPathContext.h" /** diff --git a/mozilla/extensions/transformiix/source/xpath/StringExpr.cpp b/mozilla/extensions/transformiix/source/xpath/StringExpr.cpp index e7096ee3dc3..0fef7f800ab 100644 --- a/mozilla/extensions/transformiix/source/xpath/StringExpr.cpp +++ b/mozilla/extensions/transformiix/source/xpath/StringExpr.cpp @@ -24,6 +24,7 @@ */ #include "Expr.h" +#include "ExprResult.h" /** * StringExpr diff --git a/mozilla/extensions/transformiix/source/xpath/StringFunctionCall.cpp b/mozilla/extensions/transformiix/source/xpath/StringFunctionCall.cpp index c6635c57fe8..50e2b53e507 100644 --- a/mozilla/extensions/transformiix/source/xpath/StringFunctionCall.cpp +++ b/mozilla/extensions/transformiix/source/xpath/StringFunctionCall.cpp @@ -29,11 +29,12 @@ * A representation of the XPath String funtions **/ +#include "ExprResult.h" #include "FunctionLib.h" -#include "XMLDOMUtils.h" -#include "XMLUtils.h" #include "txAtoms.h" #include "txIXPathContext.h" +#include "XMLDOMUtils.h" +#include "XMLUtils.h" #include /** diff --git a/mozilla/extensions/transformiix/source/xpath/UnaryExpr.cpp b/mozilla/extensions/transformiix/source/xpath/UnaryExpr.cpp index fbc5ea92825..18b47c6f6dc 100644 --- a/mozilla/extensions/transformiix/source/xpath/UnaryExpr.cpp +++ b/mozilla/extensions/transformiix/source/xpath/UnaryExpr.cpp @@ -24,6 +24,7 @@ */ #include "Expr.h" +#include "ExprResult.h" UnaryExpr::UnaryExpr(Expr* expr) { diff --git a/mozilla/extensions/transformiix/source/xpath/UnionExpr.cpp b/mozilla/extensions/transformiix/source/xpath/UnionExpr.cpp index 32074ec3bef..01f12f490d8 100644 --- a/mozilla/extensions/transformiix/source/xpath/UnionExpr.cpp +++ b/mozilla/extensions/transformiix/source/xpath/UnionExpr.cpp @@ -24,6 +24,7 @@ */ #include "Expr.h" +#include "NodeSet.h" //-------------/ //- UnionExpr -/ diff --git a/mozilla/extensions/transformiix/source/xpath/VariableRefExpr.cpp b/mozilla/extensions/transformiix/source/xpath/VariableRefExpr.cpp index 21000542674..48ef8502dd6 100644 --- a/mozilla/extensions/transformiix/source/xpath/VariableRefExpr.cpp +++ b/mozilla/extensions/transformiix/source/xpath/VariableRefExpr.cpp @@ -24,6 +24,7 @@ */ #include "Expr.h" +#include "NodeSet.h" #include "txAtoms.h" #include "txIXPathContext.h" diff --git a/mozilla/extensions/transformiix/source/xpath/nsXPathEvaluator.cpp b/mozilla/extensions/transformiix/source/xpath/nsXPathEvaluator.cpp index 2b7ffe54a7a..828067356ee 100644 --- a/mozilla/extensions/transformiix/source/xpath/nsXPathEvaluator.cpp +++ b/mozilla/extensions/transformiix/source/xpath/nsXPathEvaluator.cpp @@ -45,6 +45,7 @@ #include "nsXPathNSResolver.h" #include "nsXPathResult.h" #include "nsContentCID.h" +#include "Expr.h" #include "ExprParser.h" #include "nsDOMError.h" #include "txURIUtils.h" diff --git a/mozilla/extensions/transformiix/source/xpath/nsXPathExpression.cpp b/mozilla/extensions/transformiix/source/xpath/nsXPathExpression.cpp index a2e9407fa84..8689762f27b 100644 --- a/mozilla/extensions/transformiix/source/xpath/nsXPathExpression.cpp +++ b/mozilla/extensions/transformiix/source/xpath/nsXPathExpression.cpp @@ -39,6 +39,7 @@ #include "nsXPathExpression.h" #include "Expr.h" +#include "ExprResult.h" #include "nsDOMError.h" #include "nsIDOMCharacterData.h" #include "nsIDOMClassInfo.h" diff --git a/mozilla/extensions/transformiix/source/xpath/nsXPathResult.cpp b/mozilla/extensions/transformiix/source/xpath/nsXPathResult.cpp index 0dadb78e5a3..d64b6a24b14 100644 --- a/mozilla/extensions/transformiix/source/xpath/nsXPathResult.cpp +++ b/mozilla/extensions/transformiix/source/xpath/nsXPathResult.cpp @@ -38,6 +38,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsXPathResult.h" +#include "dom.h" #include "ExprResult.h" #include "NodeSet.h" #include "nsDOMError.h" diff --git a/mozilla/extensions/transformiix/source/xpath/txForwardContext.cpp b/mozilla/extensions/transformiix/source/xpath/txForwardContext.cpp index ac0131ab5f9..cfd0703f406 100644 --- a/mozilla/extensions/transformiix/source/xpath/txForwardContext.cpp +++ b/mozilla/extensions/transformiix/source/xpath/txForwardContext.cpp @@ -37,6 +37,7 @@ * ***** END LICENSE BLOCK ***** */ #include "txForwardContext.h" +#include "Nodeset.h" Node* txForwardContext::getContextNode() { diff --git a/mozilla/extensions/transformiix/source/xpath/txForwardContext.h b/mozilla/extensions/transformiix/source/xpath/txForwardContext.h index 41ecb67b0c3..a68d7c67589 100644 --- a/mozilla/extensions/transformiix/source/xpath/txForwardContext.h +++ b/mozilla/extensions/transformiix/source/xpath/txForwardContext.h @@ -41,6 +41,8 @@ #include "txIXPathContext.h" +class NodeSet; + class txForwardContext : public txIEvalContext { public: diff --git a/mozilla/extensions/transformiix/source/xpath/txIXPathContext.h b/mozilla/extensions/transformiix/source/xpath/txIXPathContext.h index 09f0a833b10..437318f017b 100644 --- a/mozilla/extensions/transformiix/source/xpath/txIXPathContext.h +++ b/mozilla/extensions/transformiix/source/xpath/txIXPathContext.h @@ -39,9 +39,15 @@ #ifndef __TX_I_XPATH_CONTEXT #define __TX_I_XPATH_CONTEXT -#include "Expr.h" +#include "baseutils.h" +#include "txAtom.h" #include "txError.h" +class ExprResult; +class FunctionCall; +class Node; +class String; + /* * txIParseContext * diff --git a/mozilla/extensions/transformiix/source/xpath/txNodeSetContext.cpp b/mozilla/extensions/transformiix/source/xpath/txNodeSetContext.cpp index 50569e4fdd1..a29dcd5c282 100644 --- a/mozilla/extensions/transformiix/source/xpath/txNodeSetContext.cpp +++ b/mozilla/extensions/transformiix/source/xpath/txNodeSetContext.cpp @@ -37,6 +37,7 @@ * ***** END LICENSE BLOCK ***** */ #include "txNodeSetContext.h" +#include "NodeSet.h" Node* txNodeSetContext::getContextNode() { diff --git a/mozilla/extensions/transformiix/source/xpath/txNodeSetContext.h b/mozilla/extensions/transformiix/source/xpath/txNodeSetContext.h index d9c6212e0be..e8a0c15170b 100644 --- a/mozilla/extensions/transformiix/source/xpath/txNodeSetContext.h +++ b/mozilla/extensions/transformiix/source/xpath/txNodeSetContext.h @@ -41,6 +41,8 @@ #include "txIXPathContext.h" +class NodeSet; + class txNodeSetContext : public txIEvalContext { public: diff --git a/mozilla/extensions/transformiix/source/xslt/functions/XSLTFunctions.h b/mozilla/extensions/transformiix/source/xslt/functions/XSLTFunctions.h index 702f0a4a696..14396dc3ac1 100644 --- a/mozilla/extensions/transformiix/source/xslt/functions/XSLTFunctions.h +++ b/mozilla/extensions/transformiix/source/xslt/functions/XSLTFunctions.h @@ -32,9 +32,8 @@ #define TRANSFRMX_XSLT_FUNCTIONS_H #include "Expr.h" -#include "TxString.h" #include "Map.h" -#include "ExprResult.h" +#include "NodeSet.h" class NamedMap; class ProcessorState; diff --git a/mozilla/extensions/transformiix/source/xslt/txPatternParser.cpp b/mozilla/extensions/transformiix/source/xslt/txPatternParser.cpp index 9216843e178..8b0bc1a2c31 100644 --- a/mozilla/extensions/transformiix/source/xslt/txPatternParser.cpp +++ b/mozilla/extensions/transformiix/source/xslt/txPatternParser.cpp @@ -36,10 +36,11 @@ * * ***** END LICENSE BLOCK ***** */ -#include "txXSLTPatterns.h" #include "txPatternParser.h" +#include "ExprLexer.h" #include "Names.h" #include "txAtoms.h" +#include "txXSLTPatterns.h" txPattern* txPatternParser::createPattern(const String& aPattern, txIParseContext* aContext, diff --git a/mozilla/extensions/transformiix/source/xslt/txRtfHandler.cpp b/mozilla/extensions/transformiix/source/xslt/txRtfHandler.cpp index 0f3b1bff067..b6a24b3d68d 100644 --- a/mozilla/extensions/transformiix/source/xslt/txRtfHandler.cpp +++ b/mozilla/extensions/transformiix/source/xslt/txRtfHandler.cpp @@ -37,6 +37,7 @@ * ***** END LICENSE BLOCK ***** */ #include "txRtfHandler.h" +#include "dom.h" txRtfHandler::txRtfHandler(Document* aDocument, txResultTreeFragment* aResultTreeFragment) : diff --git a/mozilla/extensions/transformiix/source/xslt/txRtfHandler.h b/mozilla/extensions/transformiix/source/xslt/txRtfHandler.h index a78cb2bc209..0e754522a52 100644 --- a/mozilla/extensions/transformiix/source/xslt/txRtfHandler.h +++ b/mozilla/extensions/transformiix/source/xslt/txRtfHandler.h @@ -42,6 +42,9 @@ #include "txXMLEventHandler.h" #include "NodeSet.h" +class Document; +class Node; + class txRtfHandler : public txXMLEventHandler { public: diff --git a/mozilla/extensions/transformiix/source/xslt/util/txXPathResultComparator.cpp b/mozilla/extensions/transformiix/source/xslt/util/txXPathResultComparator.cpp index cb2632fe721..0b74256a2d8 100644 --- a/mozilla/extensions/transformiix/source/xslt/util/txXPathResultComparator.cpp +++ b/mozilla/extensions/transformiix/source/xslt/util/txXPathResultComparator.cpp @@ -39,7 +39,8 @@ #include "txXPathResultComparator.h" #include "Expr.h" -#include "txNodeSorter.h" +#include "ExprResult.h" +#include "primitives.h" #ifndef TX_EXE #include "nsCollationCID.h" #include "nsILocale.h"