X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fmisc%2Fstrutils.hxx;h=ecc14a59064d0d06891e7d52d02ddc06a7928bc5;hb=bb383998bb77002a6d94e83e253de01e116f9268;hp=4b116d8b40ad41fa0c4a1208850e6945324187c3;hpb=5173d709e090b953eaf800cbcd1bf897de332a12;p=simgear.git

diff --git a/simgear/misc/strutils.hxx b/simgear/misc/strutils.hxx
index 4b116d8b..ecc14a59 100644
--- a/simgear/misc/strutils.hxx
+++ b/simgear/misc/strutils.hxx
@@ -1,25 +1,30 @@
-// String utilities.
-//
-// Written by Bernie Bright, 1998
+/**
+ * \file strutils.hxx
+ * String utilities.
+ */
+
+// Written by Bernie Bright, started 1998
 //
-// Copyright (C) 1998  Bernie Bright - bbright@c031.aone.net.au
+// Copyright (C) 1998  Bernie Bright - bbright@bigpond.net.au
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
+// Library General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA  02111-1307, USA.
 //
 // $Id$
 
+
 #ifndef STRUTILS_H
 #define STRUTILS_H
 
@@ -27,39 +32,65 @@
 
 #include STL_STRING
 
-#ifdef FG_HAVE_STD_INCLUDES
+#include <vector>
+SG_USING_STD(vector);
+
+#ifdef SG_HAVE_STD_INCLUDES
 #  include <cstdlib>
 #else
 #  include <stdlib.h>
 #endif
 
-FG_USING_STD(string);
-
-// Default characters to remove.
-extern const string whitespace;
+SG_USING_STD(string);
 
-// Returns a string with trailing characters removed.
-string trimleft( const string& s, const string& trimmings = whitespace );
+namespace simgear {
+    namespace strutils {
 
-// Returns a string with leading characters removed.
-string trimright( const string& s, const string& trimmings = whitespace );
+// 	/** 
+// 	 * atof() wrapper for "string" type
+// 	 */
+// 	inline double
+// 	atof( const string& str )
+// 	{
+// 	    return ::atof( str.c_str() );
+// 	}
 
-// Returns a string with leading and trailing characters removed.
-string trim( const string& s, const string& trimmings = whitespace );
+// 	/**
+// 	 * atoi() wrapper for "string" type
+// 	 */
+// 	inline int
+// 	atoi( const string& str )
+// 	{
+// 	    return ::atoi( str.c_str() );
+// 	}
 
-//-----------------------------------------------------------------------------
+	/**
+	 * Strip leading and/or trailing whitespace from s.
+	 * @param s String to strip.
+	 * @return The stripped string.
+	 */
+	string lstrip( const string& s );
+	string rstrip( const string& s );
+	string strip( const string& s );
 
-inline double
-atof( const string& str )
-{
-    return ::atof( str.c_str() );
-}
+	/**
+	 * Split a string into a words using 'sep' as the delimiter string.
+	 * Produces a result similar to the perl and python functions of the
+	 * same name.
+	 * 
+	 * @param s The string to split into words,
+	 * @param sep Word delimiters.  If not specified then any whitespace is a separator,
+	 * @param maxsplit If given, splits at no more than maxsplit places,
+	 * resulting in at most maxsplit+1 words.
+	 * @return Array of words.
+	 */
+	vector<string>
+	split( const string& s,
+	       const char* sep = 0,
+	       int maxsplit = 0 );
 
-inline int
-atoi( const string& str )
-{
-    return ::atoi( str.c_str() );
-}
+    } // end namespace strutils
+} // end namespace simgear
 
 #endif // STRUTILS_H