Changeset 7323 in orxonox.OLD for trunk/src/lib/util

Timestamp:

Apr 17, 2006, 1:52:22 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: evil is removed

Location:

trunk/src/lib/util

Files:

• substring.cc (modified) (5 diffs)
• substring.h (modified) (1 diff)

trunk/src/lib/util/substring.cc

@@ -31 +31 @@
 #include <cassert>
 
+
+/**
+ * @brief default constructor
+ */
+SubString::SubString()
+{
+}
+
+
 /**
  * @brief create a SubString from
@@ -62 +71 @@
  * @param comment_char the Comment character.
  */
-SubString::SubString(const std::string& string, const std::string& splitters, char escapeChar,char safemode_char, char comment_char)
+SubString::SubString(const std::string& string, const std::string& splitters, char escapeChar, char safemode_char, char comment_char)
 {
   SubString::splitLine(this->strings, string, splitters, escapeChar, safemode_char, comment_char);
@@ -133 +142 @@
 SubString SubString::operator+(const SubString& subString) const
 {
-  return SubString(subString) += subString;
+  return SubString(*this) += subString;
 }
 
@@ -146 +155 @@
   for (unsigned int i = 0; i < subString.size(); i++)
     this->strings.push_back(subString[i]);
+  return *this;
 }
 
@@ -190 +200 @@
 {
   this->strings.clear();
-  SubString::splitLine(this->strings, string, splitters, escapeChar, safemode_char);
-  return strings.size();
+  SubString::splitLine(this->strings, string, splitters, escapeChar, safemode_char, comment_char);
+  return this->strings.size();
 }
 

trunk/src/lib/util/substring.h

@@ -26 +26 @@
 {
 public:
-  SubString(const std::string& string = "", char splitter = ',');
+  SubString();
+  SubString(const std::string& string, char splitter = ',');
   SubString(const std::string& string, bool whiteSpaces);
   SubString(const std::string& string, const std::string& splitters, char escapeChar ='\\', char safemode_char = '"', char comment_char = '\0');