Changeset 5935 in orxonox.OLD for trunk/src

Timestamp:

Dec 6, 2005, 1:38:55 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ini-parser works again

Location:

trunk/src/lib/util

Files:

• ini_parser.cc (modified) (1 diff)
• ini_parser.h (modified) (1 diff)

trunk/src/lib/util/ini_parser.cc

@@ -414 +414 @@
 }
 
+
+/**
+ * @returns the name of the Current selected Section 
+ */
+const char* IniParser::getCurrentSection() const 
+{
+ return (this->currentSection!=NULL) ? 
+   this->currentSection->name :
+   NULL;
+ }
+
+
+/** 
+ * @returns the current entries Name, or NULL if we havn't selected a Entry 
+ */
+const char* IniParser::getCurrentName() const
+{
+ if (!this->sections.empty() &&
+     this->currentEntry != (*this->currentSection).entries.end())
+   return (*this->currentEntry).name;
+ else
+   return NULL;
+}
+
+/**
+ * @returns the current entries Value, or NULL if we havn't selected a Entry 
+ */
+const char* IniParser::getCurrentValue() const 
+{
+  if (!this->sections.empty() 
+      && this->currentEntry != (*this->currentSection).entries.end())
+    return (*this->currentEntry).value;
+  else
+    return NULL; 
+}
+
+
 /**
  * @brief output the whole tree in a nice and easy way.

trunk/src/lib/util/ini_parser.h

@@ -63 +63 @@
     bool nextVar();
 
-    /** @returns the name of the Current selected Section */
-    const char* getCurrentSection() const { return (this->currentSection!=NULL)?this->currentSection->name:NULL; };
-    /** @returns the current entries Name, or NULL if we havn't selected a Entry */
-    const char* getCurrentName() const { return (this->currentEntry!=NULL)?this->currentEntry->name:NULL; };
-    /** @returns the current entries Value, or NULL if we havn't selected a Entry */
-    const char* getCurrentValue() const { return (this->currentEntry!=NULL)?this->currentEntry->value:NULL; };
+    const char* getCurrentSection() const;
+    const char* getCurrentName() const;
+    const char* getCurrentValue() const;
 
     void debug() const;