Changeset 7325 in orxonox.OLD

Timestamp:

Apr 17, 2006, 2:17:21 PM (18 years ago)

Author:

bensch

Message:

helpers

Location:

trunk/src/lib/util

Files:

• substring.cc (modified) (3 diffs)
• substring.h (modified) (6 diffs)

trunk/src/lib/util/substring.cc

@@ -53 +53 @@
 }
 
-/**
- * @brief Splits a String into a SubString removing all whiteSpaces
- * @param string the String to Split
- * @param whiteSpaces MUST BE __TRUE__ or __FALSE__ (will be ignored)
- */
-SubString::SubString(const std::string& string, bool whiteSpaces)
-{
-  SubString::splitLine(this->strings, string);
-}
 
 /**
@@ -107 +98 @@
 { }
 
-/**
- * @brief An empty String
- */
+/** @brief An empty String */
 const std::string SubString::emptyString = "";
+/** @brief Helper that gets you a String consisting of all White Spaces */
+const std::string SubString::WhiteSpaces = " \n\t";
+/** @brief Helper that gets you a String consisting of all WhiteSpaces and the Comma */
+const std::string SubString::WhiteSpacesWithComma = " \n\t,";
 
 /**
@@ -171 +164 @@
   split[1] = '\0';
   SubString::splitLine(this->strings, string, split);
-  return strings.size();
-}
-
-
-/**
- * @brief Splits a String into a Substring removing all whiteSpaces
- * @param string the String to Split
- * @param whiteSpaces MUST BE __TRUE__
- *
- */
-unsigned int SubString::split(const std::string& string, bool whiteSpaces)
-{
-  this->strings.clear();
-  SubString::splitLine(this->strings, string);
   return strings.size();
 }

trunk/src/lib/util/substring.h

@@ -1 +1 @@
 /*!
-  \file substring.h
-  \brief a small class to get the parts of a string separated by commas
-*/
+ * @file substring.h
+ * @brief a small class to get the parts of a string separated by commas
+ */
 
 #ifndef _SUBSTRING_H
@@ -28 +28 @@
   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');
   /** @brief create a Substring as a copy of another one. @param subString the SubString to copy. */
@@ -47 +46 @@
   // Split and Join the any String. ///////
   unsigned int split(const std::string& string = "", char splitter = ',');
-  unsigned int split(const std::string& string, bool whiteSpaces);
   unsigned int split(const std::string& string, const std::string& splitters, char escapeChar ='\\', char safemode_char = '"', char comment_char = '\0');
   std::string join(const std::string& delimiter = " ") const;
@@ -58 +56 @@
   // retrieve Information from within
   inline unsigned int size() const { return this->strings.size(); };
-  const std::string& getString(unsigned int i) const { return (i < this->strings.size()) ? this->strings[i] : emptyString; };
+const std::string& getString(unsigned int i) const { return (i < this->strings.size()) ? this->strings[i] : emptyString; };
   const std::string& operator[](unsigned int i) const { return this->getString(i); };
 
@@ -64 +62 @@
   static SPLIT_LINE_STATE splitLine(std::vector<std::string>& ret,
                                     const std::string& line,
-                                    const std::string& delimiters = " \t\r\n",
+                                    const std::string& delimiters = SubString::WhiteSpaces,
                                     char escape_char = '\\',
                                     char safemode_char = '"',
@@ -71 +69 @@
   // debugging.
   void debug() const;
+
+public:
+  static const std::string WhiteSpaces;
+  static const std::string WhiteSpacesWithComma;
 
 private: