dbertoni 01/08/13 10:08:56
Modified: c/src/XSLT ElemApplyTemplates.cpp ElemApplyTemplates.hpp
ElemAttributeSet.cpp ElemAttributeSet.hpp
ElemCallTemplate.cpp ElemCallTemplate.hpp
ElemNumber.hpp ElemTemplate.cpp ElemTemplate.hpp
ElemTemplateElement.hpp ElemUse.cpp ElemUse.hpp
ElemVariable.cpp ElemVariable.hpp ElemWithParam.cpp
ElemWithParam.hpp ExtensionNSHandler.cpp
ExtensionNSHandler.hpp NamespacesHandler.cpp
NamespacesHandler.hpp ResultNamespacesStack.cpp
ResultNamespacesStack.hpp Stylesheet.cpp
Stylesheet.hpp StylesheetExecutionContext.hpp
StylesheetExecutionContextDefault.cpp
StylesheetExecutionContextDefault.hpp
StylesheetRoot.cpp StylesheetRoot.hpp
TopLevelArg.cpp TopLevelArg.hpp
TraceListenerDefault.cpp TracerEvent.hpp
VariablesStack.cpp VariablesStack.hpp
XSLTEngineImpl.cpp XSLTProcessor.hpp
XalanTemplate.cpp
Log:
Fixed QName collisions with Xerces.
Revision Changes Path
1.20 +2 -2 xml-xalan/c/src/XSLT/ElemApplyTemplates.cpp
Index: ElemApplyTemplates.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemApplyTemplates.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ElemApplyTemplates.cpp 2001/07/18 04:33:15 1.19
+++ ElemApplyTemplates.cpp 2001/08/13 17:08:52 1.20
@@ -102,7 +102,7 @@
break;
case Constants::TATTRNAME_MODE:
- m_mode = QNameByValue(atts.getValue(i),
getStylesheet().getNamespaces());
+ m_mode = XalanQNameByValue(atts.getValue(i),
getStylesheet().getNamespaces());
break;
default:
@@ -171,7 +171,7 @@
assert(executionContext.getCurrentMode() != 0);
- const QName* const currentMode =
executionContext.getCurrentMode();
+ const XalanQName* const currentMode =
executionContext.getCurrentMode();
if (m_isDefaultTemplate == false &&
!m_mode.equals(*currentMode))
1.11 +4 -4 xml-xalan/c/src/XSLT/ElemApplyTemplates.hpp
Index: ElemApplyTemplates.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemApplyTemplates.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemApplyTemplates.hpp 2001/03/09 16:20:08 1.10
+++ ElemApplyTemplates.hpp 2001/08/13 17:08:52 1.11
@@ -58,7 +58,7 @@
#define XALAN_ELEMAPPLYTEMPLATES_HEADER_GUARD
/**
- * $Id: ElemApplyTemplates.hpp,v 1.10 2001/03/09 16:20:08 auriemma Exp $
+ * $Id: ElemApplyTemplates.hpp,v 1.11 2001/08/13 17:08:52 dbertoni Exp $
*
* $State: Exp $
*
@@ -75,7 +75,7 @@
-#include <XPath/QNameByValue.hpp>
+#include <XPath/XalanQNameByValue.hpp>
@@ -139,9 +139,9 @@
private:
- bool m_isDefaultTemplate;
+ bool m_isDefaultTemplate;
- QNameByValue m_mode;
+ XalanQNameByValue m_mode;
};
1.15 +1 -1 xml-xalan/c/src/XSLT/ElemAttributeSet.cpp
Index: ElemAttributeSet.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemAttributeSet.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ElemAttributeSet.cpp 2001/07/18 04:33:15 1.14
+++ ElemAttributeSet.cpp 2001/08/13 17:08:52 1.15
@@ -91,7 +91,7 @@
if(equals(aname,Constants::ATTRNAME_NAME))
{
- m_QName = QNameByValue(atts.getValue(i),
stylesheetTree.getNamespaces());
+ m_QName = XalanQNameByValue(atts.getValue(i),
stylesheetTree.getNamespaces());
stylesheetTree.addAttributeSet(this);
}
1.12 +3 -3 xml-xalan/c/src/XSLT/ElemAttributeSet.hpp
Index: ElemAttributeSet.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemAttributeSet.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemAttributeSet.hpp 2001/06/25 15:20:01 1.11
+++ ElemAttributeSet.hpp 2001/08/13 17:08:53 1.12
@@ -69,7 +69,7 @@
-#include <XPath/QNameByValue.hpp>
+#include <XPath/XalanQNameByValue.hpp>
@@ -101,7 +101,7 @@
*
* @return qualified name
*/
- const QName&
+ const XalanQName&
getQName() const
{
return m_QName;
@@ -132,7 +132,7 @@
private:
- QNameByValue m_QName;
+ XalanQNameByValue m_QName;
};
1.19 +1 -1 xml-xalan/c/src/XSLT/ElemCallTemplate.cpp
Index: ElemCallTemplate.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCallTemplate.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ElemCallTemplate.cpp 2001/07/18 04:33:15 1.18
+++ ElemCallTemplate.cpp 2001/08/13 17:08:53 1.19
@@ -98,7 +98,7 @@
if(equals(aname, Constants::ATTRNAME_NAME))
{
- m_templateName = QNameByValue(atts.getValue(i),
getStylesheet().getNamespaces());
+ m_templateName = XalanQNameByValue(atts.getValue(i),
getStylesheet().getNamespaces());
}
else if(!isAttrOK(aname, atts, i, constructionContext))
{
1.14 +2 -2 xml-xalan/c/src/XSLT/ElemCallTemplate.hpp
Index: ElemCallTemplate.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCallTemplate.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ElemCallTemplate.hpp 2001/06/06 21:55:20 1.13
+++ ElemCallTemplate.hpp 2001/08/13 17:08:53 1.14
@@ -64,7 +64,7 @@
-#include <XPath/QNameByValue.hpp>
+#include <XPath/XalanQNameByValue.hpp>
@@ -133,7 +133,7 @@
operator=(const ElemCallTemplate&);
// Data members...
- QNameByValue m_templateName;
+ XalanQNameByValue m_templateName;
const ElemTemplate* m_template;
};
1.30 +0 -1 xml-xalan/c/src/XSLT/ElemNumber.hpp
Index: ElemNumber.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemNumber.hpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ElemNumber.hpp 2001/06/14 19:17:25 1.29
+++ ElemNumber.hpp 2001/08/13 17:08:53 1.30
@@ -80,7 +80,6 @@
class AVT;
class CountersTable;
-class QName;
class XalanNumberFormat;
class XPath;
class XPathExecutionContext;
1.18 +2 -2 xml-xalan/c/src/XSLT/ElemTemplate.cpp
Index: ElemTemplate.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplate.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ElemTemplate.cpp 2001/07/18 04:33:15 1.17
+++ ElemTemplate.cpp 2001/08/13 17:08:53 1.18
@@ -109,7 +109,7 @@
break;
case Constants::TATTRNAME_NAME:
- m_name = QNameByValue(atts.getValue(i),
getStylesheet().getNamespaces());
+ m_name = XalanQNameByValue(atts.getValue(i),
getStylesheet().getNamespaces());
break;
case Constants::TATTRNAME_PRIORITY:
@@ -121,7 +121,7 @@
break;
case Constants::TATTRNAME_MODE:
- m_mode = QNameByValue(atts.getValue(i),
getStylesheet().getNamespaces());
+ m_mode = XalanQNameByValue(atts.getValue(i),
getStylesheet().getNamespaces());
break;
case Constants::TATTRNAME_XMLSPACE:
1.12 +7 -7 xml-xalan/c/src/XSLT/ElemTemplate.hpp
Index: ElemTemplate.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplate.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemTemplate.hpp 2001/03/09 16:19:58 1.11
+++ ElemTemplate.hpp 2001/08/13 17:08:53 1.12
@@ -71,7 +71,7 @@
-#include <XPath/QNameByValue.hpp>
+#include <XPath/XalanQNameByValue.hpp>
@@ -107,7 +107,7 @@
*
* @return QName for element
*/
- const QName&
+ const XalanQName&
getName() const
{
return m_name;
@@ -118,7 +118,7 @@
*
* @return QName for mode
*/
- const QName&
+ const XalanQName&
getMode() const
{
return m_mode;
@@ -162,12 +162,12 @@
operator=(const ElemTemplate &);
// Data members...
- const XPath* m_matchPattern;
+ const XPath* m_matchPattern;
- QNameByValue m_name;
- QNameByValue m_mode;
+ XalanQNameByValue m_name;
+ XalanQNameByValue m_mode;
- double m_priority;
+ double m_priority;
};
1.35 +0 -1 xml-xalan/c/src/XSLT/ElemTemplateElement.hpp
Index: ElemTemplateElement.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplateElement.hpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ElemTemplateElement.hpp 2001/07/18 04:33:15 1.34
+++ ElemTemplateElement.hpp 2001/08/13 17:08:53 1.35
@@ -94,7 +94,6 @@
class NamespacesHandler;
class NodeRefListBase;
class NodeSorter;
-class QName;
class Stylesheet;
class StylesheetConstructionContext;
class StylesheetExecutionContext;
1.14 +1 -1 xml-xalan/c/src/XSLT/ElemUse.cpp
Index: ElemUse.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemUse.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ElemUse.cpp 2001/06/29 18:53:15 1.13
+++ ElemUse.cpp 2001/08/13 17:08:53 1.14
@@ -156,7 +156,7 @@
if(Constants::ELEMNAME_LITERALRESULT == getXSLToken())
{
- const QNameByValue qname(attrName,
getStylesheet().getNamespaces());
+ const XalanQNameByValue qname(attrName,
getStylesheet().getNamespaces());
isUAS = ((equals(qname.getNamespace(),
constructionContext.getXSLTNamespaceURI())) &&
1.14 +3 -3 xml-xalan/c/src/XSLT/ElemUse.hpp
Index: ElemUse.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemUse.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ElemUse.hpp 2001/06/29 18:53:17 1.13
+++ ElemUse.hpp 2001/08/13 17:08:53 1.14
@@ -69,7 +69,7 @@
-#include <XPath/QNameByValue.hpp>
+#include <XPath/XalanQNameByValue.hpp>
@@ -148,9 +148,9 @@
private:
#if defined(XALAN_NO_NAMESPACES)
- typedef vector<QNameByValue> QNameVectorType;
+ typedef vector<XalanQNameByValue> QNameVectorType;
#else
- typedef std::vector<QNameByValue> QNameVectorType;
+ typedef std::vector<XalanQNameByValue> QNameVectorType;
#endif
private:
1.20 +1 -1 xml-xalan/c/src/XSLT/ElemVariable.cpp
Index: ElemVariable.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemVariable.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ElemVariable.cpp 2001/07/18 04:33:15 1.19
+++ ElemVariable.cpp 2001/08/13 17:08:53 1.20
@@ -113,7 +113,7 @@
break;
case Constants::TATTRNAME_NAME:
- m_qname = QNameByValue(atts.getValue(i),
stylesheetTree.getNamespaces());
+ m_qname = XalanQNameByValue(atts.getValue(i),
stylesheetTree.getNamespaces());
break;
case Constants::TATTRNAME_XMLSPACE:
1.15 +4 -4 xml-xalan/c/src/XSLT/ElemVariable.hpp
Index: ElemVariable.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemVariable.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ElemVariable.hpp 2001/03/09 16:19:56 1.14
+++ ElemVariable.hpp 2001/08/13 17:08:53 1.15
@@ -58,7 +58,7 @@
#define XALAN_ELEMVARIABLE_HEADER_GUARD
/**
- * $Id: ElemVariable.hpp,v 1.14 2001/03/09 16:19:56 auriemma Exp $
+ * $Id: ElemVariable.hpp,v 1.15 2001/08/13 17:08:53 dbertoni Exp $
*
* $State: Exp $
*
@@ -74,7 +74,7 @@
-#include <XPath/QNameByValue.hpp>
+#include <XPath/XalanQNameByValue.hpp>
#include <XPath/XObject.hpp>
@@ -134,7 +134,7 @@
*
* @return qualified name of object
*/
- const QName&
+ const XalanQName&
getName() const
{
return m_qname;
@@ -155,7 +155,7 @@
protected:
- QNameByValue m_qname;
+ XalanQNameByValue m_qname;
private:
1.10 +1 -1 xml-xalan/c/src/XSLT/ElemWithParam.cpp
Index: ElemWithParam.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemWithParam.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemWithParam.cpp 2001/07/18 04:33:15 1.9
+++ ElemWithParam.cpp 2001/08/13 17:08:53 1.10
@@ -98,7 +98,7 @@
}
else if(equals(aname, Constants::ATTRNAME_NAME))
{
- m_qname = QNameByValue(atts.getValue(i),
stylesheetTree.getNamespaces());
+ m_qname = XalanQNameByValue(atts.getValue(i),
stylesheetTree.getNamespaces());
}
else if(!isAttrOK(aname, atts, i, constructionContext))
{
1.8 +4 -4 xml-xalan/c/src/XSLT/ElemWithParam.hpp
Index: ElemWithParam.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemWithParam.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemWithParam.hpp 2001/02/12 02:34:54 1.7
+++ ElemWithParam.hpp 2001/08/13 17:08:53 1.8
@@ -69,7 +69,7 @@
-#include <XPath/QNameByValue.hpp>
+#include <XPath/XalanQNameByValue.hpp>
@@ -101,7 +101,7 @@
*
* @return qualified name
*/
- const QName&
+ const XalanQName&
getQName() const
{
return m_qname;
@@ -130,9 +130,9 @@
operator=(const ElemWithParam&);
// Data members...
- const XPath* m_selectPattern;
+ const XPath* m_selectPattern;
- QNameByValue m_qname;
+ XalanQNameByValue m_qname;
};
1.10 +3 -3 xml-xalan/c/src/XSLT/ExtensionNSHandler.cpp
Index: ExtensionNSHandler.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ExtensionNSHandler.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ExtensionNSHandler.cpp 2000/11/21 21:10:05 1.9
+++ ExtensionNSHandler.cpp 2001/08/13 17:08:53 1.10
@@ -88,14 +88,14 @@
const Stylesheet& m_stylesheetTree;
const XalanNode* m_sourceTree;
const XalanNode* m_sourceNode;
- const QName& m_mode;
+ const XalanQName& m_mode;
XSLProcessorContext(
const XSLTProcessor& processor,
const Stylesheet& stylesheetTree,
const XalanNode* sourceTree,
const XalanNode* sourceNode,
- const QName& mode) :
+ const XalanQName& mode) :
m_processor(processor),
m_stylesheetTree(stylesheetTree),
m_sourceTree(sourceTree),
@@ -210,7 +210,7 @@
Stylesheet&
/* stylesheetTree */,
const XalanNode* /*
sourceTree */,
const XalanNode* /*
sourceNode */,
- const QName& /* mode
*/)
+ const XalanQName& /* mode
*/)
{
XObjectPtr result;
1.8 +3 -3 xml-xalan/c/src/XSLT/ExtensionNSHandler.hpp
Index: ExtensionNSHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ExtensionNSHandler.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ExtensionNSHandler.hpp 2000/08/22 20:21:21 1.7
+++ ExtensionNSHandler.hpp 2001/08/13 17:08:53 1.8
@@ -76,11 +76,11 @@
-class QName;
class Stylesheet;
+class StylesheetExecutionContext;
class XalanElement;
class XalanNode;
-class StylesheetExecutionContext;
+class XalanQName;
@@ -186,7 +186,7 @@
Stylesheet&
stylesheetTree,
const XalanNode*
sourceTree,
const XalanNode*
sourceNode,
- const QName& mode);
+ const XalanQName& mode);
protected:
1.11 +2 -2 xml-xalan/c/src/XSLT/NamespacesHandler.cpp
Index: NamespacesHandler.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/NamespacesHandler.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- NamespacesHandler.cpp 2001/05/14 22:21:10 1.10
+++ NamespacesHandler.cpp 2001/08/13 17:08:53 1.11
@@ -247,7 +247,7 @@
}
const XalanDOMString* const theNamespace =
- QName::getNamespaceForPrefix(theCurrentNamespaces,
thePrefix);
+ XalanQName::getNamespaceForPrefix(theCurrentNamespaces,
thePrefix);
if(theNamespace == 0)
{
@@ -284,7 +284,7 @@
}
const XalanDOMString* const theNamespace =
- QName::getNamespaceForPrefix(theCurrentNamespaces,
thePrefix);
+ XalanQName::getNamespaceForPrefix(theCurrentNamespaces,
thePrefix);
if(theNamespace == 0)
{
1.10 +3 -3 xml-xalan/c/src/XSLT/NamespacesHandler.hpp
Index: NamespacesHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/NamespacesHandler.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- NamespacesHandler.hpp 2001/06/29 18:50:35 1.9
+++ NamespacesHandler.hpp 2001/08/13 17:08:53 1.10
@@ -79,7 +79,7 @@
#include <XPath/NameSpace.hpp>
-#include <XPath/QName.hpp>
+#include <XPath/XalanQName.hpp>
@@ -160,8 +160,8 @@
XalanDOMString m_resultAttributeName;
};
- typedef QName::NamespaceVectorType
NamespaceVectorType;
- typedef QName::NamespacesStackType
NamespacesStackType;
+ typedef XalanQName::NamespaceVectorType
NamespaceVectorType;
+ typedef XalanQName::NamespacesStackType
NamespacesStackType;
#if defined(XALAN_NO_NAMESPACES)
typedef map<XalanDOMString,
1.6 +2 -2 xml-xalan/c/src/XSLT/ResultNamespacesStack.cpp
Index: ResultNamespacesStack.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ResultNamespacesStack.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ResultNamespacesStack.cpp 2001/06/06 21:52:49 1.5
+++ ResultNamespacesStack.cpp 2001/08/13 17:08:53 1.6
@@ -147,7 +147,7 @@
ResultNamespacesStack::getNamespaceForPrefix(const XalanDOMString&
thePrefix) const
{
// Search vector from first element back
- return QName::getNamespaceForPrefix(m_resultNamespaces, thePrefix,
true);
+ return XalanQName::getNamespaceForPrefix(m_resultNamespaces, thePrefix,
true);
}
@@ -156,7 +156,7 @@
ResultNamespacesStack::getPrefixForNamespace(const XalanDOMString&
theNamespaceURI) const
{
// Search vector from first element back
- return QName::getPrefixForNamespace(m_resultNamespaces,
theNamespaceURI, true);
+ return XalanQName::getPrefixForNamespace(m_resultNamespaces,
theNamespaceURI, true);
}
1.5 +4 -4 xml-xalan/c/src/XSLT/ResultNamespacesStack.hpp
Index: ResultNamespacesStack.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ResultNamespacesStack.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResultNamespacesStack.hpp 2001/05/14 01:03:11 1.4
+++ ResultNamespacesStack.hpp 2001/08/13 17:08:53 1.5
@@ -72,7 +72,7 @@
-#include <XPath/QName.hpp>
+#include <XPath/XalanQName.hpp>
@@ -86,10 +86,10 @@
typedef std::vector<bool> BoolVectorType;
#endif
- typedef QName::NamespaceVectorType NamespaceVectorType;
- typedef QName::NamespacesStackType NamespacesStackType;
+ typedef XalanQName::NamespaceVectorType NamespaceVectorType;
+ typedef XalanQName::NamespacesStackType NamespacesStackType;
- typedef NamespacesStackType::size_type size_type;
+ typedef NamespacesStackType::size_type size_type;
explicit
1.62 +8 -8 xml-xalan/c/src/XSLT/Stylesheet.cpp
Index: Stylesheet.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/Stylesheet.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- Stylesheet.cpp 2001/08/06 01:43:18 1.61
+++ Stylesheet.cpp 2001/08/13 17:08:53 1.62
@@ -89,7 +89,7 @@
#include <XPath/ElementPrefixResolverProxy.hpp>
#include <XPath/XObject.hpp>
#include <XPath/XPath.hpp>
-#include <XPath/QNameByReference.hpp>
+#include <XPath/XalanQNameByReference.hpp>
@@ -113,7 +113,7 @@
const XalanDOMString Stylesheet::s_emptyString;
-const QNameByReference Stylesheet::s_emptyQName;
+const XalanQNameByReference Stylesheet::s_emptyQName;
const XalanEmptyNamedNodeMap Stylesheet::s_fakeAttributes;
@@ -603,7 +603,7 @@
// If it's a named template, then we need to
// and it to the map of named templates.
- const QName& theName = theTemplate->getName();
+ const XalanQName& theName = theTemplate->getName();
if(theName.isEmpty() == false)
{
@@ -725,7 +725,7 @@
const ElemTemplate*
-Stylesheet::findNamedTemplate(const QName& qname) const
+Stylesheet::findNamedTemplate(const XalanQName& qname) const
{
ElemTemplateMapType::const_iterator it = m_namedTemplates.find(qname);
@@ -881,7 +881,7 @@
Stylesheet::findTemplate(
StylesheetExecutionContext& executionContext,
XalanNode*
targetNode,
- const QName& mode,
+ const XalanQName& mode,
bool
onlyUseImports) const
{
assert(targetNode != 0);
@@ -941,7 +941,7 @@
// We'll be needing to match rules
according to what
// mode we're in.
- const QName& ruleMode =
rule->getMode();
+ const XalanQName& ruleMode =
rule->getMode();
// The logic here should be that if we
are not in a mode AND
// the rule does not have a node, then
go ahead.
@@ -1391,7 +1391,7 @@
for(QNameVectorType::size_type j = 0; j < nNames; j++)
{
- const QName&
qname = attributeSetsNames[j];
+ const XalanQName& qname = attributeSetsNames[j];
assert(m_attributeSetsSize == m_attributeSets.size());
@@ -1852,7 +1852,7 @@
const XalanDOMString*
Stylesheet::getNamespaceForPrefix(const XalanDOMString& prefix) const
{
- return QName::getNamespaceForPrefix(m_namespaceDecls, prefix);
+ return XalanQName::getNamespaceForPrefix(m_namespaceDecls, prefix);
}
1.40 +12 -12 xml-xalan/c/src/XSLT/Stylesheet.hpp
Index: Stylesheet.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/Stylesheet.hpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Stylesheet.hpp 2001/08/06 01:43:18 1.39
+++ Stylesheet.hpp 2001/08/13 17:08:53 1.40
@@ -84,7 +84,7 @@
#include <XPath/NameSpace.hpp>
-#include <XPath/QNameByReference.hpp>
+#include <XPath/XalanQNameByReference.hpp>
@@ -134,16 +134,16 @@
typedef map<XalanDOMString,
ExtensionNSHandler*,
less<XalanDOMString> >
ExtensionNamespacesMapType;
- typedef map<QNameByReference,
+ typedef map<XalanQNameByReference,
ElemTemplate*,
- less<QName> >
ElemTemplateMapType;
+ less<XalanQName> >
ElemTemplateMapType;
typedef vector<ElemAttributeSet*>
AttributeSetVectorType;
typedef vector<ElemVariable*>
ElemVariableVectorType;
typedef vector<KeyDeclaration>
KeyDeclarationVectorType;
typedef map<const XalanNode*,
KeyTable*,
less<const XalanNode*> >
KeyTablesTableType;
- typedef vector<QNameByValue>
QNameVectorType;
+ typedef vector<XalanQNameByValue>
QNameVectorType;
typedef vector<Stylesheet*>
StylesheetVectorType;
typedef vector<XalanDOMString>
URLStackType;
typedef vector<const XPath*>
XPathVectorType;
@@ -151,12 +151,12 @@
#else
typedef std::map<XalanDOMString, XalanDOMString>
StringToStringMapType;
typedef std::map<XalanDOMString, ExtensionNSHandler*>
ExtensionNamespacesMapType;
- typedef std::map<QNameByReference, ElemTemplate*>
ElemTemplateMapType;
+ typedef std::map<XalanQNameByReference, ElemTemplate*>
ElemTemplateMapType;
typedef std::vector<ElemAttributeSet*>
AttributeSetVectorType;
typedef std::vector<ElemVariable*>
ElemVariableVectorType;
typedef std::vector<KeyDeclaration>
KeyDeclarationVectorType;
typedef std::map<const XalanNode*, KeyTable*>
KeyTablesTableType;
- typedef std::vector<QNameByValue>
QNameVectorType;
+ typedef std::vector<XalanQNameByValue>
QNameVectorType;
typedef std::vector<Stylesheet*>
StylesheetVectorType;
typedef std::vector<XalanDOMString>
URLStackType;
typedef std::vector<const XPath*>
XPathVectorType;
@@ -370,7 +370,7 @@
const XalanDOMString*
getNamespaceForPrefixFromStack(const XalanDOMString& prefix) const
{
- return QName::getNamespaceForPrefix(m_namespaces, prefix);
+ return XalanQName::getNamespaceForPrefix(m_namespaces, prefix);
}
/**
@@ -385,7 +385,7 @@
{
assert(prefix != 0);
- return QName::getNamespaceForPrefix(m_namespaces,
XalanDOMString(prefix));
+ return XalanQName::getNamespaceForPrefix(m_namespaces,
XalanDOMString(prefix));
}
/**
@@ -661,7 +661,7 @@
* @return pointer to template found or 0 if none found
*/
const ElemTemplate*
- findNamedTemplate(const QName& qname) const;
+ findNamedTemplate(const XalanQName& qname) const;
/**
* Given a target element, find the template that best matches in the
given
@@ -693,7 +693,7 @@
findTemplate(
StylesheetExecutionContext& executionContext,
XalanNode*
targetNode,
- const QName& mode,
+ const XalanQName& mode,
bool
onlyUseImports) const;
/**
@@ -1139,6 +1139,8 @@
*/
KeyDeclarationVectorType m_keyDeclarations;
+ static const XalanQNameByReference s_emptyQName;
+
private:
// Not defined...
@@ -1294,8 +1296,6 @@
NamespacesHandler
m_namespacesHandler;
static const XalanDOMString s_emptyString;
-
- static const QNameByReference s_emptyQName;
static const XalanEmptyNamedNodeMap s_fakeAttributes;
};
1.62 +10 -10 xml-xalan/c/src/XSLT/StylesheetExecutionContext.hpp
Index: StylesheetExecutionContext.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContext.hpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- StylesheetExecutionContext.hpp 2001/07/23 01:39:45 1.61
+++ StylesheetExecutionContext.hpp 2001/08/13 17:08:53 1.62
@@ -129,7 +129,7 @@
class NodeRefListBase;
class NodeSorter;
class PrintWriter;
-class QName;
+class XalanQName;
class SelectionEvent;
class Stylesheet;
class StylesheetRoot;
@@ -211,7 +211,7 @@
*
* @return QName for mode
*/
- virtual const QName*
+ virtual const XalanQName*
getCurrentMode() const = 0;
/**
@@ -220,7 +220,7 @@
* @param QName for mode
*/
virtual void
- setCurrentMode(const QName* theMode) = 0;
+ setCurrentMode(const XalanQName* theMode) = 0;
/**
* Whether diagnostic output is to be generated
@@ -554,7 +554,7 @@
*/
virtual void
pushVariable(
- const QName& name,
+ const XalanQName& name,
const ElemTemplateElement* element,
const XalanDOMString& str,
XalanNode*
contextNode,
@@ -573,7 +573,7 @@
*/
virtual void
pushVariable(
- const QName& name,
+ const XalanQName& name,
const ElemTemplateElement* element,
const XPath& xpath,
XalanNode*
contextNode,
@@ -590,7 +590,7 @@
*/
virtual void
pushVariable(
- const QName& name,
+ const XalanQName& name,
const ElemTemplateElement* element,
const ElemTemplateElement& templateChild,
XalanNode*
sourceNode) = 0;
@@ -605,7 +605,7 @@
*/
virtual void
pushVariable(
- const QName& name,
+ const XalanQName& name,
const XObjectPtr val,
const ElemTemplateElement* element) = 0;
@@ -619,7 +619,7 @@
*/
virtual void
pushVariable(
- const QName& name,
+ const XalanQName& name,
const ElemVariable* var,
const ElemTemplateElement* element) = 0;
@@ -714,7 +714,7 @@
* @return pointer to XObject for variable
*/
virtual const XObjectPtr
- getParamVariable(const QName& theName) = 0;
+ getParamVariable(const XalanQName& theName) = 0;
/**
* Push a frame marker for an element.
@@ -1658,7 +1658,7 @@
MutableNodeRefList& nodelist) = 0;
virtual const XObjectPtr
- getVariable(const QName& name) = 0;
+ getVariable(const XalanQName& name) = 0;
virtual const PrefixResolver*
getPrefixResolver() const = 0;
1.73 +10 -10
xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.cpp
Index: StylesheetExecutionContextDefault.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- StylesheetExecutionContextDefault.cpp 2001/08/06 01:42:01 1.72
+++ StylesheetExecutionContextDefault.cpp 2001/08/13 17:08:53 1.73
@@ -79,7 +79,7 @@
-#include <XPath/QNameByReference.hpp>
+#include <XPath/XalanQNameByReference.hpp>
#include <XPath/ResultTreeFragBase.hpp>
#include <XPath/XObjectFactory.hpp>
#include <XPath/XPath.hpp>
@@ -256,7 +256,7 @@
-const QName*
+const XalanQName*
StylesheetExecutionContextDefault::getCurrentMode() const
{
return m_mode;
@@ -265,7 +265,7 @@
void
-StylesheetExecutionContextDefault::setCurrentMode(const QName* theMode)
+StylesheetExecutionContextDefault::setCurrentMode(const XalanQName*
theMode)
{
m_mode = theMode;
}
@@ -574,7 +574,7 @@
void
StylesheetExecutionContextDefault::pushVariable(
- const QName& name,
+ const XalanQName& name,
const ElemTemplateElement* element,
const XalanDOMString& str,
XalanNode*
contextNode,
@@ -599,7 +599,7 @@
void
StylesheetExecutionContextDefault::pushVariable(
- const QName& name,
+ const XalanQName& name,
const XObjectPtr val,
const ElemTemplateElement* element)
{
@@ -610,7 +610,7 @@
void
StylesheetExecutionContextDefault::pushVariable(
- const QName& name,
+ const XalanQName& name,
const ElemVariable* var,
const ElemTemplateElement* element)
{
@@ -621,7 +621,7 @@
void
StylesheetExecutionContextDefault::pushVariable(
- const QName& name,
+ const XalanQName& name,
const ElemTemplateElement* element,
const XPath& xpath,
XalanNode*
contextNode,
@@ -634,7 +634,7 @@
void
StylesheetExecutionContextDefault::pushVariable(
- const QName& name,
+ const XalanQName& name,
const ElemTemplateElement* element,
const ElemTemplateElement& templateChild,
XalanNode*
sourceNode)
@@ -727,7 +727,7 @@
const XObjectPtr
-StylesheetExecutionContextDefault::getParamVariable(const QName& theName)
+StylesheetExecutionContextDefault::getParamVariable(const XalanQName&
theName)
{
bool fFound;
@@ -1642,7 +1642,7 @@
const XObjectPtr
-StylesheetExecutionContextDefault::getVariable(const QName& name)
+StylesheetExecutionContextDefault::getVariable(const XalanQName& name)
{
bool fFound;
1.65 +10 -10
xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.hpp
Index: StylesheetExecutionContextDefault.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.hpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- StylesheetExecutionContextDefault.hpp 2001/07/23 01:39:45 1.64
+++ StylesheetExecutionContextDefault.hpp 2001/08/13 17:08:53 1.65
@@ -270,11 +270,11 @@
virtual void
setStylesheetRoot(const StylesheetRoot* theStylesheet);
- virtual const QName*
+ virtual const XalanQName*
getCurrentMode() const;
virtual void
- setCurrentMode(const QName* theMode);
+ setCurrentMode(const XalanQName* theMode);
virtual bool
doDiagnosticsOutput() const;
@@ -370,7 +370,7 @@
virtual void
pushVariable(
- const QName& name,
+ const XalanQName& name,
const ElemTemplateElement* element,
const XalanDOMString& str,
XalanNode*
contextNode,
@@ -378,19 +378,19 @@
virtual void
pushVariable(
- const QName& name,
+ const XalanQName& name,
const XObjectPtr val,
const ElemTemplateElement* element);
virtual void
pushVariable(
- const QName& name,
+ const XalanQName& name,
const ElemVariable* var,
const ElemTemplateElement* element);
virtual void
pushVariable(
- const QName& name,
+ const XalanQName& name,
const ElemTemplateElement* element,
const XPath& xpath,
XalanNode*
contextNode,
@@ -398,7 +398,7 @@
virtual void
pushVariable(
- const QName& name,
+ const XalanQName& name,
const ElemTemplateElement* element,
const ElemTemplateElement& templateChild,
XalanNode*
sourceNode);
@@ -422,7 +422,7 @@
const ElemTemplateElement* targetTemplate);
virtual const XObjectPtr
- getParamVariable(const QName& theName);
+ getParamVariable(const XalanQName& theName);
virtual void
pushElementFrame(const ElemTemplateElement* elem);
@@ -829,7 +829,7 @@
MutableNodeRefList& nodelist);
virtual const XObjectPtr
- getVariable(const QName& name);
+ getVariable(const XalanQName& name);
virtual const PrefixResolver*
getPrefixResolver() const;
@@ -1069,7 +1069,7 @@
mutable XalanAutoPtr<XalanSourceTreeDocument>
m_sourceTreeResultTreeFactory;
// Holds the current mode.
- const QName* m_mode;
+ const XalanQName* m_mode;
typedef XalanObjectCacheDefault<FormatterToText>
FormatterToTextCacheType;
typedef XalanObjectCacheDefault<FormatterToSourceTree>
FormatterToSourceTreeCacheType;
1.52 +5 -7 xml-xalan/c/src/XSLT/StylesheetRoot.cpp
Index: StylesheetRoot.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetRoot.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- StylesheetRoot.cpp 2001/07/27 05:38:48 1.51
+++ StylesheetRoot.cpp 2001/08/13 17:08:53 1.52
@@ -94,7 +94,7 @@
-#include <XPath/QNameByReference.hpp>
+#include <XPath/XalanQNameByReference.hpp>
#include <XPath/XPathFactory.hpp>
#include <XPath/XPathProcessor.hpp>
@@ -189,7 +189,7 @@
sort(
m_cdataSectionElems.begin(),
m_cdataSectionElems.end(),
- less<QName>());
+ less<XalanQName>());
if (m_cdataSectionElems.size() != 0)
{
@@ -246,10 +246,8 @@
executionContext.startDocument();
- const QNameByValue theDefaultMode;
+ executionContext.setCurrentMode(&s_emptyQName);
- executionContext.setCurrentMode(&theDefaultMode);
-
XPathExecutionContext::CurrentNodeSetAndRestore
theCurrentNodeSetAndRestore(executionContext, sourceTree);
// Output the action of the found root rule. All processing
@@ -492,7 +490,7 @@
--theTokenCount;
-
m_cdataSectionElems.push_back(QNameByValue(theToken, getNamespaces()));
+
m_cdataSectionElems.push_back(XalanQNameByValue(theToken, getNamespaces()));
}
assert(theTokenizer.hasMoreTokens() == false);
@@ -610,7 +608,7 @@
bool
-StylesheetRoot::isCDATASectionElementName(const QName& theQName) const
+StylesheetRoot::isCDATASectionElementName(const XalanQName&
theQName) const
{
#if !defined(XALAN_NO_NAMESPACES)
using std::find;
1.16 +1 -1 xml-xalan/c/src/XSLT/StylesheetRoot.hpp
Index: StylesheetRoot.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetRoot.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- StylesheetRoot.hpp 2001/06/29 18:53:20 1.15
+++ StylesheetRoot.hpp 2001/08/13 17:08:53 1.16
@@ -419,7 +419,7 @@
* @return true or false
*/
bool
- isCDATASectionElementName(const QName& theQName) const;
+ isCDATASectionElementName(const XalanQName& theQName) const;
/**
* Given a valid element key, return the corresponding node list.
1.4 +2 -2 xml-xalan/c/src/XSLT/TopLevelArg.cpp
Index: TopLevelArg.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/TopLevelArg.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TopLevelArg.cpp 2000/11/21 21:10:22 1.3
+++ TopLevelArg.cpp 2001/08/13 17:08:53 1.4
@@ -63,7 +63,7 @@
TopLevelArg::TopLevelArg(
- const QName& name,
+ const XalanQName& name,
const XalanDOMString& expr) :
m_qname(name),
m_expression(expr),
@@ -74,7 +74,7 @@
TopLevelArg::TopLevelArg(
- const QName& name,
+ const XalanQName& name,
const XObjectPtr variable) :
m_qname(name),
m_expression(),
1.6 +5 -5 xml-xalan/c/src/XSLT/TopLevelArg.hpp
Index: TopLevelArg.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/TopLevelArg.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TopLevelArg.hpp 2001/04/10 22:52:04 1.5
+++ TopLevelArg.hpp 2001/08/13 17:08:53 1.6
@@ -73,7 +73,7 @@
-#include <XPath/QNameByValue.hpp>
+#include <XPath/XalanQNameByValue.hpp>
#include <XPath/XObject.hpp>
@@ -96,7 +96,7 @@
* @param expr expression argument represents
*/
TopLevelArg(
- const QName& name,
+ const XalanQName& name,
const XalanDOMString& expr);
/**
@@ -106,7 +106,7 @@
* @param variable the XObject instance.
*/
TopLevelArg(
- const QName& name = QNameByValue(),
+ const XalanQName& name = XalanQNameByValue(),
const XObjectPtr variable = XObjectPtr());
/**
@@ -126,7 +126,7 @@
*
* @return qualified name of object
*/
- const QName&
+ const XalanQName&
getName() const
{
return m_qname;
@@ -172,7 +172,7 @@
private:
- QNameByValue m_qname;
+ XalanQNameByValue m_qname;
XalanDOMString m_expression;
1.10 +1 -1 xml-xalan/c/src/XSLT/TraceListenerDefault.cpp
Index: TraceListenerDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/TraceListenerDefault.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TraceListenerDefault.cpp 2001/08/09 20:32:23 1.9
+++ TraceListenerDefault.cpp 2001/08/13 17:08:53 1.10
@@ -160,7 +160,7 @@
m_printWriter.print(XALAN_STATIC_UCODE_STRING("\" "));
}
- const QName& theName = et.getName();
+ const XalanQName& theName = et.getName();
if(theName.isEmpty() == false)
{
1.8 +1 -1 xml-xalan/c/src/XSLT/TracerEvent.hpp
Index: TracerEvent.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/TracerEvent.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TracerEvent.hpp 2001/03/09 16:19:54 1.7
+++ TracerEvent.hpp 2001/08/13 17:08:53 1.8
@@ -71,7 +71,7 @@
class XalanNode;
class XalanNodeList;
-class QName;
+class XalanQName;
class StylesheetExecutionContext;
class ElemTemplateElement;
1.19 +8 -8 xml-xalan/c/src/XSLT/VariablesStack.cpp
Index: VariablesStack.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/VariablesStack.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- VariablesStack.cpp 2001/07/12 04:44:17 1.18
+++ VariablesStack.cpp 2001/08/13 17:08:53 1.19
@@ -284,7 +284,7 @@
void
VariablesStack::pushVariable(
- const QName& name,
+ const XalanQName& name,
const ElemVariable* var,
const ElemTemplateElement* e)
{
@@ -300,7 +300,7 @@
void
VariablesStack::pushVariable(
- const QName& name,
+ const XalanQName& name,
const XObjectPtr& val,
const ElemTemplateElement* e)
{
@@ -372,7 +372,7 @@
const XObjectPtr
VariablesStack::findXObject(
- const QName& name,
+ const XalanQName& name,
StylesheetExecutionContext&
executionContext,
bool
fIsParam,
bool
fSearchGlobalSpace,
@@ -433,9 +433,9 @@
VariablesStack::StackEntry*
VariablesStack::findEntry(
- const QName& qname,
- bool fIsParam,
- bool fSearchGlobalSpace)
+ const XalanQName& qname,
+ bool fIsParam,
+ bool fSearchGlobalSpace)
{
StackEntry* theResult = 0;
@@ -588,7 +588,7 @@
VariablesStack::StackEntry::StackEntry(
- const QName* name,
+ const XalanQName* name,
const XObjectPtr& val,
bool isParam) :
m_type(isParam == true ? eParam : eVariable),
@@ -602,7 +602,7 @@
VariablesStack::StackEntry::StackEntry(
- const QName* name,
+ const XalanQName* name,
const ElemVariable* var,
bool isParam) :
m_type(isParam == true ? eParam : eVariable),
1.14 +16 -16 xml-xalan/c/src/XSLT/VariablesStack.hpp
Index: VariablesStack.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/VariablesStack.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- VariablesStack.hpp 2001/07/12 04:44:18 1.13
+++ VariablesStack.hpp 2001/08/13 17:08:54 1.14
@@ -69,7 +69,7 @@
-#include <XPath/QName.hpp>
+#include <XPath/XalanQName.hpp>
#include <XPath/XObject.hpp>
@@ -150,7 +150,7 @@
}
ParamsVectorEntry(
- const QName* qname,
+ const XalanQName* qname,
const XObjectPtr value) :
m_qname(qname),
m_value(value),
@@ -159,7 +159,7 @@
}
ParamsVectorEntry(
- const QName* qname,
+ const XalanQName* qname,
const ElemVariable* variable) :
m_qname(qname),
m_value(),
@@ -167,7 +167,7 @@
{
}
- const QName* m_qname;
+ const XalanQName* m_qname;
XObjectPtr m_value;
@@ -204,7 +204,7 @@
*/
const XObjectPtr
getParamVariable(
- const QName& qname,
+ const XalanQName& qname,
StylesheetExecutionContext&
executionContext,
bool&
fNameFound)
{
@@ -224,7 +224,7 @@
*/
const XObjectPtr
getVariable(
- const QName& qname,
+ const XalanQName& qname,
StylesheetExecutionContext&
executionContext,
bool&
fNameFound)
{
@@ -242,7 +242,7 @@
*/
void
pushVariable(
- const QName& name,
+ const XalanQName& name,
const ElemVariable* var,
const ElemTemplateElement* e);
@@ -257,7 +257,7 @@
*/
void
pushVariable(
- const QName& name,
+ const XalanQName& name,
const XObjectPtr& val,
const ElemTemplateElement* e);
@@ -425,7 +425,7 @@
* Construct a variable that is already evaluated.
*/
StackEntry(
- const QName* name,
+ const XalanQName* name,
const XObjectPtr& val,
bool isParam = false);
@@ -433,7 +433,7 @@
* Construct a variable that has not been evaluated yet.
*/
StackEntry(
- const QName* name,
+ const XalanQName* name,
const ElemVariable* var,
bool isParam =
false);
@@ -469,7 +469,7 @@
*
* @return qualified name of object
*/
- const QName*
+ const XalanQName*
getName() const
{
return m_qname;
@@ -536,7 +536,7 @@
// Data members...
eType m_type;
- const QName* m_qname;
+ const XalanQName* m_qname;
XObjectPtr m_value;
@@ -556,7 +556,7 @@
const XObjectPtr
findXObject(
- const QName& name,
+ const XalanQName& name,
StylesheetExecutionContext&
executionContext,
bool
fIsParam,
bool
fSearchGlobalSpace,
@@ -564,9 +564,9 @@
StackEntry*
findEntry(
- const QName& name,
- bool fIsParam,
- bool fSearchGlobalSpace);
+ const XalanQName& name,
+ bool fIsParam,
+ bool fSearchGlobalSpace);
VariableStackStackType m_stack;
1.111 +6 -6 xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp
Index: XSLTEngineImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- XSLTEngineImpl.cpp 2001/07/27 05:42:24 1.110
+++ XSLTEngineImpl.cpp 2001/08/13 17:08:54 1.111
@@ -109,7 +109,7 @@
#include <XPath/ElementPrefixResolverProxy.hpp>
-#include <XPath/QNameByReference.hpp>
+#include <XPath/XalanQNameByReference.hpp>
#include <XPath/ResultTreeFrag.hpp>
#include <XPath/XObject.hpp>
#include <XPath/XObjectFactory.hpp>
@@ -2372,7 +2372,7 @@
if(indexOfNSSep == length(elementName))
{
- fResult =
m_stylesheetRoot->isCDATASectionElementName(QNameByReference(s_emptyString,
elementName));
+ fResult =
m_stylesheetRoot->isCDATASectionElementName(XalanQNameByReference(s_emptyString,
elementName));
}
else
{
@@ -2390,7 +2390,7 @@
if(equals(prefix, DOMServices::s_XMLString))
{
fResult =
-
m_stylesheetRoot->isCDATASectionElementName(QNameByReference(DOMServices::s_XMLNamespaceURI,
elementName));
+
m_stylesheetRoot->isCDATASectionElementName(XalanQNameByReference(DOMServices::s_XMLNamespaceURI,
elementName));
}
else
{
@@ -2404,7 +2404,7 @@
else
{
fResult =
-
m_stylesheetRoot->isCDATASectionElementName(QNameByReference(*elemNS,
elementName));
+
m_stylesheetRoot->isCDATASectionElementName(XalanQNameByReference(*elemNS,
elementName));
}
}
}
@@ -2980,7 +2980,7 @@
const XalanDOMString& theName,
const XalanDOMString& expression)
{
- const QNameByValue qname(theName, 0, m_xpathEnvSupport,
m_domSupport);
+ const XalanQNameByValue qname(theName, 0, m_xpathEnvSupport,
m_domSupport);
m_topLevelParams.push_back(ParamVectorType::value_type(qname,
expression));
}
@@ -2992,7 +2992,7 @@
const XalanDOMString& theName,
XObjectPtr theValue)
{
- const QNameByValue qname(theName, 0, m_xpathEnvSupport,
m_domSupport);
+ const XalanQNameByValue qname(theName, 0, m_xpathEnvSupport,
m_domSupport);
m_topLevelParams.push_back(ParamVectorType::value_type(qname,
theValue));
}
1.24 +0 -1 xml-xalan/c/src/XSLT/XSLTProcessor.hpp
Index: XSLTProcessor.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTProcessor.hpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- XSLTProcessor.hpp 2001/07/12 05:06:05 1.23
+++ XSLTProcessor.hpp 2001/08/13 17:08:54 1.24
@@ -78,7 +78,6 @@
class NodeRefListBase;
class PrefixResolver;
class PrintWriter;
-class QName;
class ResultTreeFragBase;
class SelectionEvent;
class StylesheetConstructionContext;
1.30 +1 -1 xml-xalan/c/src/XSLT/XalanTemplate.cpp
Index: XalanTemplate.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanTemplate.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- XalanTemplate.cpp 2001/07/27 05:40:13 1.29
+++ XalanTemplate.cpp 2001/08/13 17:08:54 1.30
@@ -461,7 +461,7 @@
sort(
theVector.begin(),
theVector.end(),
- less<QName>());
+ less<XalanQName>());
}
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
