Add optional attribute condition to "copyProperties".

[simgear.git] / simgear / misc / strutils.hxx

diff --git a/simgear/misc/strutils.hxx b/simgear/misc/strutils.hxx
index 59051df40cb90050954341b071fe482e1510ef1f..935e3d4a1b37646a3bbba58d730b9985bd128ce1 100644 (file)
--- a/simgear/misc/strutils.hxx
+++ b/simgear/misc/strutils.hxx
@@ -30,16 +30,12 @@
 #include <simgear/compiler.h>
 
 #include <string>
-
 #include <vector>
-SG_USING_STD(vector);
-
 #include <cstdlib>
 
-SG_USING_STD(string);
 
 namespace simgear {
-    namespace strutils {
+  namespace strutils {
 
 //     /** 
 //      * atof() wrapper for "string" type
@@ -64,9 +60,27 @@ namespace simgear {
         * @param s String to strip.
         * @return The stripped string.
         */
-       string lstrip( const string& s );
-       string rstrip( const string& s );
-       string strip( const string& s );
+       std::string lstrip( const std::string& s );
+       std::string rstrip( const std::string& s );
+       std::string strip( const std::string& s );
+
+        /**
+         * Right-padding of a string to a given length
+         * @param s String to pad
+         * @param length The total length of the resulting string
+         * @param c The character to pad with
+         * @return The padded string
+         */
+        std::string rpad( const std::string & s, size_t length, char c );
+
+        /**
+         * Left-padding of a string to a given length
+         * @param s String to pad
+         * @param length The total length of the resulting string
+         * @param c The character to pad with
+         * @return The padded string
+         */
+        std::string lpad( const std::string & s, size_t length, char c );
 
        /**
         * Split a string into a words using 'sep' as the delimiter string.
@@ -79,12 +93,30 @@ namespace simgear {
         * resulting in at most maxsplit+1 words.
         * @return Array of words.
         */
-       vector<string>
-       split( const string& s,
+       std::vector<std::string>
+       split( const std::string& s,
               const char* sep = 0,
               int maxsplit = 0 );
 
-    } // end namespace strutils
+       /**
+        * Test if a string starts with a string 
+        *
+        * @param s The string to be tested
+        * @param substr The string to test
+        * @return True, if s starts with substr, False otherwise
+        */
+       bool starts_with( const std::string & s, const std::string & substr );
+
+       /**
+        * Test if a string ends with a string 
+        *
+        * @param s The string to be tested
+        * @param substr The string to test
+        * @return True, if s ends with substr, False otherwise
+        */
+       bool ends_with( const std::string & s, const std::string & substr );
+  
+  } // end namespace strutils
 } // end namespace simgear
 
 #endif // STRUTILS_H