You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by bo...@apache.org on 2008/03/26 09:07:04 UTC
svn commit: r641193 - /xerces/c/trunk/src/xercesc/dom/impl/
Author: borisk
Date: Wed Mar 26 01:06:57 2008
New Revision: 641193
URL: http://svn.apache.org/viewvc?rev=641193&view=rev
Log:
Make private member variables and helper functions protected to facilitate reuse
Modified:
xerces/c/trunk/src/xercesc/dom/impl/DOMAttrImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMCDATASectionImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMCommentImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMConfigurationImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentFragmentImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentTypeImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMElementNSImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMEntityReferenceImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMErrorImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationListImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMLSInputImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMLSOutputImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMLocatorImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIDMap.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIteratorImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMNodeListImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMNormalizer.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMNotationImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMProcessingInstructionImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMRangeImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMStringListImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMTreeWalkerImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMTypeInfoImpl.hpp
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMAttrImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMAttrImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMAttrImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMAttrImpl.hpp Wed Mar 26 01:06:57 2008
@@ -52,7 +52,7 @@
DOMParentNode fParent;
const XMLCh *fName;
-private:
+protected:
const DOMTypeInfoImpl *fSchemaType;
public:
@@ -60,9 +60,11 @@
DOMAttrImpl(const DOMAttrImpl &other, bool deep=false);
virtual ~DOMAttrImpl();
+public:
// Add all functions that are pure virtual in DOMNODE
DOMNODE_FUNCTIONS;
+public:
virtual const XMLCh * getName() const;
virtual bool getSpecified() const;
virtual const XMLCh * getValue() const;
@@ -86,9 +88,10 @@
// helper to remove this attr from from the id map if it is in there
virtual void removeAttrFromIDNodeMap();
-private:
+protected:
void getTextValue(DOMNode* node, XMLBuffer& buf) const;
+private:
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
// -----------------------------------------------------------------------
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.hpp Wed Mar 26 01:06:57 2008
@@ -44,13 +44,11 @@
protected:
DOMNodeVector* fNodes;
DOMNode* fOwnerNode; // the node this map belongs to
+ bool attrDefaults;
virtual void cloneContent(const DOMAttrMapImpl *srcmap);
bool readOnly(); // revisit. Look at owner node read-only.
-
-private:
- bool attrDefaults;
public:
DOMAttrMapImpl(DOMNode *ownerNod);
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMCDATASectionImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMCDATASectionImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMCDATASectionImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMCDATASectionImpl.hpp Wed Mar 26 01:06:57 2008
@@ -43,7 +43,7 @@
class CDOM_EXPORT DOMCDATASectionImpl: public DOMCDATASection {
-private:
+protected:
DOMNodeImpl fNode;
DOMChildNode fChild;
DOMCharacterDataImpl fCharacterData;
@@ -66,10 +66,11 @@
virtual bool isIgnorableWhitespace() const;
+public:
// Declare all of the functions from DOMNode.
DOMNODE_FUNCTIONS;
-
+public:
// Functions introduced by DOMCharacterData
virtual const XMLCh* getData() const;
virtual XMLSize_t getLength() const;
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMCommentImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMCommentImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMCommentImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMCommentImpl.hpp Wed Mar 26 01:06:57 2008
@@ -53,10 +53,11 @@
DOMCommentImpl(const DOMCommentImpl &other, bool deep);
virtual ~DOMCommentImpl();
+public:
// Declare all of the functions from DOMNode.
DOMNODE_FUNCTIONS;
-
+public:
// Functions from DOMCharacterData
virtual void appendData(const XMLCh *data);
virtual void deleteData(XMLSize_t offset, XMLSize_t count);
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMConfigurationImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMConfigurationImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMConfigurationImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMConfigurationImpl.hpp Wed Mar 26 01:06:57 2008
@@ -122,7 +122,7 @@
static const unsigned short fDEFAULT_VALUES;
-private:
+protected:
// implements a simple map between the name and its enum value
DOMConfigurationFeature getFeatureFlag(const XMLCh* name) const;
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp Wed Mar 26 01:06:57 2008
@@ -41,7 +41,7 @@
class CDOM_EXPORT DOMDeepNodeListImpl: public DOMNodeList {
-private:
+protected:
const DOMNode* fRootNode;
const XMLCh* fTagName;
bool fMatchAll;
@@ -64,8 +64,10 @@
virtual DOMNode* item(unsigned int index) const;
DOMNode* cacheItem(unsigned int index);
-private:
+protected:
DOMNode* nextMatchingElementAfter(DOMNode *current);
+
+private:
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
// -----------------------------------------------------------------------
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentFragmentImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentFragmentImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentFragmentImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentFragmentImpl.hpp Wed Mar 26 01:06:57 2008
@@ -40,19 +40,16 @@
class CDOM_EXPORT DOMDocumentFragmentImpl: public DOMDocumentFragment {
-private:
+protected:
DOMNodeImpl fNode;
DOMParentNode fParent;
-
-
protected:
DOMDocumentFragmentImpl(DOMDocument *);
-
-private:
DOMDocumentFragmentImpl(const DOMDocumentFragmentImpl &other, bool deep);
friend class DOMDocumentImpl;
+private:
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
// -----------------------------------------------------------------------
@@ -61,6 +58,7 @@
public:
virtual ~DOMDocumentFragmentImpl();
+public:
// Declare all of the functions from DOMNode.
DOMNODE_FUNCTIONS;
};
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.hpp Wed Mar 26 01:06:57 2008
@@ -99,9 +99,11 @@
void setDocumentType(DOMDocumentType *doctype);
+public:
// Add all functions that are pure virtual in DOMNODE
DOMNODE_FUNCTIONS;
+public:
// Add all functions that are pure virtual in DOMDocument
virtual DOMAttr* createAttribute(const XMLCh *name);
virtual DOMCDATASection* createCDATASection(const XMLCh *data);
@@ -269,17 +271,18 @@
const XMLCh *namespaceURI,
const XMLCh *localName);
-private:
+protected:
//Internal helper functions
virtual DOMNode* importNode(const DOMNode *source, bool deep, bool cloningNode);
+private:
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
// -----------------------------------------------------------------------
DOMDocumentImpl(const DOMDocumentImpl &);
DOMDocumentImpl & operator = (const DOMDocumentImpl &);
-private:
+protected:
// -----------------------------------------------------------------------
// data
// -----------------------------------------------------------------------
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentTypeImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentTypeImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentTypeImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentTypeImpl.hpp Wed Mar 26 01:06:57 2008
@@ -45,7 +45,7 @@
class DOMNamedNodeMapImpl;
class CDOM_EXPORT DOMDocumentTypeImpl: public DOMDocumentType {
-private:
+protected:
DOMNodeImpl fNode;
DOMParentNode fParent;
DOMChildNode fChild;
@@ -77,9 +77,11 @@
DOMDocumentTypeImpl(const DOMDocumentTypeImpl &other, bool heap, bool deep=false);
virtual ~DOMDocumentTypeImpl();
+public:
// Declare all of the functions from DOMNode.
DOMNODE_FUNCTIONS;
+public:
virtual void setOwnerDocument(DOMDocument *doc);
virtual DOMNamedNodeMap * getEntities() const;
virtual const XMLCh * getName() const;
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.hpp Wed Mar 26 01:06:57 2008
@@ -67,9 +67,11 @@
DOMElementImpl(const DOMElementImpl &other, bool deep=false);
virtual ~DOMElementImpl();
+public:
// Declare functions from DOMNode. They all must be implemented by this class
DOMNODE_FUNCTIONS;
+public:
// Functions introduced on Element...
virtual const XMLCh* getAttribute(const XMLCh *name) const;
virtual DOMAttr* getAttributeNode(const XMLCh *name) const;
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMElementNSImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMElementNSImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMElementNSImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMElementNSImpl.hpp Wed Mar 26 01:06:57 2008
@@ -44,8 +44,6 @@
const XMLCh * fNamespaceURI; //namespace URI of this node
const XMLCh * fLocalName; //local part of qualified name
const XMLCh * fPrefix;
-
-private:
const DOMTypeInfoImpl *fSchemaType;
public:
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.hpp Wed Mar 26 01:06:57 2008
@@ -42,7 +42,7 @@
class DOMEntityReference;
class CDOM_EXPORT DOMEntityImpl: public DOMEntity {
-private:
+protected:
DOMNodeImpl fNode;
DOMParentNode fParent;
@@ -58,7 +58,8 @@
const XMLCh* fXmlVersion;
const XMLCh* fBaseURI;
bool fEntityRefNodeCloned;
- // private helper function
+
+ // helper function
void cloneEntityRefTree() const;
friend class XercesDOMParser;
@@ -68,10 +69,11 @@
DOMEntityImpl(const DOMEntityImpl &other, bool deep=false);
virtual ~DOMEntityImpl();
+public:
// Declare all of the functions from DOMNode.
DOMNODE_FUNCTIONS;
-
+public:
virtual const XMLCh * getPublicId() const;
virtual const XMLCh * getSystemId() const;
virtual const XMLCh * getNotationName() const;
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMEntityReferenceImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMEntityReferenceImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMEntityReferenceImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMEntityReferenceImpl.hpp Wed Mar 26 01:06:57 2008
@@ -43,7 +43,7 @@
class CDOM_EXPORT DOMEntityReferenceImpl: public DOMEntityReference
{
-private:
+protected:
DOMNodeImpl fNode;
DOMParentNode fParent;
DOMChildNode fChild;
@@ -59,9 +59,11 @@
DOMEntityReferenceImpl(const DOMEntityReferenceImpl &other, bool deep=false);
virtual ~DOMEntityReferenceImpl();
+public:
// Declare all of the functions from DOMNode.
DOMNODE_FUNCTIONS;
-
+
+public:
virtual void setReadOnly(bool readOnly,bool deep);
private:
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMErrorImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMErrorImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMErrorImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMErrorImpl.hpp Wed Mar 26 01:06:57 2008
@@ -81,7 +81,7 @@
void setType(const XMLCh* type);
void setRelatedData(void* relatedData);
-private :
+private:
/* Unimplemented constructors and operators */
/* Copy constructor */
@@ -90,6 +90,7 @@
/* Assignment operator */
DOMErrorImpl& operator=(const DOMErrorImpl&);
+protected:
// -----------------------------------------------------------------------
// Private data members
//
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationImpl.hpp Wed Mar 26 01:06:57 2008
@@ -47,8 +47,10 @@
DOMImplementationImpl(const DOMImplementationImpl &);
DOMImplementationImpl & operator = (const DOMImplementationImpl &);
friend class XMLInitializer;
+
protected:
DOMImplementationImpl() {};
+
public:
virtual ~DOMImplementationImpl() {};
static DOMImplementationImpl* getDOMImplementationImpl();
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationListImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationListImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationListImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationListImpl.hpp Wed Mar 26 01:06:57 2008
@@ -33,9 +33,10 @@
class CDOM_EXPORT DOMImplementationListImpl: public DOMImplementationList
{
-private:
+protected:
RefVectorOf<DOMImplementation> *fList;
+private:
// Unused, and unimplemented constructors, operators, etc.
DOMImplementationListImpl(const DOMImplementationListImpl & other);
DOMImplementationListImpl & operator = (const DOMImplementationListImpl & other);
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMLSInputImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMLSInputImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMLSInputImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMLSInputImpl.hpp Wed Mar 26 01:06:57 2008
@@ -53,12 +53,13 @@
virtual bool getIssueFatalErrorIfNotFound() const;
virtual void release();
-private:
+private:
/** unimplemented copy ctor and assignment operator */
DOMLSInputImpl(const DOMLSInputImpl&);
DOMLSInputImpl & operator = (const DOMLSInputImpl&);
+protected:
// -----------------------------------------------------------------------
// Private data members
//
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMLSOutputImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMLSOutputImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMLSOutputImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMLSOutputImpl.hpp Wed Mar 26 01:06:57 2008
@@ -51,6 +51,7 @@
DOMLSOutputImpl(const DOMLSOutputImpl&);
DOMLSOutputImpl & operator = (const DOMLSOutputImpl&);
+protected:
// -----------------------------------------------------------------------
// Private data members
//
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.hpp Wed Mar 26 01:06:57 2008
@@ -93,6 +93,7 @@
DOMLSSerializerImpl(const DOMLSSerializerImpl&);
DOMLSSerializerImpl & operator = (const DOMLSSerializerImpl&);
+protected:
/** helper **/
void processNode(const DOMNode* const);
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMLocatorImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMLocatorImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMLocatorImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMLocatorImpl.hpp Wed Mar 26 01:06:57 2008
@@ -84,6 +84,7 @@
/* Assignment operator */
DOMLocatorImpl& operator=(const DOMLocatorImpl&);
+protected:
// -----------------------------------------------------------------------
// Private data members
//
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIDMap.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIDMap.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIDMap.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIDMap.hpp Wed Mar 26 01:06:57 2008
@@ -53,7 +53,7 @@
DOMNodeIDMap(int initialSize, DOMDocument *doc); // Create a new hash table, sized to hold "initialSize"
// Entries. It will automatically grow if need be.
- virtual ~DOMNodeIDMap();
+ ~DOMNodeIDMap();
private:
DOMNodeIDMap(const DOMNodeIDMap &other); // No copy, assignement, comparison.
@@ -79,8 +79,6 @@
unsigned int fMaxEntries; // The max number of entries to use before
// growing the table.
DOMDocument *fDoc; // The owning document.
-
-
};
XERCES_CPP_NAMESPACE_END
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIteratorImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIteratorImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIteratorImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIteratorImpl.hpp Wed Mar 26 01:06:57 2008
@@ -42,7 +42,7 @@
XERCES_CPP_NAMESPACE_BEGIN
class CDOM_EXPORT DOMNodeIteratorImpl : public DOMNodeIterator {
- private:
+ protected:
//
// Data
//
@@ -109,7 +109,7 @@
virtual void release();
void removeNode (DOMNode* node);
- private:
+ protected:
DOMNode* matchNodeOrParent (DOMNode* node);
DOMNode* nextNode (DOMNode* node, bool visitChildren);
DOMNode* previousNode (DOMNode* node);
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNodeListImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNodeListImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNodeListImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNodeListImpl.hpp Wed Mar 26 01:06:57 2008
@@ -52,9 +52,10 @@
class CDOM_EXPORT DOMNodeListImpl: public DOMNodeList
{
-private:
+protected:
DOMParentNode *fNode;
+private:
// Unused, and unimplemented constructors, operators, etc.
DOMNodeListImpl();
DOMNodeListImpl(const DOMNodeListImpl & other);
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.hpp Wed Mar 26 01:06:57 2008
@@ -47,7 +47,7 @@
unsigned int nextFreeSlot;
void init(DOMDocument *doc, unsigned int size);
void checkSpace();
-
+
// unimplemented
DOMNodeVector ( const DOMNodeVector& toCopy);
DOMNodeVector& operator= (const DOMNodeVector& other);
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNormalizer.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNormalizer.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNormalizer.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNormalizer.hpp Wed Mar 26 01:06:57 2008
@@ -104,6 +104,7 @@
DOMNormalizer ( const DOMNormalizer& toCopy);
DOMNormalizer& operator= (const DOMNormalizer& other);
+protected:
/**
* Recursively normalizes a node
*/
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNotationImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNotationImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNotationImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNotationImpl.hpp Wed Mar 26 01:06:57 2008
@@ -57,9 +57,11 @@
virtual ~DOMNotationImpl();
- // Declare all of the functions from DOMNode.
+public:
+ // Declare all of the functions from DOMNode.
DOMNODE_FUNCTIONS;
+public:
//
// The Public Identifier for this Notation. If no public identifier
// was specified, this will be null.
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMProcessingInstructionImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMProcessingInstructionImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMProcessingInstructionImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMProcessingInstructionImpl.hpp Wed Mar 26 01:06:57 2008
@@ -45,7 +45,7 @@
class CDOM_EXPORT DOMProcessingInstructionImpl: public DOMProcessingInstruction {
-private:
+protected:
DOMNodeImpl fNode;
DOMChildNode fChild;
// use fCharacterData to store its data so that those character utitlites can be used
@@ -62,9 +62,11 @@
bool deep=false);
virtual ~DOMProcessingInstructionImpl();
+public:
// Declare all of the functions from DOMNode.
DOMNODE_FUNCTIONS;
+public:
virtual const XMLCh *getData() const;
virtual const XMLCh *getTarget() const;
virtual void setData(const XMLCh *arg);
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMRangeImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMRangeImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMRangeImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMRangeImpl.hpp Wed Mar 26 01:06:57 2008
@@ -46,7 +46,7 @@
class MemoryManager;
class CDOM_EXPORT DOMRangeImpl: public DOMRange {
-private:
+protected:
enum TraversalType {
EXTRACT_CONTENTS = 1,
CLONE_CONTENTS = 2,
@@ -127,7 +127,7 @@
void updateRangeForInsertedText(DOMNode* node, XMLSize_t offset, XMLSize_t count);
void updateRangeForDeletedNode(DOMNode* node);
-private:
+protected:
//setter functions
void setStartContainer(const DOMNode* node);
void setStartOffset(XMLSize_t offset) ;
@@ -164,6 +164,7 @@
DOMNode* traverseTextNode( DOMNode *n, bool isLeft, int how );
DOMNode* getSelectedNode( DOMNode *container, int offset );
+private:
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
// -----------------------------------------------------------------------
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMStringListImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMStringListImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMStringListImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMStringListImpl.hpp Wed Mar 26 01:06:57 2008
@@ -32,9 +32,10 @@
class CDOM_EXPORT DOMStringListImpl: public XMemory,
public DOMStringList
{
-private:
+protected:
RefVectorOf<XMLCh> *fList;
+private:
// Unused, and unimplemented constructors, operators, etc.
DOMStringListImpl(const DOMStringListImpl & other);
DOMStringListImpl & operator = (const DOMStringListImpl & other);
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.hpp Wed Mar 26 01:06:57 2008
@@ -63,10 +63,11 @@
// non-standard extension
virtual bool isIgnorableWhitespace() const;
+public:
// Declare the functions coming from DOMNode.
DOMNODE_FUNCTIONS;
-
+public:
// All of the functions coming from DOMCharacterData
virtual const XMLCh* getData() const;
virtual XMLSize_t getLength() const;
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMTreeWalkerImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMTreeWalkerImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMTreeWalkerImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMTreeWalkerImpl.hpp Wed Mar 26 01:06:57 2008
@@ -37,7 +37,7 @@
class CDOM_EXPORT DOMTreeWalkerImpl : public DOMTreeWalker {
- private:
+protected:
// The whatToShow mask.
unsigned long fWhatToShow;
@@ -53,7 +53,7 @@
// The expandEntity reference flag.
bool fExpandEntityReferences;
- public:
+public:
// Implementation Note: No state is kept except the data above
// (fWhatToShow, fNodeFilter, fCurrentNode, fRoot) such that
// setters could be created for these data values and the
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMTypeInfoImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMTypeInfoImpl.hpp?rev=641193&r1=641192&r2=641193&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMTypeInfoImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMTypeInfoImpl.hpp Wed Mar 26 01:06:57 2008
@@ -80,7 +80,7 @@
virtual void setStringProperty(PSVIProperty prop, const XMLCh* value);
virtual void setNumericProperty(PSVIProperty prop, int value);
-private:
+protected:
int fBitFields;
const XMLCh* fTypeName;
const XMLCh* fTypeNamespace;
@@ -88,7 +88,8 @@
const XMLCh* fMemberTypeNamespace;
const XMLCh* fDefaultValue;
const XMLCh* fNormalizedValue;
-
+
+private:
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
// -----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org