tng 2002/09/26 10:26:05 Modified: c/src/xercesc/dom/impl DOMAttrImpl.cpp DOMCDATASectionImpl.cpp DOMCommentImpl.cpp DOMDocumentFragmentImpl.cpp DOMDocumentImpl.cpp DOMDocumentTypeImpl.cpp DOMElementImpl.cpp DOMEntityImpl.cpp DOMEntityReferenceImpl.cpp DOMNodeImpl.cpp DOMNodeImpl.hpp DOMNotationImpl.cpp DOMParentNode.cpp DOMParentNode.hpp DOMProcessingInstructionImpl.cpp DOMTextImpl.cpp Log: DOM L3: Add const to isSameNode, isEqualNode, compareTreePosition. Patch from Gareth Reakes Revision Changes Path 1.11 +4 -4 xml-xerces/c/src/xercesc/dom/impl/DOMAttrImpl.cpp Index: DOMAttrImpl.cpp =================================================================== RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMAttrImpl.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- DOMAttrImpl.cpp 23 Sep 2002 20:02:31 -0000 1.10 +++ DOMAttrImpl.cpp 26 Sep 2002 17:26:04 -0000 1.11 @@ -340,13 +340,13 @@ {return fNode.isSupported (feature, version); }; void DOMAttrImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }; bool DOMAttrImpl::hasAttributes() const {return fNode.hasAttributes(); }; - bool DOMAttrImpl::isSameNode(const DOMNode* other) {return fNode.isSameNode(other); }; - bool DOMAttrImpl::isEqualNode(const DOMNode* arg) {return fParent.isEqualNode(arg); }; + bool DOMAttrImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }; + bool DOMAttrImpl::isEqualNode(const DOMNode* arg) const {return fParent.isEqualNode(arg); }; void* DOMAttrImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler) {return fNode.setUserData(key, data, handler); }; void* DOMAttrImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }; const XMLCh* DOMAttrImpl::getBaseURI() const {return fNode.getBaseURI(); }; - short DOMAttrImpl::compareTreePosition(DOMNode* other) {return fNode.compareTreePosition(other); }; + short DOMAttrImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }; const XMLCh* DOMAttrImpl::getTextContent() const {return fNode.getTextContent(); }; void DOMAttrImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }; const XMLCh* DOMAttrImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }; 1.11 +4 -4 xml-xerces/c/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp Index: DOMCDATASectionImpl.cpp =================================================================== RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- DOMCDATASectionImpl.cpp 23 Sep 2002 20:02:31 -0000 1.10 +++ DOMCDATASectionImpl.cpp 26 Sep 2002 17:26:04 -0000 1.11 @@ -219,13 +219,13 @@ {return fNode.isSupported (feature, version); }; void DOMCDATASectionImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }; bool DOMCDATASectionImpl::hasAttributes() const {return fNode.hasAttributes(); }; - bool DOMCDATASectionImpl::isSameNode(const DOMNode* other) {return fNode.isSameNode(other); }; - bool DOMCDATASectionImpl::isEqualNode(const DOMNode* arg) {return fParent.isEqualNode(arg); }; + bool DOMCDATASectionImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }; + bool DOMCDATASectionImpl::isEqualNode(const DOMNode* arg) const {return fParent.isEqualNode(arg); }; void* DOMCDATASectionImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler) {return fNode.setUserData(key, data, handler); }; void* DOMCDATASectionImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }; const XMLCh* DOMCDATASectionImpl::getBaseURI() const {return fNode.getBaseURI(); }; - short DOMCDATASectionImpl::compareTreePosition(DOMNode* other) {return fNode.compareTreePosition(other); }; + short DOMCDATASectionImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }; const XMLCh* DOMCDATASectionImpl::getTextContent() const {return fNode.getTextContent(); }; void DOMCDATASectionImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }; const XMLCh* DOMCDATASectionImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }; 1.10 +4 -4 xml-xerces/c/src/xercesc/dom/impl/DOMCommentImpl.cpp Index: DOMCommentImpl.cpp =================================================================== RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMCommentImpl.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- DOMCommentImpl.cpp 16 Aug 2002 19:20:28 -0000 1.9 +++ DOMCommentImpl.cpp 26 Sep 2002 17:26:04 -0000 1.10 @@ -148,13 +148,13 @@ {return fNode.isSupported (feature, version); }; void DOMCommentImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }; bool DOMCommentImpl::hasAttributes() const {return fNode.hasAttributes(); }; - bool DOMCommentImpl::isSameNode(const DOMNode* other) {return fNode.isSameNode(other); }; - bool DOMCommentImpl::isEqualNode(const DOMNode* arg) {return fNode.isEqualNode(arg); }; + bool DOMCommentImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }; + bool DOMCommentImpl::isEqualNode(const DOMNode* arg) const {return fNode.isEqualNode(arg); }; void* DOMCommentImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler) {return fNode.setUserData(key, data, handler); }; void* DOMCommentImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }; const XMLCh* DOMCommentImpl::getBaseURI() const {return fNode.getBaseURI(); }; - short DOMCommentImpl::compareTreePosition(DOMNode* other) {return fNode.compareTreePosition(other); }; + short DOMCommentImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }; const XMLCh* DOMCommentImpl::getTextContent() const {return fNode.getTextContent(); }; void DOMCommentImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }; const XMLCh* DOMCommentImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }; 1.9 +4 -4 xml-xerces/c/src/xercesc/dom/impl/DOMDocumentFragmentImpl.cpp Index: DOMDocumentFragmentImpl.cpp =================================================================== RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMDocumentFragmentImpl.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- DOMDocumentFragmentImpl.cpp 23 Sep 2002 20:02:31 -0000 1.8 +++ DOMDocumentFragmentImpl.cpp 26 Sep 2002 17:26:04 -0000 1.9 @@ -160,13 +160,13 @@ {return fNode.isSupported (feature, version); }; void DOMDocumentFragmentImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }; bool DOMDocumentFragmentImpl::hasAttributes() const {return fNode.hasAttributes(); }; - bool DOMDocumentFragmentImpl::isSameNode(const DOMNode* other) {return fNode.isSameNode(other); }; - bool DOMDocumentFragmentImpl::isEqualNode(const DOMNode* arg) {return fParent.isEqualNode(arg); }; + bool DOMDocumentFragmentImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }; + bool DOMDocumentFragmentImpl::isEqualNode(const DOMNode* arg) const {return fParent.isEqualNode(arg); }; void* DOMDocumentFragmentImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler) {return fNode.setUserData(key, data, handler); }; void* DOMDocumentFragmentImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }; const XMLCh* DOMDocumentFragmentImpl::getBaseURI() const {return fNode.getBaseURI(); }; - short DOMDocumentFragmentImpl::compareTreePosition(DOMNode* other) {return fNode.compareTreePosition(other); }; + short DOMDocumentFragmentImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }; const XMLCh* DOMDocumentFragmentImpl::getTextContent() const {return fNode.getTextContent(); }; void DOMDocumentFragmentImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }; const XMLCh* DOMDocumentFragmentImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }; 1.25 +4 -4 xml-xerces/c/src/xercesc/dom/impl/DOMDocumentImpl.cpp Index: DOMDocumentImpl.cpp =================================================================== RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMDocumentImpl.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- DOMDocumentImpl.cpp 24 Sep 2002 20:19:13 -0000 1.24 +++ DOMDocumentImpl.cpp 26 Sep 2002 17:26:04 -0000 1.25 @@ -692,12 +692,12 @@ {return fNode.isSupported (feature, version); }; void DOMDocumentImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }; bool DOMDocumentImpl::hasAttributes() const {return fNode.hasAttributes(); }; - bool DOMDocumentImpl::isSameNode(const DOMNode* other) {return fNode.isSameNode(other);}; - bool DOMDocumentImpl::isEqualNode(const DOMNode* arg) {return fParent.isEqualNode(arg);}; + bool DOMDocumentImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other);}; + bool DOMDocumentImpl::isEqualNode(const DOMNode* arg) const {return fParent.isEqualNode(arg);}; void* DOMDocumentImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler) {return fNode.setUserData(key, data, handler); }; void* DOMDocumentImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }; - short DOMDocumentImpl::compareTreePosition(DOMNode* other) {return fNode.compareTreePosition(other); }; + short DOMDocumentImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }; const XMLCh* DOMDocumentImpl::getTextContent() const {return fNode.getTextContent(); }; void DOMDocumentImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }; const XMLCh* DOMDocumentImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }; 1.18 +4 -4 xml-xerces/c/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp Index: DOMDocumentTypeImpl.cpp =================================================================== RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- DOMDocumentTypeImpl.cpp 24 Sep 2002 20:07:18 -0000 1.17 +++ DOMDocumentTypeImpl.cpp 26 Sep 2002 17:26:04 -0000 1.18 @@ -464,12 +464,12 @@ {return fNode.isSupported (feature, version); }; void DOMDocumentTypeImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }; bool DOMDocumentTypeImpl::hasAttributes() const {return fNode.hasAttributes(); }; - bool DOMDocumentTypeImpl::isSameNode(const DOMNode* other) {return fNode.isSameNode(other); }; + bool DOMDocumentTypeImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }; void* DOMDocumentTypeImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler) {return fNode.setUserData(key, data, handler); }; void* DOMDocumentTypeImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }; const XMLCh* DOMDocumentTypeImpl::getBaseURI() const {return fNode.getBaseURI(); }; - short DOMDocumentTypeImpl::compareTreePosition(DOMNode* other) {return fNode.compareTreePosition(other); }; + short DOMDocumentTypeImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }; const XMLCh* DOMDocumentTypeImpl::getTextContent() const {return fNode.getTextContent(); }; void DOMDocumentTypeImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }; const XMLCh* DOMDocumentTypeImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }; @@ -478,7 +478,7 @@ DOMNode* DOMDocumentTypeImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); }; -bool DOMDocumentTypeImpl::isEqualNode(const DOMNode* arg) +bool DOMDocumentTypeImpl::isEqualNode(const DOMNode* arg) const { if (isSameNode(arg)) { return true; 1.16 +4 -4 xml-xerces/c/src/xercesc/dom/impl/DOMElementImpl.cpp Index: DOMElementImpl.cpp =================================================================== RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMElementImpl.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- DOMElementImpl.cpp 24 Sep 2002 20:07:18 -0000 1.15 +++ DOMElementImpl.cpp 26 Sep 2002 17:26:04 -0000 1.16 @@ -522,11 +522,11 @@ bool DOMElementImpl::isSupported(const XMLCh *feature, const XMLCh *version) const {return fNode.isSupported (feature, version); }; void DOMElementImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }; - bool DOMElementImpl::isSameNode(const DOMNode* other) {return fNode.isSameNode(other); }; + bool DOMElementImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }; void* DOMElementImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler) {return fNode.setUserData(key, data, handler); }; void* DOMElementImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }; - short DOMElementImpl::compareTreePosition(DOMNode* other) {return fNode.compareTreePosition(other); }; + short DOMElementImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }; const XMLCh* DOMElementImpl::getTextContent() const {return fNode.getTextContent(); }; void DOMElementImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }; const XMLCh* DOMElementImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }; @@ -536,7 +536,7 @@ -bool DOMElementImpl::isEqualNode(const DOMNode* arg) +bool DOMElementImpl::isEqualNode(const DOMNode* arg) const { if (isSameNode(arg)) { return true; 1.13 +4 -4 xml-xerces/c/src/xercesc/dom/impl/DOMEntityImpl.cpp Index: DOMEntityImpl.cpp =================================================================== RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMEntityImpl.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- DOMEntityImpl.cpp 24 Sep 2002 20:21:06 -0000 1.12 +++ DOMEntityImpl.cpp 26 Sep 2002 17:26:04 -0000 1.13 @@ -283,12 +283,12 @@ {return fNode.isSupported (feature, version); }; void DOMEntityImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }; bool DOMEntityImpl::hasAttributes() const {return fNode.hasAttributes(); }; - bool DOMEntityImpl::isSameNode(const DOMNode* other) {return fNode.isSameNode(other); }; - bool DOMEntityImpl::isEqualNode(const DOMNode* arg) {cloneEntityRefTree(); return fParent.isEqualNode(arg); }; + bool DOMEntityImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }; + bool DOMEntityImpl::isEqualNode(const DOMNode* arg) const {cloneEntityRefTree(); return fParent.isEqualNode(arg); }; void* DOMEntityImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler) {return fNode.setUserData(key, data, handler); }; void* DOMEntityImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }; - short DOMEntityImpl::compareTreePosition(DOMNode* other) {return fNode.compareTreePosition(other); }; + short DOMEntityImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }; const XMLCh* DOMEntityImpl::getTextContent() const {return fNode.getTextContent(); }; void DOMEntityImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }; const XMLCh* DOMEntityImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }; 1.9 +4 -4 xml-xerces/c/src/xercesc/dom/impl/DOMEntityReferenceImpl.cpp Index: DOMEntityReferenceImpl.cpp =================================================================== RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMEntityReferenceImpl.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- DOMEntityReferenceImpl.cpp 23 Sep 2002 19:41:07 -0000 1.8 +++ DOMEntityReferenceImpl.cpp 26 Sep 2002 17:26:04 -0000 1.9 @@ -212,12 +212,12 @@ {return fNode.isSupported (feature, version); }; void DOMEntityReferenceImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }; bool DOMEntityReferenceImpl::hasAttributes() const {return fNode.hasAttributes(); }; - bool DOMEntityReferenceImpl::isSameNode(const DOMNode* other) {return fNode.isSameNode(other); }; - bool DOMEntityReferenceImpl::isEqualNode(const DOMNode* arg) {return fParent.isEqualNode(arg); }; + bool DOMEntityReferenceImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }; + bool DOMEntityReferenceImpl::isEqualNode(const DOMNode* arg) const {return fParent.isEqualNode(arg); }; void* DOMEntityReferenceImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler) {return fNode.setUserData(key, data, handler); }; void* DOMEntityReferenceImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }; - short DOMEntityReferenceImpl::compareTreePosition(DOMNode* other) {return fNode.compareTreePosition(other); }; + short DOMEntityReferenceImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }; const XMLCh* DOMEntityReferenceImpl::getTextContent() const {return fNode.getTextContent(); }; void DOMEntityReferenceImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }; const XMLCh* DOMEntityReferenceImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }; 1.18 +8 -8 xml-xerces/c/src/xercesc/dom/impl/DOMNodeImpl.cpp Index: DOMNodeImpl.cpp =================================================================== RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMNodeImpl.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- DOMNodeImpl.cpp 24 Sep 2002 20:19:14 -0000 1.17 +++ DOMNodeImpl.cpp 26 Sep 2002 17:26:04 -0000 1.18 @@ -441,12 +441,12 @@ ((DOMDocumentImpl*)getOwnerDocument())->callUserDataHandlers(this, operation, src, dst); } -bool DOMNodeImpl::isSameNode(const DOMNode* other) +bool DOMNodeImpl::isSameNode(const DOMNode* other) const { return (castToNode(this) == other); } -bool DOMNodeImpl::isEqualNode(const DOMNode* arg) +bool DOMNodeImpl::isEqualNode(const DOMNode* arg) const { if (!arg) return false; @@ -676,7 +676,7 @@ return 0; } -short DOMNodeImpl::compareTreePosition(DOMNode* other){ +short DOMNodeImpl::compareTreePosition(const DOMNode* other) const { // Questions of clarification for this method - to be answered by the // DOM WG. Current assumptions listed - LM // @@ -750,9 +750,9 @@ // We do this now, so that we get this info correct for attribute nodes // and their children. - DOMNode *node; - DOMNode *thisAncestor = castToNode(this); - DOMNode *otherAncestor = other; + const DOMNode *node; + const DOMNode *thisAncestor = castToNode(this); + const DOMNode *otherAncestor = other; int thisDepth=0; int otherDepth=0; for (node = castToNode(this); node != 0; node = node->getParentNode()) { @@ -772,7 +772,7 @@ } - DOMNode *otherNode = other; + const DOMNode *otherNode = other; short thisAncestorType = thisAncestor->getNodeType(); short otherAncestorType = otherAncestor->getNodeType(); 1.10 +10 -10 xml-xerces/c/src/xercesc/dom/impl/DOMNodeImpl.hpp Index: DOMNodeImpl.hpp =================================================================== RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMNodeImpl.hpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- DOMNodeImpl.hpp 16 Aug 2002 19:20:28 -0000 1.9 +++ DOMNodeImpl.hpp 26 Sep 2002 17:26:04 -0000 1.10 @@ -152,10 +152,10 @@ // Introduced in DOM Level 3 void* setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler); void* getUserData(const XMLCh* key) const; - bool isSameNode(const DOMNode* other); - bool isEqualNode(const DOMNode* arg); + bool isSameNode(const DOMNode* other) const; + bool isEqualNode(const DOMNode* arg) const; const XMLCh* getBaseURI() const ; - short compareTreePosition(DOMNode* other) ; + short compareTreePosition(const DOMNode* other) const; const XMLCh* getTextContent() const ; void setTextContent(const XMLCh* textContent) ; const XMLCh* lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const ; @@ -348,10 +348,10 @@ virtual void setPrefix(const XMLCh * prefix) ;\ virtual void* setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler) ;\ virtual void* getUserData(const XMLCh* key) const ;\ - virtual bool isSameNode(const DOMNode* other);\ - virtual bool isEqualNode(const DOMNode* arg);\ + virtual bool isSameNode(const DOMNode* other) const;\ + virtual bool isEqualNode(const DOMNode* arg) const;\ virtual const XMLCh* getBaseURI() const ;\ - virtual short compareTreePosition(DOMNode* other) ;\ + virtual short compareTreePosition(const DOMNode* other) const ;\ virtual const XMLCh* getTextContent() const ;\ virtual void setTextContent(const XMLCh* textContent) ;\ virtual const XMLCh* lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const ;\ @@ -391,13 +391,13 @@ {return fNode.isSupported (feature, version); }; void xxx::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }; bool xxx::hasAttributes() const {return fNode.hasAttributes(); }; - bool xxx::isSameNode(const DOMNode* other) {return fNode.isSameNode(other); }; - bool xxx::isEqualNode(const DOMNode* arg) {return fNode.isEqualNode(arg); }; + bool xxx::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }; + bool xxx::isEqualNode(const DOMNode* arg) const {return fNode.isEqualNode(arg); }; void* xxx::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler) {return fNode.setUserData(key, data, handler); }; void* xxx::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }; const XMLCh* xxx::getBaseURI() const {return fNode.getBaseURI(); }; - short xxx::compareTreePosition(DOMNode* other) {return fNode.compareTreePosition(other); }; + short xxx::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }; const XMLCh* xxx::getTextContent() const {return fNode.getTextContent(); }; void xxx::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }; const XMLCh* xxx::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }; 1.10 +4 -4 xml-xerces/c/src/xercesc/dom/impl/DOMNotationImpl.cpp Index: DOMNotationImpl.cpp =================================================================== RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMNotationImpl.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- DOMNotationImpl.cpp 24 Sep 2002 20:21:06 -0000 1.9 +++ DOMNotationImpl.cpp 26 Sep 2002 17:26:04 -0000 1.10 @@ -196,12 +196,12 @@ {return fNode.isSupported (feature, version); }; void DOMNotationImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }; bool DOMNotationImpl::hasAttributes() const {return fNode.hasAttributes(); }; - bool DOMNotationImpl::isSameNode(const DOMNode* other) {return fNode.isSameNode(other); }; - bool DOMNotationImpl::isEqualNode(const DOMNode* arg) {return fNode.isEqualNode(arg); }; + bool DOMNotationImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }; + bool DOMNotationImpl::isEqualNode(const DOMNode* arg) const {return fNode.isEqualNode(arg); }; void* DOMNotationImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler) {return fNode.setUserData(key, data, handler); }; void* DOMNotationImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }; - short DOMNotationImpl::compareTreePosition(DOMNode* other) {return fNode.compareTreePosition(other); }; + short DOMNotationImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }; const XMLCh* DOMNotationImpl::getTextContent() const {return fNode.getTextContent(); }; void DOMNotationImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }; const XMLCh* DOMNotationImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }; 1.9 +2 -2 xml-xerces/c/src/xercesc/dom/impl/DOMParentNode.cpp Index: DOMParentNode.cpp =================================================================== RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMParentNode.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- DOMParentNode.cpp 24 Sep 2002 20:20:38 -0000 1.8 +++ DOMParentNode.cpp 26 Sep 2002 17:26:04 -0000 1.9 @@ -402,7 +402,7 @@ //Introduced in DOM Level 3 -bool DOMParentNode::isEqualNode(const DOMNode* arg) +bool DOMParentNode::isEqualNode(const DOMNode* arg) const { if (arg && castToNodeImpl(this)->isSameNode(arg)) return true; 1.5 +2 -2 xml-xerces/c/src/xercesc/dom/impl/DOMParentNode.hpp Index: DOMParentNode.hpp =================================================================== RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMParentNode.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- DOMParentNode.hpp 27 Jun 2002 18:41:47 -0000 1.4 +++ DOMParentNode.hpp 26 Sep 2002 17:26:05 -0000 1.5 @@ -123,7 +123,7 @@ void normalize(); //Introduced in DOM Level 3 - bool isEqualNode(const DOMNode* arg); + bool isEqualNode(const DOMNode* arg) const; // NON-DOM // unlike getOwnerDocument this never returns null, even for Document nodes 1.9 +4 -4 xml-xerces/c/src/xercesc/dom/impl/DOMProcessingInstructionImpl.cpp Index: DOMProcessingInstructionImpl.cpp =================================================================== RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMProcessingInstructionImpl.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- DOMProcessingInstructionImpl.cpp 23 Sep 2002 19:41:07 -0000 1.8 +++ DOMProcessingInstructionImpl.cpp 26 Sep 2002 17:26:05 -0000 1.9 @@ -213,12 +213,12 @@ {return fNode.isSupported (feature, version); }; void DOMProcessingInstructionImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }; bool DOMProcessingInstructionImpl::hasAttributes() const {return fNode.hasAttributes(); }; - bool DOMProcessingInstructionImpl::isSameNode(const DOMNode* other) {return fNode.isSameNode(other); }; - bool DOMProcessingInstructionImpl::isEqualNode(const DOMNode* arg) {return fNode.isEqualNode(arg); }; + bool DOMProcessingInstructionImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }; + bool DOMProcessingInstructionImpl::isEqualNode(const DOMNode* arg) const {return fNode.isEqualNode(arg); }; void* DOMProcessingInstructionImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler) {return fNode.setUserData(key, data, handler); }; void* DOMProcessingInstructionImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }; - short DOMProcessingInstructionImpl::compareTreePosition(DOMNode* other) {return fNode.compareTreePosition(other); }; + short DOMProcessingInstructionImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }; const XMLCh* DOMProcessingInstructionImpl::getTextContent() const {return fNode.getTextContent(); }; void DOMProcessingInstructionImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }; const XMLCh* DOMProcessingInstructionImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }; 1.10 +4 -4 xml-xerces/c/src/xercesc/dom/impl/DOMTextImpl.cpp Index: DOMTextImpl.cpp =================================================================== RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMTextImpl.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- DOMTextImpl.cpp 16 Aug 2002 19:20:28 -0000 1.9 +++ DOMTextImpl.cpp 26 Sep 2002 17:26:05 -0000 1.10 @@ -221,13 +221,13 @@ {return fNode.isSupported (feature, version); }; void DOMTextImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }; bool DOMTextImpl::hasAttributes() const {return fNode.hasAttributes(); }; - bool DOMTextImpl::isSameNode(const DOMNode* other) {return fNode.isSameNode(other); }; - bool DOMTextImpl::isEqualNode(const DOMNode* arg) {return fNode.isEqualNode(arg); }; + bool DOMTextImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }; + bool DOMTextImpl::isEqualNode(const DOMNode* arg) const {return fNode.isEqualNode(arg); }; void* DOMTextImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler) {return fNode.setUserData(key, data, handler); }; void* DOMTextImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }; const XMLCh* DOMTextImpl::getBaseURI() const {return fNode.getBaseURI(); }; - short DOMTextImpl::compareTreePosition(DOMNode* other) {return fNode.compareTreePosition(other); }; + short DOMTextImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }; const XMLCh* DOMTextImpl::getTextContent() const {return fNode.getTextContent(); }; void DOMTextImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }; const XMLCh* DOMTextImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); };
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]