Changeset 7203 in orxonox.OLD for branches/std/src/lib/parser/ini_parser/ini_parser.h

Timestamp:

Mar 9, 2006, 5:28:10 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: compiles again, BUT well…. i do not expect it to run anymore

File:

• branches/std/src/lib/parser/ini_parser/ini_parser.h (modified) (7 diffs)

branches/std/src/lib/parser/ini_parser/ini_parser.h

@@ -15 +15 @@
 
 #include <list>
+#include <string>
 
 //! ini-file parser
@@ -27 +28 @@
     struct IniEntry
     {
-      char*               comment;  //!< A Comment that is appendet to the Top of this Entry.
-      char*               name;     //!< name of a given Entry
-      char*               value;    //!< value of a given Entry
+      std::string         comment;  //!< A Comment that is appendet to the Top of this Entry.
+      std::string         name;     //!< name of a given Entry
+      std::string         value;    //!< value of a given Entry
     };
 
@@ -35 +36 @@
     struct IniSection
     {
-      char*               comment;  //!< A Comment that is appendet to the Top of this Section.
-      char*               name;     //!< name of a given section
+      std::string         comment;  //!< A Comment that is appendet to the Top of this Section.
+      std::string         name;     //!< name of a given section
       std::list<IniEntry> entries;  //!< a list of entries for this section
     };
@@ -42 +43 @@
 
   public:
-    IniParser (const char* filename = NULL);
+    IniParser (const std::string& filename = "");
     virtual ~IniParser ();
 
     /** @returns true if the file is opened, false otherwise*/
-    bool isOpen() const { return (this->fileName != NULL)? true : false; };
+    bool isOpen() const { return (!this->fileName.empty())? true : false; };
     /** @returns the fileName we have opened. */
-    const char* getFileName() const { return this->fileName; };
+    const std::string& getFileName() const { return this->fileName; };
 
-    bool readFile(const char* fileName);
-    bool writeFile(const char* fileName) const;
+    bool readFile(const std::string& fileName);
+    bool writeFile(const std::string& fileName) const;
 
-    void setFileComment(const char* fileComment);
-    const char* getFileComment() const { return this->comment; };
+    void setFileComment(const std::string& fileComment);
+    const std::string& getFileComment() const { return this->comment; };
 
-    bool addSection(const char* sectionName);
-    bool getSection(const char* sectionName);
-    void setSectionComment(const char* comment, const char* sectionName);
-    const char* getSectionComment(const char* sectionNane) const;
+    bool addSection(const std::string& sectionName);
+    bool getSection(const std::string& sectionName);
+    void setSectionComment(const std::string& comment, const std::string& sectionName);
+    const std::string& getSectionComment(const std::string& sectionNane) const;
 
     // iterate through sections with these Functions
     void firstSection();
-    const char* nextSection();
+    const std::string& nextSection();
 
 
-    bool addVar(const char* entryName, const char* value, const char* sectionName = NULL);
-    const char* getVar(const char* entryName, const char* sectionName, const char* defaultValue = "") const;
-    void setEntryComment(const char* comment, const char* entryName, const char* sectionName);
-    const char* getEntryComment(const char* entryName, const char* sectionName) const;
+    bool addVar(const std::string& entryName, const std::string& value, const std::string& sectionName = NULL);
+    const std::string& getVar(const std::string& entryName, const std::string& sectionName, const std::string& defaultValue = "") const;
+    void setEntryComment(const std::string& comment, const std::string& entryName, const std::string& sectionName);
+    const std::string& getEntryComment(const std::string& entryName, const std::string& sectionName) const;
 
     // iterate Through Variables with these Functions.
@@ -77 +78 @@
 
     // retrieving functions when iterating.
-    const char* getCurrentSection() const;
-    const char* getCurrentName() const;
-    const char* getCurrentValue() const;
+    const std::string& getCurrentSection() const;
+    const std::string& getCurrentName() const;
+    const std::string& getCurrentValue() const;
 
 
@@ -88 +89 @@
   private:
     void deleteSections();
-    void setFileName(const char* fileName);
+    void setFileName(const std::string& fileName);
 
     void setFileComment();
@@ -94 +95 @@
     void setEntryComment();
 
-    std::list<IniSection>::const_iterator getSectionIT(const char* sectionName) const;
-    std::list<IniSection>::iterator getSectionIT(const char* sectionName);
+    std::list<IniSection>::const_iterator getSectionIT(const std::string& sectionName) const;
+    std::list<IniSection>::iterator getSectionIT(const std::string& sectionName);
 
-    std::list<IniEntry>::const_iterator getEntryIT(const char* entryName, const char* sectionName = NULL) const;
-    std::list<IniEntry>::iterator getEntryIT(const char* entryName, const char* sectionName = NULL);
+    std::list<IniEntry>::const_iterator getEntryIT(const std::string& entryName, const std::string& sectionName = NULL) const;
+    std::list<IniEntry>::iterator getEntryIT(const std::string& entryName, const std::string& sectionName = NULL);
 
   private:
-    char*                            fileName;        //!< The name of the File that was parsed.
-    char*                            comment;         //!< A Comment for the header of this File.
+    std::string                      fileName;        //!< The name of the File that was parsed.
+    std::string                      comment;         //!< A Comment for the header of this File.
     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)
 
-    std::list<char*>                 commentList;     //!< A list of Comments. (this is for temporary saving of Comments, that are inserted in front of Sections/Entries.)
+    std::list<std::string>           commentList;     //!< A list of Comments. (this is for temporary saving of Comments, that are inserted in front of Sections/Entries.)
+
+
+    static const std::string         emptyString;
 };