Changeset 10342

Timestamp:

04/10/11 10:13:39 (14 years ago)

Author:

tbretz

Message:

Replaces local Trim function by new function from tools

Location:

trunk/FACT++/src

Files:

• Description.cc (modified) (3 diffs)
• Description.h (modified) (2 diffs)

trunk/FACT++/src/Description.cc

@@ -25 +25 @@
 Description as comment. The unit will remain empty.
 
-You can omit either the name, the unit or the comment or any combination of them.
-The descriptions of the individual format strings are separated by a vertical line.
+You can omit either the name, the unit or the comment or any
+combination of them. The descriptions of the individual format strings
+are separated by a vertical line. If you want to enclose the name into
+[]-braces (e.g. marking an optional argument in a dim command), you
+have add empty brackets for the units.
 
 For a suggestion for rules for the names please have a look at:
@@ -41 +44 @@
 
 using namespace std;
-
-// --------------------------------------------------------------------------
-//
-//! This function removed whitshapces on both sides of a string.
-//!
-//! @param s
-//!     string to be cleaned
-//!
-//! @returns
-//!     string cleaned from whitespaces
-//
-string Description::Trim(string s)
-{
-    // Trim Both leading and trailing spaces
-    const size_t start = s.find_first_not_of(' '); // Find the first character position after excluding leading blank spaces
-    const size_t end   = s.find_last_not_of(' ');  // Find the first character position from reverse af
-
-    // if all spaces or empty return an empty string
-    if (string::npos==start || string::npos==end)
-        return string();
-
-    return s.substr(start, end-start+1);
-}
 
 // --------------------------------------------------------------------------
@@ -87 +67 @@
 
     // Extract a general description
-    const string d = Description::Trim(desc.substr(0, p));
+    const string d = Trim(desc.substr(0, p));
 
     vector<Description> vec;

trunk/FACT++/src/Description.h

@@ -4 +4 @@
 #include <string>
 #include <vector>
+
+#include "tools.h"
 
 struct Description
@@ -11 +13 @@
     std::string comment;
 
-    static std::string Trim(std::string s);
     static std::vector<Description> SplitDescription(const std::string &buffer);