dbertoni 2002/11/25 16:44:39
Modified: c/src/XercesParserLiaison XercesBridgeTypes.hpp
XercesDocumentBridge.cpp XercesDocumentBridge.hpp
XercesDocumentTypeBridge.cpp
XercesDocumentTypeBridge.hpp
XercesDocumentTypeWrapper.cpp
XercesDocumentTypeWrapper.hpp
XercesDocumentWrapper.cpp XercesDocumentWrapper.hpp
XercesWrapperTypes.hpp
Log:
Fixed typedefs.
Revision Changes Path
1.2 +2 -1 xml-xalan/c/src/XercesParserLiaison/XercesBridgeTypes.hpp
Index: XercesBridgeTypes.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesBridgeTypes.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesBridgeTypes.hpp 22 Nov 2002 01:12:49 -0000 1.1
+++ XercesBridgeTypes.hpp 26 Nov 2002 00:44:38 -0000 1.2
@@ -69,6 +69,7 @@
XALAN_DECLARE_XERCES_CLASS(DOM_CDATASection)
XALAN_DECLARE_XERCES_CLASS(DOM_Document)
XALAN_DECLARE_XERCES_CLASS(DOM_DocumentFragment)
+XALAN_DECLARE_XERCES_CLASS(DOM_DocumentType)
XALAN_DECLARE_XERCES_CLASS(DOM_DOMImplementation)
XALAN_DECLARE_XERCES_CLASS(DOM_Element)
XALAN_DECLARE_XERCES_CLASS(DOM_Entity)
@@ -98,6 +99,7 @@
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_CharacterData
DOM_CharacterDataType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Comment
DOM_CommentType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_CDATASection
DOM_CDATASectionType;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DocumentType
DOM_DocTypeType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Document
DOM_DocumentType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DocumentFragment
DOM_DocumentFragmentType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DOMImplementation
DOM_DOMImplementationType;
@@ -111,7 +113,6 @@
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Notation
DOM_NotationType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_ProcessingInstruction
DOM_ProcessingInstructionType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Text
DOM_TextType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DocumentType
DOM_DocumentTypeType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DOMException
DOM_DOMExceptionType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER AttrImpl
AttrImplType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER ElementImpl
ElementImplType;
1.27 +9 -9
xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.cpp
Index: XercesDocumentBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- XercesDocumentBridge.cpp 22 Nov 2002 01:12:49 -0000 1.26
+++ XercesDocumentBridge.cpp 26 Nov 2002 00:44:38 -0000 1.27
@@ -332,9 +332,9 @@
XercesDocumentTypeBridge*
XercesDocumentBridge::createBridgeNode(
- const DOM_DocumentTypeType& theDoctype,
- unsigned long
theIndex,
- bool
mapNode) const
+ const DOM_DocTypeType& theDoctype,
+ unsigned long theIndex,
+ bool mapNode) const
{
// This is a special case, since there is only one
// doctype node allowed...
@@ -873,11 +873,11 @@
case DOM_NodeType::DOCUMENT_TYPE_NODE:
{
- const DOM_DocumentTypeType& theDoctypeNode =
+ const DOM_DocTypeType& theDoctypeNode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const
DOM_DocumentTypeType&)theXercesNode;
+ (const
DOM_DocTypeType&)theXercesNode;
#else
- static_cast<const
DOM_DocumentTypeType&>(theXercesNode);
+ static_cast<const
DOM_DocTypeType&>(theXercesNode);
#endif
theNewNode = createBridgeNode(theDoctypeNode, theIndex,
mapNode);
@@ -1678,11 +1678,11 @@
if (theType == DOM_NodeType::DOCUMENT_TYPE_NODE)
{
// Special case for doctype -- we have to build its entities...
- const DOM_DocumentTypeType& theDoctype =
+ const DOM_DocTypeType& theDoctype =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const DOM_DocumentTypeType&)node;
+ (const DOM_DocTypeType&)node;
#else
- static_cast<const DOM_DocumentTypeType&>(node);
+ static_cast<const DOM_DocTypeType&>(node);
#endif
const DOM_NamedNodeMapType theEntities =
1.23 +3 -3
xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.hpp
Index: XercesDocumentBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.hpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- XercesDocumentBridge.hpp 25 Nov 2002 21:26:07 -0000 1.22
+++ XercesDocumentBridge.hpp 26 Nov 2002 00:44:38 -0000 1.23
@@ -496,9 +496,9 @@
XercesDocumentTypeBridge*
createBridgeNode(
- const DOM_DocumentTypeType& theDoctype,
- unsigned long
theIndex,
- bool
mapNode) const;
+ const DOM_DocTypeType& theDoctype,
+ unsigned long theIndex,
+ bool mapNode) const;
XercesElementBridge*
createBridgeNode(
1.8 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeBridge.cpp
Index: XercesDocumentTypeBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeBridge.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesDocumentTypeBridge.cpp 22 Nov 2002 01:12:49 -0000 1.7
+++ XercesDocumentTypeBridge.cpp 26 Nov 2002 00:44:38 -0000 1.8
@@ -73,7 +73,7 @@
XercesDocumentTypeBridge::XercesDocumentTypeBridge(
- const DOM_DocumentTypeType&
theXercesDOMDocumentType,
+ const DOM_DocTypeType&
theXercesDOMDocumentType,
const XercesBridgeNavigator& theNavigator) :
XalanDocumentType(),
m_xercesNode(theXercesDOMDocumentType),
1.9 +4 -5
xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeBridge.hpp
Index: XercesDocumentTypeBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeBridge.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XercesDocumentTypeBridge.hpp 22 Nov 2002 01:12:49 -0000 1.8
+++ XercesDocumentTypeBridge.hpp 26 Nov 2002 00:44:38 -0000 1.9
@@ -75,6 +75,7 @@
+#include <XercesParserLiaison/XercesBridgeTypes.hpp>
#include <XercesParserLiaison/XercesNamedNodeMapBridge.hpp>
@@ -92,10 +93,8 @@
{
public:
- typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DocumentType
DOM_DocumentTypeType;
-
XercesDocumentTypeBridge(
- const DOM_DocumentTypeType&
theXercesDOMDocumentType,
+ const DOM_DocTypeType&
theXercesDOMDocumentType,
const XercesBridgeNavigator& theNavigator);
virtual
@@ -500,7 +499,7 @@
*
* @return The Xerces node
*/
- DOM_DocumentTypeType
+ DOM_DocTypeType
getXercesNode() const
{
return m_xercesNode;
@@ -520,7 +519,7 @@
operator==(const XercesDocumentTypeBridge& theRHS) const;
// Data members...
- DOM_DocumentTypeType m_xercesNode;
+ DOM_DocTypeType m_xercesNode;
XercesNamedNodeMapBridge m_entities;
1.3 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeWrapper.cpp
Index: XercesDocumentTypeWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeWrapper.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesDocumentTypeWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.2
+++ XercesDocumentTypeWrapper.cpp 26 Nov 2002 00:44:38 -0000 1.3
@@ -78,7 +78,7 @@
XercesDocumentTypeWrapper::XercesDocumentTypeWrapper(
- const DOMDocumentTypeType*
theXercesDOMDocumentType,
+ const DOMDocTypeType*
theXercesDOMDocumentType,
const XercesWrapperNavigator& theNavigator) :
XalanDocumentType(),
m_xercesNode(theXercesDOMDocumentType),
1.3 +6 -6
xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeWrapper.hpp
Index: XercesDocumentTypeWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeWrapper.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesDocumentTypeWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
+++ XercesDocumentTypeWrapper.hpp 26 Nov 2002 00:44:38 -0000 1.3
@@ -86,7 +86,7 @@
public:
XercesDocumentTypeWrapper(
- const DOMDocumentTypeType*
theXercesDOMDocumentType,
+ const DOMDocTypeType*
theXercesDOMDocumentType,
const XercesWrapperNavigator& theNavigator);
virtual
@@ -491,7 +491,7 @@
*
* @return The Xerces node
*/
- const DOMDocumentTypeType*
+ const DOMDocTypeType*
getXercesNode() const
{
return m_xercesNode;
@@ -511,13 +511,13 @@
operator==(const XercesDocumentTypeWrapper& theRHS) const;
// Data members...
- const DOMDocumentTypeType* const m_xercesNode;
+ const DOMDocTypeType* const m_xercesNode;
- XercesNamedNodeMapWrapper m_entities;
+ XercesNamedNodeMapWrapper m_entities;
- XercesNamedNodeMapWrapper m_notations;
+ XercesNamedNodeMapWrapper m_notations;
- const XercesWrapperNavigator& m_navigator;
+ const XercesWrapperNavigator& m_navigator;
};
1.5 +9 -9
xml-xalan/c/src/XercesParserLiaison/XercesDocumentWrapper.cpp
Index: XercesDocumentWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentWrapper.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XercesDocumentWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.4
+++ XercesDocumentWrapper.cpp 26 Nov 2002 00:44:38 -0000 1.5
@@ -330,9 +330,9 @@
XercesDocumentTypeWrapper*
XercesDocumentWrapper::createWrapperNode(
- const DOMDocumentTypeType* theDoctype,
- unsigned long theIndex,
- bool
mapNode) const
+ const DOMDocTypeType* theDoctype,
+ unsigned long theIndex,
+ bool mapNode) const
{
// This is a special case, since there is only one
// doctype node allowed...
@@ -826,11 +826,11 @@
case DOMNodeType::DOCUMENT_TYPE_NODE:
{
- const DOMDocumentTypeType* theDoctypeNode =
+ const DOMDocTypeType* theDoctypeNode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const
DOMDocumentTypeType*)theXercesNode;
+ (const
DOMDocTypeType*)theXercesNode;
#else
- static_cast<const
DOMDocumentTypeType*>(theXercesNode);
+ static_cast<const
DOMDocTypeType*>(theXercesNode);
#endif
theNewNode = createWrapperNode(theDoctypeNode,
theIndex, mapNode);
@@ -1447,11 +1447,11 @@
if (theType == DOMNodeType::DOCUMENT_TYPE_NODE)
{
// Special case for doctype -- we have to build its entities...
- const DOMDocumentTypeType* const theDoctype =
+ const DOMDocTypeType* const theDoctype =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const DOMDocumentTypeType*)node;
+ (const DOMDocTypeType*)node;
#else
- static_cast<const DOMDocumentTypeType*>(node);
+ static_cast<const DOMDocTypeType*>(node);
#endif
const DOMNamedNodeMapType* const theEntities =
1.3 +3 -3
xml-xalan/c/src/XercesParserLiaison/XercesDocumentWrapper.hpp
Index: XercesDocumentWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentWrapper.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesDocumentWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
+++ XercesDocumentWrapper.hpp 26 Nov 2002 00:44:38 -0000 1.3
@@ -476,9 +476,9 @@
XercesDocumentTypeWrapper*
createWrapperNode(
- const DOMDocumentTypeType* theDoctype,
- unsigned long theIndex,
- bool
mapNode) const;
+ const DOMDocTypeType* theDoctype,
+ unsigned long theIndex,
+ bool mapNode) const;
XercesElementWrapper*
createWrapperNode(
1.2 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesWrapperTypes.hpp
Index: XercesWrapperTypes.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesWrapperTypes.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesWrapperTypes.hpp 22 Nov 2002 01:12:49 -0000 1.1
+++ XercesWrapperTypes.hpp 26 Nov 2002 00:44:38 -0000 1.2
@@ -93,6 +93,7 @@
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMCharacterData
DOMCharacterDataType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMComment
DOMCommentType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMCDATASection
DOMCDATASectionType;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMDocumentType
DOMDocTypeType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument
DOMDocumentType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMDocumentFragment
DOMDocumentFragmentType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMImplementation
DOMImplementationType;
@@ -106,7 +107,6 @@
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMNotation
DOMNotationType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMProcessingInstruction
DOMProcessingInstructionType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMText
DOMTextType;
-typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMDocumentType
DOMDocumentTypeType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMException
DOMExceptionType;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
