amassari 2004/03/05 07:55:30
Modified: c/src/xercesc/dom/impl DOMDocumentTypeImpl.cpp
DOMDocumentTypeImpl.hpp
Log:
The maps inside the DTD are declared of the right type, removing the need for casts
Revision Changes Path
1.24 +9 -9 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- DOMDocumentTypeImpl.cpp 29 Jan 2004 11:44:26 -0000 1.23
+++ DOMDocumentTypeImpl.cpp 5 Mar 2004 15:55:30 -0000 1.24
@@ -240,9 +240,9 @@
if ((DOMDocumentImpl *)this->fNode.getOwnerDocument() && deep)
fParent.cloneChildren(&other);
- fEntities = ((DOMNamedNodeMapImpl *)other.fEntities)->cloneMap(this);
- fNotations= ((DOMNamedNodeMapImpl *)other.fNotations)->cloneMap(this);
- fElements = ((DOMNamedNodeMapImpl *)other.fElements)->cloneMap(this);
+ fEntities = other.fEntities->cloneMap(this);
+ fNotations= other.fNotations->cloneMap(this);
+ fElements = other.fElements->cloneMap(this);
}
@@ -285,9 +285,9 @@
fNode.setOwnerDocument(doc);
fParent.setOwnerDocument(doc);
- DOMNamedNodeMap* entitiesTemp = ((DOMNamedNodeMapImpl
*)fEntities)->cloneMap(this);
- DOMNamedNodeMap* notationsTemp = ((DOMNamedNodeMapImpl
*)fNotations)->cloneMap(this);
- DOMNamedNodeMap* elementsTemp = ((DOMNamedNodeMapImpl
*)fElements)->cloneMap(this);
+ DOMNamedNodeMapImpl* entitiesTemp = fEntities->cloneMap(this);
+ DOMNamedNodeMapImpl* notationsTemp = fNotations->cloneMap(this);
+ DOMNamedNodeMapImpl* elementsTemp = fElements->cloneMap(this);
fEntities = entitiesTemp;
fNotations = notationsTemp;
@@ -342,9 +342,9 @@
{
fNode.setReadOnly(readOnl,deep);
if (fEntities)
- ((DOMNamedNodeMapImpl *)fEntities)->setReadOnly(readOnl,true);
+ fEntities->setReadOnly(readOnl,true);
if (fNotations)
- ((DOMNamedNodeMapImpl *)fNotations)->setReadOnly(readOnl,true);
+ fNotations->setReadOnly(readOnl,true);
}
1.15 +17 -17 xml-xerces/c/src/xercesc/dom/impl/DOMDocumentTypeImpl.hpp
Index: DOMDocumentTypeImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMDocumentTypeImpl.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DOMDocumentTypeImpl.hpp 29 Jan 2004 11:44:26 -0000 1.14
+++ DOMDocumentTypeImpl.hpp 5 Mar 2004 15:55:30 -0000 1.15
@@ -81,7 +81,7 @@
XERCES_CPP_NAMESPACE_BEGIN
-class NamedNodeMapImpl;
+class DOMNamedNodeMapImpl;
class CDOM_EXPORT DOMDocumentTypeImpl: public DOMDocumentType {
private:
@@ -91,21 +91,21 @@
- const XMLCh * fName;
- DOMNamedNodeMap* fEntities;
- DOMNamedNodeMap* fNotations;
- DOMNamedNodeMap* fElements;
- const XMLCh * fPublicId;
- const XMLCh * fSystemId;
- const XMLCh * fInternalSubset;
-
- bool fIntSubsetReading;
- bool fIsCreatedFromHeap;
-
- virtual void setPublicId(const XMLCh * value);
- virtual void setSystemId(const XMLCh * value);
- virtual void setInternalSubset(const XMLCh *value);
- bool isIntSubsetReading() const;
+ const XMLCh * fName;
+ DOMNamedNodeMapImpl* fEntities;
+ DOMNamedNodeMapImpl* fNotations;
+ DOMNamedNodeMapImpl* fElements;
+ const XMLCh * fPublicId;
+ const XMLCh * fSystemId;
+ const XMLCh * fInternalSubset;
+
+ bool fIntSubsetReading;
+ bool fIsCreatedFromHeap;
+
+ virtual void setPublicId(const XMLCh * value);
+ virtual void setSystemId(const XMLCh * value);
+ virtual void setInternalSubset(const XMLCh *value);
+ bool isIntSubsetReading() const;
friend class AbstractDOMParser;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
