[Usata-commits] Changes to usata2/src/xml/scene_parser.hpp

[David Lau]

Index: usata2/src/xml/scene_parser.hpp
diff -u usata2/src/xml/scene_parser.hpp:1.1 usata2/src/xml/scene_parser.hpp:1.2
--- usata2/src/xml/scene_parser.hpp:1.1 Wed Feb 16 06:30:02 2005
+++ usata2/src/xml/scene_parser.hpp     Fri Feb 18 02:24:33 2005
@@ -10,7 +10,10 @@
 // included in the software distribution, or visit
 // http://www.fsf.org/licenses/gpl.html.
 //
-// $Id: scene_parser.hpp,v 1.1 2005/02/16 06:30:02 skunix Exp $
+// $Id: scene_parser.hpp,v 1.2 2005/02/18 02:24:33 skunix Exp $
+
+#ifndef USATA_SCENE_PARSER_HPP
+#define USATA_SCENE_PARSER_HPP
 
 #include <deque>
 #include <string>
@@ -26,7 +29,7 @@
 namespace boost{class thread;}
 namespace usata
 {
-class ObjectDescription
+struct ObjectDescription
 {
        std::string name;
        std::string path;
@@ -38,14 +41,17 @@
 
 class SceneElement
 {
+       protected:
+               SceneParser* mParser;
+               SceneElement* mParent;
 
        public:
                SceneElement(SceneElement* parent, SceneParser *parser);
        
-               virtual void start(const char* name, const char**attrib)=0;
-               virtual void end()=0;
+               virtual void start_element(const char* name, const 
char**attrib)=0;
+               virtual void end_element()=0;
                virtual void content(const char*buf, int len){}
-               virtual ~SceneElement();
+               virtual ~SceneElement(){};
 
 };
 
@@ -53,7 +59,7 @@
 class SceneParser : public XML::Parser
 {
        private:
-               std::deque<SceneElement_sp> mElements;
+               std::deque<SceneElement*> mElements;
                std::auto_ptr<boost::thread> mThread;
                std::istream&   mIs;
                std::string     mStreamName;
@@ -82,5 +88,5 @@
 
 
 }
-
+#endif