M src/FbTk/StringUtil.cc → src/FbTk/StringUtil.cc

@@ -1,6 +1,6 @@ 
-// StringUtil.cc for fluxbox 
+// StringUtil.cc for fluxbox
 // Copyright (c) 2001 - 2004 Henrik Kinnunen (fluxgen<at>fluxbox<dot>org)
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
 // to deal in the Software without restriction, including without limitation
@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: StringUtil.cc,v 1.12 2004/08/31 15:26:39 rathnor Exp $
+// $Id: StringUtil.cc,v 1.13 2004/09/10 16:04:16 akir Exp $
 
 #include "StringUtil.hh"
 
@@ -73,13 +73,13 @@ */
 const char *strcasestr(const char *str, const char *ptn) {
     const char *s2, *p2;
     for( ; *str; str++) {
-        for(s2=str, p2=ptn; ; s2++,p2++) {	
+        for(s2=str, p2=ptn; ; s2++,p2++) {
             // check if we reached the end of ptn, if so, return str
-            if (!*p2) 
+            if (!*p2)
                 return str;
             // check if the chars match(ignoring case)
             if (toupper(*s2) != toupper(*p2))
-                break; 
+                break;
         }
     }
     return 0;
@@ -87,12 +87,12 @@ }
 
 /**
    if ~ then expand it to home of user
-   returns expanded filename 
+   returns expanded filename
 */
 string expandFilename(const std::string &filename) {
     string retval;
     size_t pos = filename.find_first_not_of(" \t");
-    if (pos != std::string::npos && filename[pos] == '~') {  	
+    if (pos != std::string::npos && filename[pos] == '~') {
     	retval = getenv("HOME");
         if (pos != filename.size()) {
             // copy from the character after '~'
@@ -120,7 +120,7 @@ /**
    Parses a string between "first" and "last" characters
    and ignoring ok_chars as whitespaces. The value is
    returned in "out".
-   Returns negative value on error and this value is the position 
+   Returns negative value on error and this value is the position
    in the in-string where the error occured.
    Returns positive value on success and this value is
    for the position + 1 in the in-string where the "last"-char value
@@ -131,18 +131,18 @@ const char *ok_chars, bool allow_nesting) {
     assert(first);
     assert(last);
     assert(instr);
-	
-    std::string::size_type i = 0, 
+
+    std::string::size_type i = 0,
         total_add=0; //used to add extra if there is a \last to skip
     std::string in(instr);
-	
+
     // eat leading whitespace
     i = in.find_first_not_of(ok_chars);
     if (i == std::string::npos)
         return -in.size();   // nothing left but whitespace
 
-    if (in[i]!=first)		
-        return -i; //return position to error	
+    if (in[i]!=first)
+        return -i; //return position to error
 
     // find the end of the token
     std::string::size_type j = i, k;
@@ -170,7 +170,7 @@ total_add++; //save numchars removed so we can calculate totalpos
         }
     }
 
-    out = in.substr(i+1, j-i-1); //copy the string between first and last		
+    out = in.substr(i+1, j-i-1); //copy the string between first and last
     //return value to last character
     return (j+1+total_add);
 }
@@ -205,7 +205,7 @@ 
 string::size_type removeTrailingWhitespace(std::string &str) {
     // strip trailing whitespace
     string::size_type first_pos = str.find_last_not_of(" \t");
-    if (first_pos != string::npos) {	
+    if (first_pos != string::npos) {
         string::size_type last_pos = str.find_first_of(" \t", first_pos);
         while (last_pos != string::npos) {
             str.erase(last_pos);

M src/FbTk/StringUtil.hh → src/FbTk/StringUtil.hh

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-//$Id: StringUtil.hh,v 1.9 2004/05/02 20:42:56 fluxgen Exp $
+//$Id: StringUtil.hh,v 1.10 2004/09/10 16:04:16 akir Exp $
 
 #ifndef FBTK_STRINGUTIL_HH
 #define FBTK_STRINGUTIL_HH
@@ -31,7 +31,7 @@ 
 namespace StringUtil {
 
 char *strdup(const char *);
-	
+
 /// Similar to `strstr' but this function ignores the case of both strings
 const char *strcasestr(const char *str, const char *ptn);
 
@@ -42,7 +42,7 @@ /// @return extension of filename (ex: filename.txt will return txt)
 std::string findExtension(const std::string &filename);
 
 ///  returns string between character first and last
-int getStringBetween(std::string& out, const char *instr, 
+int getStringBetween(std::string& out, const char *instr,
                      char first, char last,
                      const char *ok_chars=" \t\n", bool allow_nesting = false);