diff --git a/tinyxml2.h b/tinyxml2.h index d3d0b0a..01c3de3 100755 --- a/tinyxml2.h +++ b/tinyxml2.h @@ -887,13 +887,12 @@ public: */ virtual bool Accept( XMLVisitor* visitor ) const = 0; - // internal - virtual char* ParseDeep( char*, StrPair* ); - protected: XMLNode( XMLDocument* ); virtual ~XMLNode(); + virtual char* ParseDeep( char*, StrPair* ); + XMLDocument* _document; XMLNode* _parent; mutable StrPair _value; @@ -950,7 +949,6 @@ public: return _isCData; } - char* ParseDeep( char*, StrPair* endTag ); virtual XMLNode* ShallowClone( XMLDocument* document ) const; virtual bool ShallowEqual( const XMLNode* compare ) const; @@ -958,6 +956,8 @@ protected: XMLText( XMLDocument* doc ) : XMLNode( doc ), _isCData( false ) {} virtual ~XMLText() {} + char* ParseDeep( char*, StrPair* endTag ); + private: bool _isCData; @@ -980,7 +980,6 @@ public: virtual bool Accept( XMLVisitor* visitor ) const; - char* ParseDeep( char*, StrPair* endTag ); virtual XMLNode* ShallowClone( XMLDocument* document ) const; virtual bool ShallowEqual( const XMLNode* compare ) const; @@ -988,6 +987,8 @@ protected: XMLComment( XMLDocument* doc ); virtual ~XMLComment(); + char* ParseDeep( char*, StrPair* endTag ); + private: XMLComment( const XMLComment& ); // not supported XMLComment& operator=( const XMLComment& ); // not supported @@ -1018,7 +1019,6 @@ public: virtual bool Accept( XMLVisitor* visitor ) const; - char* ParseDeep( char*, StrPair* endTag ); virtual XMLNode* ShallowClone( XMLDocument* document ) const; virtual bool ShallowEqual( const XMLNode* compare ) const; @@ -1026,6 +1026,8 @@ protected: XMLDeclaration( XMLDocument* doc ); virtual ~XMLDeclaration(); + char* ParseDeep( char*, StrPair* endTag ); + private: XMLDeclaration( const XMLDeclaration& ); // not supported XMLDeclaration& operator=( const XMLDeclaration& ); // not supported @@ -1052,7 +1054,6 @@ public: virtual bool Accept( XMLVisitor* visitor ) const; - char* ParseDeep( char*, StrPair* endTag ); virtual XMLNode* ShallowClone( XMLDocument* document ) const; virtual bool ShallowEqual( const XMLNode* compare ) const; @@ -1060,6 +1061,8 @@ protected: XMLUnknown( XMLDocument* doc ); virtual ~XMLUnknown(); + char* ParseDeep( char*, StrPair* endTag ); + private: XMLUnknown( const XMLUnknown& ); // not supported XMLUnknown& operator=( const XMLUnknown& ); // not supported @@ -1509,10 +1512,12 @@ public: int ClosingType() const { return _closingType; } - char* ParseDeep( char* p, StrPair* endTag ); virtual XMLNode* ShallowClone( XMLDocument* document ) const; virtual bool ShallowEqual( const XMLNode* compare ) const; +protected: + char* ParseDeep( char* p, StrPair* endTag ); + private: XMLElement( XMLDocument* doc ); virtual ~XMLElement();