Changeset 5933 in orxonox.OLD for trunk/src/lib/util/ini_parser.h

Timestamp:

Dec 6, 2005, 12:33:18 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: sync (not running)

File:

• trunk/src/lib/util/ini_parser.h (modified) (4 diffs)

trunk/src/lib/util/ini_parser.h

@@ -11 +11 @@
 #define PARSELINELENGHT     512       //!< how many chars to read at once
 #ifndef NULL
-#define NULL 0x0                      //!< NULL
+ #define NULL 0x0                     //!< NULL
 #endif
 
-// FORWARD DECLARATION //
-template<class T> class tList;
+#include <list>
 
 //! ini-file parser
@@ -35 +34 @@
     {
       char*               name;    //!< name of a given section
-      tList<IniEntry>*    entries; //!< a list of entries for this section
+      std::list<IniEntry> entries; //!< a list of entries for this section
     };
     ////////////////////////////////////
@@ -53 +52 @@
 
     /** @returns true if the file is opened, false otherwise*/
-    bool isOpen() const { return (sections != NULL)?true:false; };
+    bool isOpen() const { return (this->fileName != NULL)? true : false; };
     /** @returns the fileName we have opened. */
     const char* getFileName() const { return this->fileName; };
@@ -77 +76 @@
 
   private:
-    char*                 fileName;        //!< The name of the File that was parsed.
-    tList<IniSection>*    sections;        //!< a list of all stored Sections of the Parser
-    IniSection*           currentSection;  //!< the current selected Section
-    IniEntry*             currentEntry;    //!< the current selected entry (in currentSection)
+    char*                            fileName;        //!< The name of the File that was parsed.
+    std::list<IniSection>            sections;        //!< a list of all stored Sections of the Parser
+    std::list<IniSection>::iterator  currentSection;  //!< the current selected Section
+    std::list<IniEntry>::iterator    currentEntry;    //!< the current selected entry (in currentSection)
 };